Overview
Comment: | Add OFMutex and use it in OFTCPSocket instead of @synchronized. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
cca028cedf40a9d9bfb8c8ab238c0db3 |
User & Date: | js on 2009-06-01 02:08:20 |
Other Links: | manifest | tags |
Context
2009-06-01
| ||
04:02 | Fix and optimize @synchronize on Win32. check-in: 362a943099 user: js tags: trunk | |
02:08 | Add OFMutex and use it in OFTCPSocket instead of @synchronized. check-in: cca028cedf user: js tags: trunk | |
01:46 | Copy the object for an OFThread so it's thread-safe. check-in: 9b3d408f0d user: js tags: trunk | |
Changes
Modified src/OFTCPSocket.m from [3f2fb0c9c6] to [48bd51099f].
︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | + + - + - + | #include <stdio.h> #include <string.h> #include <unistd.h> #ifndef HAVE_GETADDRINFO #include <stdlib.h> #ifndef _WIN32 #include <arpa/inet.h> #endif #endif #import "OFTCPSocket.h" #import "OFExceptions.h" #ifndef INVALID_SOCKET #define INVALID_SOCKET -1 #endif #ifndef HAVE_GETADDRINFO #import "OFThread.h" |
︙ | |||
88 89 90 91 92 93 94 | 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 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 | + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - + + + + + + + + + + + - + - - + - + - - - + + + + - - - + + + - | BOOL connected = NO; struct hostent *he; struct servent *se; struct sockaddr_in addr; uint16_t port; char **ip; [mutex lock]; |
︙ | |||
188 189 190 191 192 193 194 | 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 | + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + - - - - + + + + - | if (family != AF_INET) @throw [OFBindFailedException newWithClass: isa andNode: node andService: service andFamily: family]; [mutex lock]; |
︙ |
Modified src/OFThread.h from [b93a3d71df] to [0d2fba1b4a].
︙ | |||
59 60 61 62 63 64 65 | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | - + | @public id retval; #endif } /** |
︙ | |||
85 86 87 88 89 90 91 | 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 | - + | * Returns the object for the specified Thread Local Storage key. * * \param key The Thread Local Storage key */ + (id)objectForTLSKey: (OFTLSKey*)key; /** |
︙ | |||
107 108 109 110 111 112 113 | 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + | /** * Joins a thread. * * \return The object returned by the main method of the thread. */ - join; @end /** * A class for creating mutual exclusions. */ @interface OFMutex: OFObject { #ifndef _WIN32 pthread_mutex_t mutex; #else HANDLE mutex; #endif } /** * \return A new, autoreleased mutex. */ + mutex; /** * Locks the mutex. */ - lock; /** * Unlocks the mutex. */ - unlock; @end |
Modified src/OFThread.m from [919a81fa63] to [e77c0b551d].
︙ | |||
166 167 168 169 170 171 172 173 174 175 176 | 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | #else if ((key = TlsAlloc()) == TLS_OUT_OF_INDEXES) { #endif c = isa; [super dealloc]; @throw [OFInitializationFailedException newWithClass: c]; } return self; } @end @implementation OFMutex + mutex { return [[[self alloc] init] autorelease]; } - init { self = [super init]; #ifndef _WIN32 if (pthread_mutex_init(&mutex, NULL)) { #else if ((mutex = CreateMutex(NULL, FALSE, NULL)) == NULL) { #endif Class c = isa; [self dealloc]; @throw [OFInitializationFailedException newWithClass: c]; } return self; } - lock { /* FIXME: Add error-handling */ #ifndef _WIN32 pthread_mutex_lock(&mutex); #else WaitForSingleObject(mutex, INFINITE); #endif return self; } - unlock { /* FIXME: Add error-handling */ #ifndef _WIN32 pthread_mutex_unlock(&mutex); #else ReleaseMutex(mutex); #endif return self; } @end |