Overview
Comment: | A few renames in OFObject.
getMemWithSize: -> allocWithSize: |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
e959fed01027d7f414f50f01866a0460 |
User & Date: | js on 2009-04-26 12:44:20 |
Other Links: | manifest | tags |
Context
2009-04-28
| ||
20:31 | Fix two missing spaces. check-in: 14f74f3c2f user: js tags: trunk | |
2009-04-26
| ||
12:44 | A few renames in OFObject. check-in: e959fed010 user: js tags: trunk | |
12:31 | Rename getIterator -> iterator. check-in: 8d10e738d1 user: js tags: trunk | |
Changes
Modified src/OFArray.m from [a4f78a390c] to [91667fe0ee].
︙ | ︙ | |||
84 85 86 87 88 89 90 | - add: (void*)item { if (SIZE_MAX - items < 1 || items + 1 > SIZE_MAX / itemsize) @throw [OFOutOfRangeException newWithClass: isa]; data = [self resizeMem: data toNItems: items + 1 | | | | | 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 | - add: (void*)item { if (SIZE_MAX - items < 1 || items + 1 > SIZE_MAX / itemsize) @throw [OFOutOfRangeException newWithClass: isa]; data = [self resizeMem: data toNItems: items + 1 withSize: itemsize]; memcpy(data + items++ * itemsize, item, itemsize); return self; } - addNItems: (size_t)nitems fromCArray: (void*)carray { if (nitems > SIZE_MAX - items || items + nitems > SIZE_MAX / itemsize) @throw [OFOutOfRangeException newWithClass: isa]; data = [self resizeMem: data toNItems: items + nitems withSize: itemsize]; memcpy(data + items * itemsize, carray, nitems * itemsize); items += nitems; return self; } - removeNItems: (size_t)nitems { if (nitems > items) @throw [OFOutOfRangeException newWithClass: isa]; data = [self resizeMem: data toNItems: items - nitems withSize: itemsize]; items -= nitems; return self; } - (id)copy |
︙ | ︙ |
Modified src/OFDictionary.m from [a124a729d9] to [a34c760d2b].
︙ | ︙ | |||
34 35 36 37 38 39 40 | - init { self = [super init]; size = 4096; @try { | | | | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 | - init { self = [super init]; size = 4096; @try { data = [self allocNItems: size withSize: sizeof(OFList*)]; } @catch (OFException *e) { [self free]; @throw e; } memset(data, 0, size); return self; |
︙ | ︙ | |||
60 61 62 63 64 65 66 | newWithClass: c andSelector: _cmd]; } size = (size_t)1 << hashsize; @try { | | | | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 | newWithClass: c andSelector: _cmd]; } size = (size_t)1 << hashsize; @try { data = [self allocNItems: size withSize: sizeof(OFList*)]; } @catch (OFException *e) { [self free]; @throw e; } memset(data, 0, size); return self; |
︙ | ︙ |
Modified src/OFList.m from [64103fca3f] to [fdd9a22612].
︙ | ︙ | |||
59 60 61 62 63 64 65 | - (of_list_object_t*)last { return last; } - (of_list_object_t*)append: (id)obj { | | | | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 | - (of_list_object_t*)last { return last; } - (of_list_object_t*)append: (id)obj { of_list_object_t *o = [self allocWithSize: sizeof(of_list_object_t)]; o->object = obj; o->next = NULL; o->prev = last; if (last != NULL) last->next = o; last = o; if (first == NULL) first = o; if (retain_and_release) [obj retain]; return o; } - (of_list_object_t*)prepend: (id)obj { of_list_object_t *o = [self allocWithSize: sizeof(of_list_object_t)]; o->object = obj; o->next = first; o->prev = NULL; if (first != NULL) first->prev = o; |
︙ | ︙ | |||
102 103 104 105 106 107 108 | return o; } - (of_list_object_t*)insert: (id)obj before: (of_list_object_t*)listobj { | | | 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 | return o; } - (of_list_object_t*)insert: (id)obj before: (of_list_object_t*)listobj { of_list_object_t *o = [self allocWithSize: sizeof(of_list_object_t)]; o->object = obj; o->next = listobj; o->prev = listobj->prev; if (listobj->prev != NULL) listobj->prev->next = o; |
︙ | ︙ | |||
125 126 127 128 129 130 131 | return o; } - (of_list_object_t*)insert: (id)obj after: (of_list_object_t*)listobj { | | | 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 | return o; } - (of_list_object_t*)insert: (id)obj after: (of_list_object_t*)listobj { of_list_object_t *o = [self allocWithSize: sizeof(of_list_object_t)]; o->object = obj; o->next = listobj->next; o->prev = listobj; if (listobj->next != NULL) listobj->next->prev = o; |
︙ | ︙ |
Modified src/OFObject.h from [706bb1644c] to [8b1380da52].
︙ | ︙ | |||
142 143 144 145 146 147 148 | /** * Allocate memory and store it in the objects memory pool so it can be free'd * automatically when the object is free'd. * * \param size The size of the memory to allocate * \return A pointer to the allocated memory */ | | | | | 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 | /** * Allocate memory and store it in the objects memory pool so it can be free'd * automatically when the object is free'd. * * \param size The size of the memory to allocate * \return A pointer to the allocated memory */ - (void*)allocWithSize: (size_t)size; /** * Allocate memory for a specified number of items and store it in the objects * memory pool so it can be free'd automatically when the object is free'd. * * \param nitems The number of items to allocate * \param size The size of each item to allocate * \return A pointer to the allocated memory */ - (void*)allocNItems: (size_t)nitems withSize: (size_t)size; /** * Resize memory in the memory pool to a specified size. * * \param ptr A pointer to the already allocated memory * \param size The new size for the memory chunk * \return A pointer to the resized memory chunk |
︙ | ︙ | |||
176 177 178 179 180 181 182 | * \param ptr A pointer to the already allocated memory * \param nitems The number of items to resize to * \param size The size of each item to resize to * \return A pointer to the resized memory chunk */ - (void*)resizeMem: (void*)ptr toNItems: (size_t)nitems | | | 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 | * \param ptr A pointer to the already allocated memory * \param nitems The number of items to resize to * \param size The size of each item to resize to * \return A pointer to the resized memory chunk */ - (void*)resizeMem: (void*)ptr toNItems: (size_t)nitems withSize: (size_t)size; /** * Frees allocated memory and removes it from the memory pool. * * \param ptr A pointer to the allocated memory */ - freeMem: (void*)ptr; |
︙ | ︙ |
Modified src/OFObject.m from [352bb910bc] to [a774c5de86].
︙ | ︙ | |||
210 211 212 213 214 215 216 | PRE_IVAR->memchunks = memchunks; PRE_IVAR->memchunks[PRE_IVAR->memchunks_size] = ptr; PRE_IVAR->memchunks_size = memchunks_size; return self; } | | | 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 | PRE_IVAR->memchunks = memchunks; PRE_IVAR->memchunks[PRE_IVAR->memchunks_size] = ptr; PRE_IVAR->memchunks_size = memchunks_size; return self; } - (void*)allocWithSize: (size_t)size { void *ptr, **memchunks; size_t memchunks_size; if (size == 0) return NULL; |
︙ | ︙ | |||
242 243 244 245 246 247 248 | PRE_IVAR->memchunks = memchunks; PRE_IVAR->memchunks[PRE_IVAR->memchunks_size] = ptr; PRE_IVAR->memchunks_size = memchunks_size; return ptr; } | | | | | | 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 | PRE_IVAR->memchunks = memchunks; PRE_IVAR->memchunks[PRE_IVAR->memchunks_size] = ptr; PRE_IVAR->memchunks_size = memchunks_size; return ptr; } - (void*)allocNItems: (size_t)nitems withSize: (size_t)size { if (nitems == 0 || size == 0) return NULL; if (nitems > SIZE_MAX / size) @throw [OFOutOfRangeException newWithClass: isa]; return [self allocWithSize: nitems * size]; } - (void*)resizeMem: (void*)ptr toSize: (size_t)size { void **iter; if (ptr == NULL) return [self allocWithSize: size]; if (size == 0) { [self freeMem: ptr]; return NULL; } iter = PRE_IVAR->memchunks + PRE_IVAR->memchunks_size; |
︙ | ︙ | |||
286 287 288 289 290 291 292 | @throw [OFMemNotPartOfObjException newWithClass: isa andPointer: ptr]; } - (void*)resizeMem: (void*)ptr toNItems: (size_t)nitems | | | | | 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 | @throw [OFMemNotPartOfObjException newWithClass: isa andPointer: ptr]; } - (void*)resizeMem: (void*)ptr toNItems: (size_t)nitems withSize: (size_t)size { size_t memsize; if (ptr == NULL) return [self allocNItems: nitems withSize: size]; if (nitems == 0 || size == 0) { [self freeMem: ptr]; return NULL; } if (nitems > SIZE_MAX / size) |
︙ | ︙ |
Modified src/OFString.m from [881fc1c877] to [db633d72e6].
︙ | ︙ | |||
162 163 164 165 166 167 168 | c = isa; [super free]; @throw [OFInvalidEncodingException newWithClass: c]; } @try { | | | 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 | c = isa; [super free]; @throw [OFInvalidEncodingException newWithClass: c]; } @try { string = [self allocWithSize: length + 1]; } @catch (OFException *e) { [self free]; @throw e; } memcpy(string, str, length + 1); } |
︙ | ︙ | |||
265 266 267 268 269 270 271 | length = 0; is_utf8 = NO; @throw [OFInvalidEncodingException newWithClass: isa]; } length = len; | | | 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 | length = 0; is_utf8 = NO; @throw [OFInvalidEncodingException newWithClass: isa]; } length = len; string = [self allocWithSize: length + 1]; memcpy(string, str, length + 1); return self; } - (BOOL)isEqual: (id)obj { |
︙ | ︙ |
Modified src/OFTCPSocket.m from [a9b0b8f50a] to [59fbba1365].
︙ | ︙ | |||
200 201 202 203 204 205 206 | socklen_t addrlen; int s; newsock = [OFTCPSocket new]; addrlen = sizeof(struct sockaddr); @try { | | | 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 | socklen_t addrlen; int s; newsock = [OFTCPSocket new]; addrlen = sizeof(struct sockaddr); @try { addr = [newsock allocWithSize: sizeof(struct sockaddr)]; } @catch(id e) { [newsock free]; @throw e; } if ((s = accept(sock, addr, &addrlen)) == INVALID_SOCKET) { [newsock free]; |
︙ | ︙ |
Modified tests/OFArray/OFArray.m from [c4671d9ef0] to [a61450d3be].
︙ | ︙ | |||
38 39 40 41 42 43 44 | puts("Trying to add too much to an array..."); \ a = [[type alloc] initWithItemSize: 4096]; \ CATCH_EXCEPTION([a addNItems: SIZE_MAX \ fromCArray: NULL], \ OFOutOfRangeException) \ \ puts("Trying to add something after that error..."); \ | | | | | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 | puts("Trying to add too much to an array..."); \ a = [[type alloc] initWithItemSize: 4096]; \ CATCH_EXCEPTION([a addNItems: SIZE_MAX \ fromCArray: NULL], \ OFOutOfRangeException) \ \ puts("Trying to add something after that error..."); \ p = [a allocWithSize: 4096]; \ memset(p, 255, 4096); \ [a add: p]; \ if (!memcmp([a last], p, 4096)) \ puts("[a last] matches with p!"); \ else { \ puts("[a last] does not match p!"); \ abort(); \ } \ [a freeMem: p]; \ \ puts("Adding more data..."); \ q = [a allocWithSize: 4096]; \ memset(q, 42, 4096); \ [a add: q]; \ if (!memcmp([a last], q, 4096)) \ puts("[a last] matches with q!"); \ else { \ puts("[a last] does not match q!"); \ abort(); \ } \ [a freeMem: q]; \ \ puts("Adding multiple items at once..."); \ p = [a allocWithSize: 8192]; \ memset(p, 64, 8192); \ [a addNItems: 2 \ fromCArray: p]; \ if (!memcmp([a last], [a item: [a items] - 2], 4096) && \ !memcmp([a item: [a items] - 2], p, 4096)) \ puts("[a last], [a item: [a items] - 2] and p match!"); \ else { \ |
︙ | ︙ |
Modified tests/OFObject/OFObject.m from [875bad3799] to [5969f41bb6].
︙ | ︙ | |||
39 40 41 42 43 44 45 | /* Test freeing memory not allocated by obj */ puts("Freeing memory not allocated by object (should throw an " "exception)..."); CATCH_EXCEPTION([obj freeMem: NULL], OFMemNotPartOfObjException) /* Test allocating memory */ puts("Allocating memory through object..."); | | | | | | | | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | /* Test freeing memory not allocated by obj */ puts("Freeing memory not allocated by object (should throw an " "exception)..."); CATCH_EXCEPTION([obj freeMem: NULL], OFMemNotPartOfObjException) /* Test allocating memory */ puts("Allocating memory through object..."); p = [obj allocWithSize: 4096]; puts("Allocated 4096 bytes."); /* Test freeing the just allocated memory */ puts("Freeing just allocated memory..."); [obj freeMem: p]; puts("Free'd."); /* It shouldn't be recognized as part of our obj anymore */ puts("Trying to free it again (should throw an exception)..."); CATCH_EXCEPTION([obj freeMem: p], OFMemNotPartOfObjException) /* Test multiple memory chunks */ puts("Allocating 3 chunks of memory..."); p = [obj allocWithSize: 4096]; q = [obj allocWithSize: 4096]; r = [obj allocWithSize: 4096]; puts("Allocated 3 * 4096 bytes."); /* Free them */ puts("Now freeing them..."); [obj freeMem: p]; [obj freeMem: q]; [obj freeMem: r]; puts("Freed them all."); /* Try to free again */ puts("Now trying to free them again..."); CATCH_EXCEPTION([obj freeMem: p], OFMemNotPartOfObjException) CATCH_EXCEPTION([obj freeMem: q], OFMemNotPartOfObjException) CATCH_EXCEPTION([obj freeMem: r], OFMemNotPartOfObjException) puts("Got all 3!"); puts("Trying to allocate more memory than possible..."); CATCH_EXCEPTION(p = [obj allocWithSize: SIZE_MAX], OFNoMemException) puts("Allocating 1 byte..."); p = [obj allocWithSize: 1]; puts("Trying to resize that 1 byte to more than possible..."); CATCH_EXCEPTION(p = [obj resizeMem: p toSize: SIZE_MAX], OFNoMemException) puts("Trying to resize NULL to 1024 bytes..."); |
︙ | ︙ |