Overview
Comment: | Change OFDate to use and export doubles. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
4bef853a72068ff434e373752edc4f3b |
User & Date: | js on 2011-09-17 15:20:48 |
Other Links: | manifest | tags |
Context
2011-09-17
| ||
18:58 | Better format for serialization of floating point OFNumbers. check-in: ef02147e8b user: js tags: trunk | |
15:20 | Change OFDate to use and export doubles. check-in: 4bef853a72 user: js tags: trunk | |
2011-09-16
| ||
12:46 | Work around glibc being crap - again. check-in: 45fee921e2 user: js tags: trunk | |
Changes
Modified src/OFDate.h from [39d0390269] to [39834a73b3].
︙ | ︙ | |||
21 22 23 24 25 26 27 | @class OFConstantString; /** * \brief A class for storing, accessing and comparing dates. */ @interface OFDate: OFObject <OFCopying, OFComparing, OFSerialization> { | | < | < < < < < < < < < < < | < < < < < < < < < < | 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 56 57 58 59 60 | @class OFConstantString; /** * \brief A class for storing, accessing and comparing dates. */ @interface OFDate: OFObject <OFCopying, OFComparing, OFSerialization> { double seconds; } /** * \brief Creates a new OFDate with the current date and time. * * \return A new, autoreleased OFDate with the current date and time */ + date; /** * \brief Creates a new OFDate with the specified date and time since * 1970-01-01T00:00:00Z. * * \param seconds The seconds since 1970-01-01T00:00:00Z * \return A new, autoreleased OFDate with the specified date and time */ + dateWithTimeIntervalSince1970: (double)seconds; /** * \brief Creates a new OFDate with the specified date and time since now. * * \param seconds The seconds since now * \return A new, autoreleased OFDate with the specified date and time */ + dateWithTimeIntervalSinceNow: (double)seconds; /** * \brief Creates a new OFDate with the specified string in the specified * format. * * The time zone used is UTC. If a time zone is specified anyway, an * OFInvalidFormatException is thrown. See +[dateWithLocalDateString:format:] |
︙ | ︙ | |||
127 128 129 130 131 132 133 | /** * \brief Initializes an already allocated OFDate with the specified date and * time since 1970-01-01T00:00:00Z. * * \param seconds The seconds since 1970-01-01T00:00:00Z * \return An initialized OFDate with the specified date and time */ | | < < < < < < < < < < < | < < < < < < < < < < < | 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 | /** * \brief Initializes an already allocated OFDate with the specified date and * time since 1970-01-01T00:00:00Z. * * \param seconds The seconds since 1970-01-01T00:00:00Z * \return An initialized OFDate with the specified date and time */ - initWithTimeIntervalSince1970: (double)seconds; /** * \brief Initializes an already allocated OFDate with the specified date and * time since now. * * \param seconds The seconds since now * \return An initialized OFDate with the specified date and time */ - initWithTimeIntervalSinceNow: (double)seconds; /** * \brief Initializes an already allocated OFDate with the specified string in * the specified format. * * The time zone used is UTC. If a time zone is specified anyway, an * OFInvalidFormatException is thrown. See -[initWithLocalDateString:format:] |
︙ | ︙ | |||
338 339 340 341 342 343 344 | - (OFDate*)laterDate: (OFDate*)otherDate; /** * \brief Returns the seconds since 1970-01-01T00:00:00Z. * * \return The seconds since 1970-01-01T00:00:00Z */ | | < < < < < < < < > | | < | | | < < < < < < < < < < | 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 | - (OFDate*)laterDate: (OFDate*)otherDate; /** * \brief Returns the seconds since 1970-01-01T00:00:00Z. * * \return The seconds since 1970-01-01T00:00:00Z */ - (double)timeIntervalSince1970; /** * \brief Returns the seconds the receiver is after the date. * * \param date Date date to generate the difference with receiver * \return The seconds the receiver is after the date. */ - (double)timeIntervalSinceDate: (OFDate*)otherDate; /** * \brief Returns the seconds the receiver is in the future. * * \return The seconds the receiver is in the future */ - (double)timeIntervalSinceNow; /** * \brief Creates a new date with the specified time interval added. * * \param seconds The seconds after the date * \return A new, autoreleased OFDate */ - (OFDate*)dateByAddingTimeInterval: (double)seconds; @end |
Modified src/OFDate.m from [a3ac0da3d9] to [177828d4d1].
︙ | ︙ | |||
16 17 18 19 20 21 22 23 24 25 26 27 28 29 | #include "config.h" #define _GNU_SOURCE #include <stdint.h> #include <limits.h> #include <time.h> #include <sys/time.h> #import "OFDate.h" #import "OFString.h" #import "OFDictionary.h" #import "OFXMLElement.h" | > > > | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | #include "config.h" #define _GNU_SOURCE #include <stdint.h> #include <limits.h> #include <time.h> #include <math.h> #include <float.h> #include <assert.h> #include <sys/time.h> #import "OFDate.h" #import "OFString.h" #import "OFDictionary.h" #import "OFXMLElement.h" |
︙ | ︙ | |||
45 46 47 48 49 50 51 | #endif #ifdef HAVE_GMTIME_R # define GMTIME_RET(field) \ time_t seconds_ = (time_t)seconds; \ struct tm tm; \ \ | | | | | | | | 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 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 | #endif #ifdef HAVE_GMTIME_R # define GMTIME_RET(field) \ time_t seconds_ = (time_t)seconds; \ struct tm tm; \ \ if (seconds_ != floor(seconds)) \ @throw [OFOutOfRangeException newWithClass: isa]; \ \ if (gmtime_r(&seconds_, &tm) == NULL) \ @throw [OFOutOfRangeException newWithClass: isa]; \ \ return tm.field; # define LOCALTIME_RET(field) \ time_t seconds_ = (time_t)seconds; \ struct tm tm; \ \ if (seconds_ != floor(seconds)) \ @throw [OFOutOfRangeException newWithClass: isa]; \ \ if (localtime_r(&seconds_, &tm) == NULL) \ @throw [OFOutOfRangeException newWithClass: isa]; \ \ return tm.field; #else # ifdef OF_THREADS # define GMTIME_RET(field) \ time_t seconds_ = (time_t)seconds; \ struct tm *tm; \ \ if (seconds_ != floor(seconds)) \ @throw [OFOutOfRangeException newWithClass: isa]; \ \ [mutex lock]; \ \ @try { \ if ((tm = gmtime(&seconds_)) == NULL) \ @throw [OFOutOfRangeException newWithClass: isa]; \ \ return tm->field; \ } @finally { \ [mutex unlock]; \ } # define LOCALTIME_RET(field) \ time_t seconds_ = (time_t)seconds; \ struct tm *tm; \ \ if (seconds_ != floor(seconds)) \ @throw [OFOutOfRangeException newWithClass: isa]; \ \ [mutex lock]; \ \ @try { \ if ((tm = localtime(&seconds_)) == NULL) \ @throw [OFOutOfRangeException newWithClass: isa]; \ \ return tm->field; \ } @finally { \ [mutex unlock]; \ } # else # define GMTIME_RET(field) \ time_t seconds_ = (time_t)seconds; \ struct tm *tm; \ \ if (seconds_ != floor(seconds)) \ @throw [OFOutOfRangeException newWithClass: isa]; \ \ if ((tm = gmtime(&seconds_)) == NULL) \ @throw [OFOutOfRangeException newWithClass: isa]; \ \ return tm->field; # define LOCALTIME_RET(field) \ time_t seconds_ = (time_t)seconds; \ struct tm *tm; \ \ if (seconds_ != floor(seconds)) \ @throw [OFOutOfRangeException newWithClass: isa]; \ \ if ((tm = localtime(&seconds_)) == NULL) \ @throw [OFOutOfRangeException newWithClass: isa]; \ \ return tm->field; # endif |
︙ | ︙ | |||
140 141 142 143 144 145 146 | #endif + date { return [[[self alloc] init] autorelease]; } | | < < < < < < < < | < < < < < < < < < | | < < < < < < < < < < < | > < < | < | | < < | | | | | < | < < | < < < < < < < < < < < | 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 | #endif + date { return [[[self alloc] init] autorelease]; } + dateWithTimeIntervalSince1970: (double)seconds { return [[[self alloc] initWithTimeIntervalSince1970: seconds] autorelease]; } + dateWithTimeIntervalSinceNow: (double)seconds { return [[[self alloc] initWithTimeIntervalSinceNow: seconds] autorelease]; } + dateWithDateString: (OFString*)string format: (OFString*)format { return [[[self alloc] initWithDateString: string format: format] autorelease]; } + dateWithLocalDateString: (OFString*)string format: (OFString*)format { return [[[self alloc] initWithLocalDateString: string format: format] autorelease]; } + distantFuture { return [[[self alloc] initWithTimeIntervalSince1970: DBL_MAX] autorelease]; } + distantPast { return [[[self alloc] initWithTimeIntervalSince1970: DBL_MIN] autorelease]; } - init { struct timeval t; self = [super init]; assert(!gettimeofday(&t, NULL)); seconds = t.tv_sec; seconds += (double)t.tv_usec / 1000000; return self; } - initWithTimeIntervalSince1970: (double)seconds_ { self = [super init]; seconds = seconds_; return self; } - initWithTimeIntervalSinceNow: (double)seconds_ { self = [self init]; seconds += seconds_; return self; } - initWithDateString: (OFString*)string format: (OFString*)format { |
︙ | ︙ | |||
315 316 317 318 319 320 321 | - initWithSerialization: (OFXMLElement*)element { self = [super init]; @try { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; | < < < < | < < < < < < | < > > > > > > > | | | 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 | - initWithSerialization: (OFXMLElement*)element { self = [super init]; @try { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; if (![[element name] isEqual: [self className]] || ![[element namespace] isEqual: OF_SERIALIZATION_NS]) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; seconds = [element doubleValue]; [pool release]; } @catch (id e) { [self release]; @throw e; } return self; } - (BOOL)isEqual: (id)object { OFDate *otherDate; if (![object isKindOfClass: [OFDate class]]) return NO; otherDate = object; if (otherDate->seconds != seconds) return NO; return YES; } - (uint32_t)hash { uint32_t hash; union { double d; uint8_t b[sizeof(double)]; } d; uint8_t i; d.d = of_bswap_double_if_le(seconds); OF_HASH_INIT(hash); for (i = 0; i < sizeof(double); i++) OF_HASH_ADD(hash, d.b[i]); OF_HASH_FINALIZE(hash); return hash; } - copy |
︙ | ︙ | |||
392 393 394 395 396 397 398 | otherDate = object; if (seconds < otherDate->seconds) return OF_ORDERED_ASCENDING; if (seconds > otherDate->seconds) return OF_ORDERED_DESCENDING; | < < < < < < < < | < < < < < < | | 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 | otherDate = object; if (seconds < otherDate->seconds) return OF_ORDERED_ASCENDING; if (seconds > otherDate->seconds) return OF_ORDERED_DESCENDING; return OF_ORDERED_SAME; } - (OFString*)description { return [self dateStringWithFormat: @"%Y-%m-%dT%H:%M:%SZ"]; } - (OFXMLElement*)XMLElementBySerializing { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFXMLElement *element; element = [OFXMLElement elementWithName: [self className] namespace: OF_SERIALIZATION_NS]; [element setStringValue: [OFString stringWithFormat: @"%la", seconds]]; [element retain]; [pool release]; [element autorelease]; return element; } - (uint32_t)microsecond { return nearbyint(remainder(seconds, 1) * 1000000); } - (uint8_t)second { GMTIME_RET(tm_sec) } |
︙ | ︙ | |||
512 513 514 515 516 517 518 | - (OFString*)dateStringWithFormat: (OFConstantString*)format { OFString *ret; time_t seconds_ = (time_t)seconds; struct tm tm; char *buffer; | | | 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 | - (OFString*)dateStringWithFormat: (OFConstantString*)format { OFString *ret; time_t seconds_ = (time_t)seconds; struct tm tm; char *buffer; if (seconds_ != floor(seconds)) @throw [OFOutOfRangeException newWithClass: isa]; #ifdef HAVE_GMTIME_R if (gmtime_r(&seconds_, &tm) == NULL) @throw [OFOutOfRangeException newWithClass: isa]; #else # ifdef OF_THREADS |
︙ | ︙ | |||
558 559 560 561 562 563 564 | - (OFString*)localDateStringWithFormat: (OFConstantString*)format { OFString *ret; time_t seconds_ = (time_t)seconds; struct tm tm; char *buffer; | | | 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 | - (OFString*)localDateStringWithFormat: (OFConstantString*)format { OFString *ret; time_t seconds_ = (time_t)seconds; struct tm tm; char *buffer; if (seconds_ != floor(seconds)) @throw [OFOutOfRangeException newWithClass: isa]; #ifdef HAVE_LOCALTIME_R if (localtime_r(&seconds_, &tm) == NULL) @throw [OFOutOfRangeException newWithClass: isa]; #else # ifdef OF_THREADS |
︙ | ︙ | |||
613 614 615 616 617 618 619 | { if ([self compare: otherDate] == OF_ORDERED_ASCENDING) return [[otherDate retain] autorelease]; return [[self retain] autorelease]; } | | < < < < < | < < < < < < < < < < < | | < | | < < > | < | < | < | | < < < < < < < | < | 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 | { if ([self compare: otherDate] == OF_ORDERED_ASCENDING) return [[otherDate retain] autorelease]; return [[self retain] autorelease]; } - (double)timeIntervalSince1970 { return seconds; } - (double)timeIntervalSinceDate: (OFDate*)otherDate { return seconds - otherDate->seconds; } - (double)timeIntervalSinceNow { struct timeval t; double seconds_; assert(!gettimeofday(&t, NULL)); seconds_ = t.tv_sec; seconds_ += (double)t.tv_usec / 1000000; return seconds - seconds_; } - (OFDate*)dateByAddingTimeInterval: (double)seconds_ { return [OFDate dateWithTimeIntervalSince1970: seconds + seconds_]; } @end |
Modified src/OFThread.m from [f4c5d36434] to [8714631aa6].
︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 | * file. */ #include "config.h" #define __NO_EXT_QNX #ifndef _WIN32 # include <unistd.h> # include <sched.h> #else # include <windows.h> #endif | > > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | * file. */ #include "config.h" #define __NO_EXT_QNX #include <math.h> #ifndef _WIN32 # include <unistd.h> # include <sched.h> #else # include <windows.h> #endif |
︙ | ︙ | |||
189 190 191 192 193 194 195 | Sleep((unsigned int)seconds * 1000 + microseconds / 1000); #endif } + (void)sleepUntilDate: (OFDate*)date { | < < < < < | < < < < < | | | | 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 | Sleep((unsigned int)seconds * 1000 + microseconds / 1000); #endif } + (void)sleepUntilDate: (OFDate*)date { double seconds = [date timeIntervalSinceNow]; #ifndef _WIN32 if (seconds > UINT_MAX) @throw [OFOutOfRangeException newWithClass: self]; sleep((unsigned int)seconds); usleep(nearbyint(remainder(seconds, 1) * 1000000)); #else if (seconds * 1000 > UINT_MAX) @throw [OFOutOfRangeException newWithClass: self]; Sleep(seconds * 1000); #endif } + (void)yield { #ifdef OF_HAVE_SCHED_YIELD sched_yield(); |
︙ | ︙ |
Modified tests/OFDateTests.m from [715110430e] to [ee5c9af1b5].
︙ | ︙ | |||
29 30 31 32 33 34 35 | { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFDate *d1, *d2; TEST(@"+[dateWithTimeIntervalSince1970:]", (d1 = [OFDate dateWithTimeIntervalSince1970: 0])) | | | < | < | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFDate *d1, *d2; TEST(@"+[dateWithTimeIntervalSince1970:]", (d1 = [OFDate dateWithTimeIntervalSince1970: 0])) TEST(@"-[dateByADdingTimeInterval:]", (d2 = [d1 dateByAddingTimeInterval: 3600 * 25 + 5.000001])) TEST(@"-[description]", [[d1 description] isEqual: @"1970-01-01T00:00:00Z"] && [[d2 description] isEqual: @"1970-01-02T01:00:05Z"]) TEST(@"-[isEqual:]", [d1 isEqual: [OFDate dateWithTimeIntervalSince1970: 0]] && ![d1 isEqual: [OFDate dateWithTimeIntervalSince1970: 0.0000001]]) TEST(@"-[compare:]", [d1 compare: d2] == OF_ORDERED_ASCENDING) TEST(@"-[second]", [d1 second] == 0 && [d2 second] == 5) TEST(@"-[microsecond]", [d1 microsecond] == 0 && [d2 microsecond] == 1) |
︙ | ︙ |
Modified tests/OFSerializationTests.m from [0948a92654] to [d1ee4a5580].
︙ | ︙ | |||
43 44 45 46 47 48 49 | OFList *l = [OFList list]; OFDataArray *da = [OFDataArray dataArray]; OFString *s; [a addObject: @"Qu\"xbar\ntest"]; [a addObject: [OFNumber numberWithInt: 1234]]; [a addObject: [OFMutableString stringWithString: @"asd"]]; | | < | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | OFList *l = [OFList list]; OFDataArray *da = [OFDataArray dataArray]; OFString *s; [a addObject: @"Qu\"xbar\ntest"]; [a addObject: [OFNumber numberWithInt: 1234]]; [a addObject: [OFMutableString stringWithString: @"asd"]]; [a addObject: [OFDate dateWithTimeIntervalSince1970: 1234.5678]]; [d setObject: @"Hello" forKey: a]; [d setObject: @"B\"la" forKey: @"Blub"]; [l appendObject: @"Hello"]; |
︙ | ︙ |
Modified tests/serialization.xml from [5739f59ed1] to [dcac3fafcc].
1 2 3 4 | <?xml version='1.0' encoding='UTF-8'?> <serialization xmlns='https://webkeks.org/objfw/serialization' version='0'> <OFMutableDictionary> <key> | < < < < < < < < < < < < < < < < < < < < < < < < | 1 2 3 4 5 6 7 8 9 10 11 | <?xml version='1.0' encoding='UTF-8'?> <serialization xmlns='https://webkeks.org/objfw/serialization' version='0'> <OFMutableDictionary> <key> <OFList> <OFString>Hello</OFString> <OFString>Wo
ld! How are you?</OFString> <OFURL>https://webkeks.org/</OFURL> <OFXMLElement name='x'> <namespaces> |
︙ | ︙ | |||
87 88 89 90 91 92 93 94 95 | </object> </OFCountedSet> </OFList> </key> <object> <OFString>list</OFString> </object> </OFMutableDictionary> </serialization> | > > > > > > > > > > > > > > > > > > > > > > > > | 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 95 | </object> </OFCountedSet> </OFList> </key> <object> <OFString>list</OFString> </object> <key> <OFDataArray>MDEyMzQ1Njc4OTo7PEFCQ0RFRkdISklLTE1OT1BRUlNUVVZXWFla</OFDataArray> </key> <object> <OFString>data</OFString> </object> <key> <OFArray> <OFString>Qu"xbar test</OFString> <OFNumber type='signed'>1234</OFNumber> <OFMutableString>asd</OFMutableString> <OFDate>0x1.34a456d5cfaadp+10</OFDate> </OFArray> </key> <object> <OFString>Hello</OFString> </object> <key> <OFString>Blub</OFString> </key> <object> <OFString>B"la</OFString> </object> </OFMutableDictionary> </serialization> |