diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-03-28 19:39:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-28 19:39:58 -0400 |
commit | 095d911201b0741e7f326d269a005dba55985acf (patch) | |
tree | 7bb8001d8230214e790d1705b11c8f8afa6cc65e | |
parent | bdcde3d71a67e97f25e851f3ca97c9bb5ef03e7f (diff) |
[LIB]: Drop the pcounter itself.
The knock-out. The pcounter abstraction is not used any longer in the
kernel.
Not sure whether this should go via netdev tree, but as far as I
remember it was added via this one, and besides Eric thinks that
Andrew shouldn't mind this.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/linux/pcounter.h | 74 | ||||
-rw-r--r-- | lib/Makefile | 1 | ||||
-rw-r--r-- | lib/pcounter.c | 58 |
3 files changed, 0 insertions, 133 deletions
diff --git a/include/linux/pcounter.h b/include/linux/pcounter.h deleted file mode 100644 index a82d9f2628ca..000000000000 --- a/include/linux/pcounter.h +++ /dev/null | |||
@@ -1,74 +0,0 @@ | |||
1 | #ifndef __LINUX_PCOUNTER_H | ||
2 | #define __LINUX_PCOUNTER_H | ||
3 | /* | ||
4 | * Using a dynamic percpu 'int' variable has a cost : | ||
5 | * 1) Extra dereference | ||
6 | * Current per_cpu_ptr() implementation uses an array per 'percpu variable'. | ||
7 | * 2) memory cost of NR_CPUS*(32+sizeof(void *)) instead of num_possible_cpus()*4 | ||
8 | * | ||
9 | * This pcounter implementation is an abstraction to be able to use | ||
10 | * either a static or a dynamic per cpu variable. | ||
11 | * One dynamic per cpu variable gets a fast & cheap implementation, we can | ||
12 | * change pcounter implementation too. | ||
13 | */ | ||
14 | struct pcounter { | ||
15 | #ifdef CONFIG_SMP | ||
16 | void (*add)(struct pcounter *self, int inc); | ||
17 | int (*getval)(const struct pcounter *self, int cpu); | ||
18 | int *per_cpu_values; | ||
19 | #else | ||
20 | int val; | ||
21 | #endif | ||
22 | }; | ||
23 | |||
24 | #ifdef CONFIG_SMP | ||
25 | #include <linux/percpu.h> | ||
26 | |||
27 | #define DEFINE_PCOUNTER(NAME) \ | ||
28 | static DEFINE_PER_CPU(int, NAME##_pcounter_values); \ | ||
29 | static void NAME##_pcounter_add(struct pcounter *self, int val) \ | ||
30 | { \ | ||
31 | __get_cpu_var(NAME##_pcounter_values) += val; \ | ||
32 | } \ | ||
33 | static int NAME##_pcounter_getval(const struct pcounter *self, int cpu) \ | ||
34 | { \ | ||
35 | return per_cpu(NAME##_pcounter_values, cpu); \ | ||
36 | } \ | ||
37 | |||
38 | #define PCOUNTER_MEMBER_INITIALIZER(NAME, MEMBER) \ | ||
39 | MEMBER = { \ | ||
40 | .add = NAME##_pcounter_add, \ | ||
41 | .getval = NAME##_pcounter_getval, \ | ||
42 | } | ||
43 | |||
44 | |||
45 | static inline void pcounter_add(struct pcounter *self, int inc) | ||
46 | { | ||
47 | self->add(self, inc); | ||
48 | } | ||
49 | |||
50 | extern int pcounter_getval(const struct pcounter *self); | ||
51 | extern int pcounter_alloc(struct pcounter *self); | ||
52 | extern void pcounter_free(struct pcounter *self); | ||
53 | |||
54 | |||
55 | #else /* CONFIG_SMP */ | ||
56 | |||
57 | static inline void pcounter_add(struct pcounter *self, int inc) | ||
58 | { | ||
59 | self->val += inc; | ||
60 | } | ||
61 | |||
62 | static inline int pcounter_getval(const struct pcounter *self) | ||
63 | { | ||
64 | return self->val; | ||
65 | } | ||
66 | |||
67 | #define DEFINE_PCOUNTER(NAME) | ||
68 | #define PCOUNTER_MEMBER_INITIALIZER(NAME, MEMBER) | ||
69 | #define pcounter_alloc(self) 0 | ||
70 | #define pcounter_free(self) | ||
71 | |||
72 | #endif /* CONFIG_SMP */ | ||
73 | |||
74 | #endif /* __LINUX_PCOUNTER_H */ | ||
diff --git a/lib/Makefile b/lib/Makefile index 23de261a4c83..4d059d469554 100644 --- a/lib/Makefile +++ b/lib/Makefile | |||
@@ -61,7 +61,6 @@ obj-$(CONFIG_TEXTSEARCH_KMP) += ts_kmp.o | |||
61 | obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o | 61 | obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o |
62 | obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o | 62 | obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o |
63 | obj-$(CONFIG_SMP) += percpu_counter.o | 63 | obj-$(CONFIG_SMP) += percpu_counter.o |
64 | obj-$(CONFIG_SMP) += pcounter.o | ||
65 | obj-$(CONFIG_AUDIT_GENERIC) += audit.o | 64 | obj-$(CONFIG_AUDIT_GENERIC) += audit.o |
66 | 65 | ||
67 | obj-$(CONFIG_SWIOTLB) += swiotlb.o | 66 | obj-$(CONFIG_SWIOTLB) += swiotlb.o |
diff --git a/lib/pcounter.c b/lib/pcounter.c deleted file mode 100644 index 9b56807da93b..000000000000 --- a/lib/pcounter.c +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | /* | ||
2 | * Define default pcounter functions | ||
3 | * Note that often used pcounters use dedicated functions to get a speed increase. | ||
4 | * (see DEFINE_PCOUNTER/REF_PCOUNTER_MEMBER) | ||
5 | */ | ||
6 | |||
7 | #include <linux/module.h> | ||
8 | #include <linux/pcounter.h> | ||
9 | #include <linux/smp.h> | ||
10 | #include <linux/cpumask.h> | ||
11 | |||
12 | static void pcounter_dyn_add(struct pcounter *self, int inc) | ||
13 | { | ||
14 | per_cpu_ptr(self->per_cpu_values, smp_processor_id())[0] += inc; | ||
15 | } | ||
16 | |||
17 | static int pcounter_dyn_getval(const struct pcounter *self, int cpu) | ||
18 | { | ||
19 | return per_cpu_ptr(self->per_cpu_values, cpu)[0]; | ||
20 | } | ||
21 | |||
22 | int pcounter_getval(const struct pcounter *self) | ||
23 | { | ||
24 | int res = 0, cpu; | ||
25 | |||
26 | for_each_possible_cpu(cpu) | ||
27 | res += self->getval(self, cpu); | ||
28 | |||
29 | return res; | ||
30 | } | ||
31 | EXPORT_SYMBOL_GPL(pcounter_getval); | ||
32 | |||
33 | int pcounter_alloc(struct pcounter *self) | ||
34 | { | ||
35 | int rc = 0; | ||
36 | if (self->add == NULL) { | ||
37 | self->per_cpu_values = alloc_percpu(int); | ||
38 | if (self->per_cpu_values != NULL) { | ||
39 | self->add = pcounter_dyn_add; | ||
40 | self->getval = pcounter_dyn_getval; | ||
41 | } else | ||
42 | rc = 1; | ||
43 | } | ||
44 | return rc; | ||
45 | } | ||
46 | EXPORT_SYMBOL_GPL(pcounter_alloc); | ||
47 | |||
48 | void pcounter_free(struct pcounter *self) | ||
49 | { | ||
50 | if (self->per_cpu_values != NULL) { | ||
51 | free_percpu(self->per_cpu_values); | ||
52 | self->per_cpu_values = NULL; | ||
53 | self->getval = NULL; | ||
54 | self->add = NULL; | ||
55 | } | ||
56 | } | ||
57 | EXPORT_SYMBOL_GPL(pcounter_free); | ||
58 | |||