hg/stx-libbasic: comparison UnixOperatingSystem.st

equal deleted inserted replaced

-:4d49a24f861b
+:00e3c22156c3
 computeDatePartsOf:osTime for:aBlock
 "compute year, month and day from the OS time, osTime
 and evaluate the argument, a 3-arg block with these.
 Conversion is to localtime including any daylight saving adjustments."
-|year month day osSeconds|
+|year month day osSeconds i|
 osSeconds := osTime // 1000.
 %{
 struct tm* tmPtr;
 INT t;
 tmPtr = localtime(&tt);
 year = __MKSMALLINT(tmPtr->tm_year + 1900);
 month = __MKSMALLINT(tmPtr->tm_mon + 1);
 day = __MKSMALLINT(tmPtr->tm_mday);
 %}.
+year isNil ifTrue:[
+i := self computeTimeAndDateFrom:osTime.
+year := i at:1.
+month := i at:2.
+day := i at:3.
+].
 aBlock value:year value:month value:day
 "
 OperatingSystem computeDatePartsOf:0 for:[:y :m :d |
 y printCR. m printCR. d printCR
 containing (full-) year, month, day, hour, minute and seconds,
 offset to UTC, daylight savings time flag, milliseconds,
 dayInYear (1..) and dayInWeek (1..).
 Conversion is to localtime including any daylight saving adjustments."
+|millis osSeconds ret|
+millis := osTime \\ 1000.
+osSeconds := osTime // 1000.
+ret := self fillTimeAndDateFromSeconds:osSeconds into:(Array new:11).
+ret at:9 put:millis.
+^ ret
+"
+OperatingSystem computeTimeAndDateFrom:0
+OperatingSystem computeTimeAndDateFrom:1011
+"
+!
+computeTimePartsOf:osTime for:aBlock
+"compute hours, minutes, seconds and milliseconds from the osTime
+and evaluate the argument, a 4-arg block with these.
+Conversion is to localtime including any daylight saving adjustments."
+|hours minutes seconds millis osSeconds i|
+osSeconds := osTime // 1000.
+millis := osTime \\ 1000.
+%{
+struct tm *tmPtr;
+INT t;
+TIME_T tt;
+t = __longIntVal(osSeconds);
+tt = (TIME_T)t;
+tmPtr = localtime(&tt);
+hours = __MKSMALLINT(tmPtr->tm_hour);
+minutes = __MKSMALLINT(tmPtr->tm_min);
+seconds = __MKSMALLINT(tmPtr->tm_sec);
+%}.
+hours isNil ifTrue:[
+i := self computeTimeAndDateFrom:osTime.
+hours := i at:4.
+minutes := i at:5.
+seconds := i at:6.
+].
+aBlock value:hours value:minutes value:seconds value:millis
+"
+OperatingSystem computeTimePartsOf:100 for:[:h :m :s :milli |
+h printCR. m printCR. s printCR. millis printCR
+]
+"
+!
+computeUTCTimeAndDateFrom:osTime
+"given an OS-dependent time in osTime, return an Array
+containing year, month, day, hour, minute and seconds,
+offset to UTC, daylight savings time flag, milliseconds,
+dayInYear (1..) and dayInWeek (1..).
+Conversion is to UTC."
 |low hi year month day hours minutes seconds millis utcOffset
 dst yDay wDay osSeconds ret|
 millis := osTime \\ 1000.
 osSeconds := osTime // 1000.
 %{
 struct tm *tmPtr;
 struct tm *gmTmPtr;
-INT t;
+long t;
-TIME_T tt;
 t = __longIntVal(osSeconds);
-tt = (TIME_T)t;
+tmPtr = gmtime(&t);
-tmPtr = localtime(&tt);
 hours = __MKSMALLINT(tmPtr->tm_hour);
 minutes = __MKSMALLINT(tmPtr->tm_min);
 seconds = __MKSMALLINT(tmPtr->tm_sec);
 year = __MKSMALLINT(tmPtr->tm_year + 1900);
 month = __MKSMALLINT(tmPtr->tm_mon + 1);
 day = __MKSMALLINT(tmPtr->tm_mday);
-yDay = __MKSMALLINT(tmPtr->tm_yday+1);
+yDay = __MKSMALLINT(tmPtr->tm_yday + 1);
 wDay = __MKSMALLINT(tmPtr->tm_wday == 0 ? 7 : tmPtr->tm_wday);
 if (tmPtr->tm_isdst == 0) {
 dst = false;
 utcOffset = __MKINT(TIMEZONE(tmPtr));
 ret at:10 put:yDay.
 ret at:11 put:wDay.
 ^ ret
 "
-OperatingSystem computeTimeAndDateFrom:0
+OperatingSystem computeUTCTimeAndDateFrom:0
 "
 !
-computeTimePartsOf:osTime for:aBlock
+computeUTCTimePartsOf:osTime for:aBlock
 "compute hours, minutes, seconds and milliseconds from the osTime
 and evaluate the argument, a 4-arg block with these.
-Conversion is to localtime including any daylight saving adjustments."
+Conversion is to UTC."
 |hours minutes seconds millis osSeconds|
 osSeconds := osTime // 1000.
 millis := osTime \\ 1000.
 %{
 struct tm *tmPtr;
-INT t;
+long t;
-TIME_T tt;
 t = __longIntVal(osSeconds);
-tt = (TIME_T)t;
+tmPtr = gmtime(&t);
-tmPtr = localtime(&tt);
 hours = __MKSMALLINT(tmPtr->tm_hour);
 minutes = __MKSMALLINT(tmPtr->tm_min);
 seconds = __MKSMALLINT(tmPtr->tm_sec);
 %}.
 aBlock value:hours value:minutes value:seconds value:millis
 "
-OperatingSystem computeTimePartsOf:100 for:[:h :m :s :milli |
+OperatingSystem computeUTCTimePartsOf:100 for:[:h :m :s :milli |
-h printCR. m printCR. s printCR. millis printCR
+h printCR. m printCR. s printCR. milli printCR
 ]
 "
 !
-computeUTCTimeAndDateFrom:osTime
+fillTimeAndDateFromSeconds:osSeconds into:timeArray
-"given an OS-dependent time in osTime, return an Array
+"fill the array with os-time components.
-containing year, month, day, hour, minute and seconds,
+An internal helper"
-offset to UTC, daylight savings time flag, milliseconds,
-dayInYear (1..) and dayInWeek (1..).
+|low hi year month day hours minutes seconds  utcOffset
-Conversion is to UTC."
+dst yDay wDay |
-|low hi year month day hours minutes seconds millis utcOffset
-dst yDay wDay osSeconds ret|
-millis := osTime \\ 1000.
-osSeconds := osTime // 1000.
 %{
 struct tm *tmPtr;
 struct tm *gmTmPtr;
-long t;
+INT t;
+TIME_T tt;
 t = __longIntVal(osSeconds);
+tt = (TIME_T)t;
-tmPtr = gmtime(&t);
+tmPtr = localtime(&tt);
 hours = __MKSMALLINT(tmPtr->tm_hour);
 minutes = __MKSMALLINT(tmPtr->tm_min);
 seconds = __MKSMALLINT(tmPtr->tm_sec);
 year = __MKSMALLINT(tmPtr->tm_year + 1900);
 month = __MKSMALLINT(tmPtr->tm_mon + 1);
 day = __MKSMALLINT(tmPtr->tm_mday);
-yDay = __MKSMALLINT(tmPtr->tm_yday + 1);
+yDay = __MKSMALLINT(tmPtr->tm_yday+1);
 wDay = __MKSMALLINT(tmPtr->tm_wday == 0 ? 7 : tmPtr->tm_wday);
 if (tmPtr->tm_isdst == 0) {
 dst = false;
 utcOffset = __MKINT(TIMEZONE(tmPtr));
 utcOffset = __MKINT(TIMEZONE(tmPtr) + 3600);
 #endif
 }
 %}.
 "I would love to have SELF-like inline objects ..."
-ret := Array new:11.
+timeArray at:1 put:year.
-ret at:1 put:year.
+timeArray at:2 put:month.
-ret at:2 put:month.
+timeArray at:3 put:day.
-ret at:3 put:day.
+timeArray at:4 put:hours.
-ret at:4 put:hours.
+timeArray at:5 put:minutes.
-ret at:5 put:minutes.
+timeArray at:6 put:seconds.
-ret at:6 put:seconds.
+timeArray at:7 put:utcOffset.
-ret at:7 put:utcOffset.
+timeArray at:8 put:dst.
-ret at:8 put:dst.
+timeArray at:9 put:nil.
-ret at:9 put:millis.
+timeArray at:10 put:yDay.
-ret at:10 put:yDay.
+timeArray at:11 put:wDay.
-ret at:11 put:wDay.
+^ timeArray
-^ ret
+"
-"
+OperatingSystem fillTimeAndDateFromSeconds:0 into:(Array new:11)
-OperatingSystem computeUTCTimeAndDateFrom:0
-"
-!
-computeUTCTimePartsOf:osTime for:aBlock
-"compute hours, minutes, seconds and milliseconds from the osTime
-and evaluate the argument, a 4-arg block with these.
-Conversion is to UTC."
-|hours minutes seconds millis osSeconds|
-osSeconds := osTime // 1000.
-millis := osTime \\ 1000.
-%{
-struct tm *tmPtr;
-long t;
-t = __longIntVal(osSeconds);
-tmPtr = gmtime(&t);
-hours = __MKSMALLINT(tmPtr->tm_hour);
-minutes = __MKSMALLINT(tmPtr->tm_min);
-seconds = __MKSMALLINT(tmPtr->tm_sec);
-%}.
-aBlock value:hours value:minutes value:seconds value:millis
-"
-OperatingSystem computeUTCTimePartsOf:100 for:[:h :m :s :milli |
-h printCR. m printCR. s printCR. milli printCR
-]
 "
 !
 getMicrosecondTime
 "This returns the microsecond timers value - if available.
 #endif
 #undef HAVE_TIME
 RETURN ( __MKSMALLINT(t & 0x1FFFFFFF) );
-%}
+%}.
+self primitiveFailed
 !
 getOSTime
 "This returns the OS time.
 The base of the returned value is not consistent across
 "{ Pragma: +optSpace }"
 "cease ANY action for some time. This suspends the whole smalltalk
 (unix-) process for some time if running threadless;
 if running with threads (which is the default), this will
-only block until the nbext clock tick and return with the next
+only block until the next clock tick and return with the next
 timer interrupt.
 Use either OperatingSystem>>millisecondDelay: (which makes all
 threads sleep, but handles interrupts) or use a Delay (which makes
 only the calling thread sleep)."
 ! !
 !UnixOperatingSystem class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.82 2000-06-23 08:19:20 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.83 2000-07-02 12:50:18 cg Exp $'
 ! !
 UnixOperatingSystem initialize!

changeset 5438	00e3c22156c3
parent 5407	d6729266a95b
child 5444	5cbb37147eeb