Differences From Artifact [f35f997d0d]:
- File src/exceptions/OFException.m — part of check-in [cfd374b906] at 2015-01-03 20:57:18 on branch trunk — Update copyright (user: js, size: 5547) [annotate] [blame] [check-ins using]
To Artifact [23bfa51fc4]:
- File
src/exceptions/OFException.m
— part of check-in
[62e2de30b9]
at
2015-02-16 08:39:17
on branch trunk
— Explicitly pass errno to exceptions
The old behaviour where the exception would access errno directly on
creation of the exception was very fragile. The two main problems with
it were that sometimes it would pick up an errno even though none had
been set and in other cases that when the exception was created errno
had already been overridden.This also greatly increases errno handling on Win32, especially in
conjunction with sockets. It can still be improved further, though. (user: js, size: 6477) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <stdlib.h> #ifdef HAVE_DLFCN_H # include <dlfcn.h> #endif #import "OFException.h" #import "OFString.h" #import "OFArray.h" #if defined(_WIN32) && defined(OF_HAVE_SOCKETS) | > > > > > > > > > > < | < | | 12 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 51 52 53 54 55 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <errno.h> #include <stdlib.h> #ifdef HAVE_DLFCN_H # include <dlfcn.h> #endif #import "OFException.h" #import "OFString.h" #import "OFArray.h" #import "OFSystemInfo.h" #import "OFInitializationFailedException.h" #import "OFLockFailedException.h" #import "OFUnlockFailedException.h" #if !defined(HAVE_STRERROR_R) && defined(OF_HAVE_THREADS) # import "threading.h" #endif #if defined(_WIN32) && defined(OF_HAVE_SOCKETS) # include <winerror.h> #endif /* * Define HAVE_DWARF_EXCEPTIONS if OBJC_ZEROCOST_EXCEPTIONS is defined, but * don't do so on iOS, as it is defined there even if SjLj exceptions are used. */ #ifndef HAVE_DWARF_EXCEPTIONS # if defined(OBJC_ZEROCOST_EXCEPTIONS) && !defined(OF_IOS) # define HAVE_DWARF_EXCEPTIONS # endif #endif /* * Define HAVE_DWARF_EXCEPTIONS if HAVE_SEH_EXCEPTIONS is defined, as SEH * exceptions are implemented as a wrapper around DWARF exceptions. |
︙ | ︙ | |||
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 | extern _Unwind_Reason_Code _Unwind_Backtrace( _Unwind_Reason_Code(*)(struct _Unwind_Context*, void*), void*); # if defined(__arm__) || defined(__ARM__) extern int _Unwind_VRS_Get(struct _Unwind_Context*, int, uint32_t, int, void*); # else extern uintptr_t _Unwind_GetIP(struct _Unwind_Context*); # endif static _Unwind_Reason_Code backtrace_callback(struct _Unwind_Context *ctx, void *data) { struct backtrace_ctx *bt = data; if (bt->i < OF_BACKTRACE_SIZE) { # if defined(__arm__) || defined(__ARM__) uintptr_t ip; _Unwind_VRS_Get(ctx, 0, 15, 0, &ip); bt->backtrace[bt->i++] = (void*)(ip & ~1); # else bt->backtrace[bt->i++] = (void*)_Unwind_GetIP(ctx); # endif return _URC_OK; } return _URC_END_OF_STACK; } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 73 74 75 76 77 78 79 80 81 82 83 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 129 130 131 132 133 134 135 136 137 138 139 140 141 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 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 225 226 227 228 229 230 231 232 233 | extern _Unwind_Reason_Code _Unwind_Backtrace( _Unwind_Reason_Code(*)(struct _Unwind_Context*, void*), void*); # if defined(__arm__) || defined(__ARM__) extern int _Unwind_VRS_Get(struct _Unwind_Context*, int, uint32_t, int, void*); # else extern uintptr_t _Unwind_GetIP(struct _Unwind_Context*); # endif #if !defined(HAVE_STRERROR_R) && defined(OF_HAVE_THREADS) static of_mutex_t mutex; static void __attribute__((__constructor__)) init(void) { if (!of_mutex_new(&mutex)) @throw [OFInitializationFailedException exception]; } #endif OFString* of_strerror(int errNo) { OFString *ret; #ifdef HAVE_STRERROR_R char buffer[256]; #endif #ifdef _WIN32 /* * These were translated from WSAE* errors to errno and thus Win32's * strerror_r() does not know about them. * * FIXME: These could have better descriptions! */ switch (errNo) { case EADDRINUSE: return @"EADDRINUSE"; case EADDRNOTAVAIL: return @"EADDRNOTAVAIL"; case EAFNOSUPPORT: return @"EAFNOSUPPORT"; case EALREADY: return @"EALREADY"; case ECONNABORTED: return @"ECONNABORTED"; case ECONNREFUSED: return @"ECONNREFUSED"; case ECONNRESET: return @"ECONNRESET"; case EDESTADDRREQ: return @"EDESTADDRREQ"; case EDQUOT: return @"EDQUOT"; case EHOSTDOWN: return @"EHOSTDOWN"; case EHOSTUNREACH: return @"EHOSTUNREACH"; case EINPROGRESS: return @"EINPROGRESS"; case EISCONN: return @"EISCONN"; case ELOOP: return @"ELOOP"; case EMSGSIZE: return @"EMSGSIZE"; case ENETDOWN: return @"ENETDOWN"; case ENETRESET: return @"ENETRESET"; case ENETUNREACH: return @"ENETUNREACH"; case ENOBUFS: return @"ENOBUFS"; case ENOPROTOOPT: return @"ENOPROTOOPT"; case ENOTCONN: return @"ENOTCONN"; case ENOTSOCK: return @"ENOTSOCK"; case EOPNOTSUPP: return @"EOPNOTSUPP"; case EPFNOSUPPORT: return @"EPFNOSUPPORT"; case EPROCLIM: return @"EPROCLIM"; case EPROTONOSUPPORT: return @"EPROTONOSUPPORT"; case EPROTOTYPE: return @"EPROTOTYPE"; case EREMOTE: return @"EREMOTE"; case ESHUTDOWN: return @"ESHUTDOWN"; case ESOCKTNOSUPPORT: return @"ESOCKTNOSUPPORT"; case ESTALE: return @"ESTALE"; case ETIMEDOUT: return @"ETIMEDOUT"; case ETOOMANYREFS: return @"ETOOMANYREFS"; case EUSERS: return @"EUSERS"; case EWOULDBLOCK: return @"EWOULDBLOCK"; } #endif #ifdef HAVE_STRERROR_R if (strerror_r(errNo, buffer, 256) != 0) return @"Unknown error (strerror_r failed)"; ret = [OFString stringWithCString: buffer encoding: [OFSystemInfo native8BitEncoding]]; #else # ifdef OF_HAVE_THREADS if (!of_mutex_lock(&mutex)) @throw [OFLockFailedException exception]; @try { # endif ret = [OFString stringWithCString: strerror(errNo) encoding: [OFSystemInfo native8BitEncoding]]; # ifdef OF_HAVE_THREADS } @finally { if (!of_mutex_unlock(&mutex)) @throw [OFUnlockFailedException exception]; } # endif #endif return ret; } static _Unwind_Reason_Code backtrace_callback(struct _Unwind_Context *ctx, void *data) { struct backtrace_ctx *bt = data; if (bt->i < OF_BACKTRACE_SIZE) { # if defined(__arm__) || defined(__ARM__) uintptr_t ip; _Unwind_VRS_Get(ctx, 0, 15, 0, &ip); bt->backtrace[bt->i++] = (void*)(ip & ~1); # else bt->backtrace[bt->i++] = (void*)_Unwind_GetIP(ctx); # endif return _URC_OK; } return _URC_END_OF_STACK; } #endif @implementation OFException + (instancetype)exception { return [[[self alloc] init] autorelease]; } |
︙ | ︙ |