author | zautrix <zautrix> | 2005-07-04 19:21:19 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-04 19:21:19 (UTC) |
commit | 16898aecbedb978169efef1e1e0233578a42a46e (patch) (unidiff) | |
tree | a391b6c44fd2df62daf5f643393af03bf051f4f0 | |
parent | 2710cddd5b0b69efc1c5a7f8516d5b451ff258f1 (diff) | |
download | kdepimpi-16898aecbedb978169efef1e1e0233578a42a46e.zip kdepimpi-16898aecbedb978169efef1e1e0233578a42a46e.tar.gz kdepimpi-16898aecbedb978169efef1e1e0233578a42a46e.tar.bz2 |
free ring buffer
-rw-r--r-- | libical/src/libical/icalmemory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libical/src/libical/icalmemory.c b/libical/src/libical/icalmemory.c index 3ed38ad..d22561e 100644 --- a/libical/src/libical/icalmemory.c +++ b/libical/src/libical/icalmemory.c | |||
@@ -40,65 +40,65 @@ | |||
40 | * interfaces simple, I did not want the caller to have to pass in a | 40 | * interfaces simple, I did not want the caller to have to pass in a |
41 | * memory buffer, but having libical pass out newly allocated memory | 41 | * memory buffer, but having libical pass out newly allocated memory |
42 | * makes it difficult to de-allocate the memory. | 42 | * makes it difficult to de-allocate the memory. |
43 | * | 43 | * |
44 | * The ring buffer in this scheme makes it possible for libical to pass | 44 | * The ring buffer in this scheme makes it possible for libical to pass |
45 | * out references to memory which the caller does not own, and be able | 45 | * out references to memory which the caller does not own, and be able |
46 | * to de-allocate the memory later. The ring allows libical to have | 46 | * to de-allocate the memory later. The ring allows libical to have |
47 | * several buffers active simultaneously, which is handy when creating | 47 | * several buffers active simultaneously, which is handy when creating |
48 | * string representations of components. | 48 | * string representations of components. |
49 | */ | 49 | */ |
50 | 50 | ||
51 | #define ICALMEMORY_C | 51 | #define ICALMEMORY_C |
52 | 52 | ||
53 | #ifdef HAVE_CONFIG_H | 53 | #ifdef HAVE_CONFIG_H |
54 | #include "config.h" | 54 | #include "config.h" |
55 | #endif | 55 | #endif |
56 | 56 | ||
57 | #ifdef DMALLOC | 57 | #ifdef DMALLOC |
58 | #include "dmalloc.h" | 58 | #include "dmalloc.h" |
59 | #endif | 59 | #endif |
60 | 60 | ||
61 | #include "icalmemory.h" | 61 | #include "icalmemory.h" |
62 | #include "icalerror.h" | 62 | #include "icalerror.h" |
63 | 63 | ||
64 | #include <stdio.h> /* for printf (debugging) */ | 64 | #include <stdio.h> /* for printf (debugging) */ |
65 | #include <stdlib.h> /* for malloc, realloc */ | 65 | #include <stdlib.h> /* for malloc, realloc */ |
66 | #include <string.h> /* for memset(), strdup */ | 66 | #include <string.h> /* for memset(), strdup */ |
67 | 67 | ||
68 | #ifdef WIN32 | 68 | #ifdef WIN32 |
69 | #include <windows.h> | 69 | #include <windows.h> |
70 | #endif | 70 | #endif |
71 | 71 | ||
72 | #define BUFFER_RING_SIZE 100 | 72 | #define BUFFER_RING_SIZE 25 |
73 | #define MIN_BUFFER_SIZE 64 | 73 | #define MIN_BUFFER_SIZE 64 |
74 | 74 | ||
75 | 75 | ||
76 | /* HACK. Not threadsafe */ | 76 | /* HACK. Not threadsafe */ |
77 | 77 | ||
78 | typedef struct { | 78 | typedef struct { |
79 | int pos; | 79 | int pos; |
80 | void *ring[BUFFER_RING_SIZE]; | 80 | void *ring[BUFFER_RING_SIZE]; |
81 | } buffer_ring; | 81 | } buffer_ring; |
82 | 82 | ||
83 | void icalmemory_free_tmp_buffer (void* buf); | 83 | void icalmemory_free_tmp_buffer (void* buf); |
84 | void icalmemory_free_ring_byval(buffer_ring *br); | 84 | void icalmemory_free_ring_byval(buffer_ring *br); |
85 | 85 | ||
86 | static buffer_ring* global_buffer_ring = 0; | 86 | static buffer_ring* global_buffer_ring = 0; |
87 | 87 | ||
88 | #ifdef HAVE_PTHREAD | 88 | #ifdef HAVE_PTHREAD |
89 | #include <pthread.h> | 89 | #include <pthread.h> |
90 | 90 | ||
91 | static pthread_key_t ring_key; | 91 | static pthread_key_t ring_key; |
92 | static pthread_once_t ring_key_once = PTHREAD_ONCE_INIT; | 92 | static pthread_once_t ring_key_once = PTHREAD_ONCE_INIT; |
93 | 93 | ||
94 | static void ring_destroy(void * buf) { | 94 | static void ring_destroy(void * buf) { |
95 | if (buf) icalmemory_free_ring_byval((buffer_ring *) buf); | 95 | if (buf) icalmemory_free_ring_byval((buffer_ring *) buf); |
96 | pthread_setspecific(ring_key, NULL); | 96 | pthread_setspecific(ring_key, NULL); |
97 | } | 97 | } |
98 | 98 | ||
99 | static void ring_key_alloc(void) { | 99 | static void ring_key_alloc(void) { |
100 | pthread_key_create(&ring_key, ring_destroy); | 100 | pthread_key_create(&ring_key, ring_destroy); |
101 | } | 101 | } |
102 | #endif | 102 | #endif |
103 | 103 | ||
104 | 104 | ||