Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | merge sebres-8-6-clock-speedup |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | sebres-trunk-clock-speedup |
| Files: | files | file ages | folders |
| SHA1: |
f65c70bf877a88203270b4655843b56d |
| User & Date: | sebres 2017-05-29 20:37:35 |
Context
|
2017-05-29
| ||
| 21:13 | 3-way merge sebres-trunk-clock-speedup / core-8-6-branch (clock speed-up / flightaware Tcl-bounties#... check-in: fd30c76c7a user: sebres tags: trunk | |
| 20:37 | merge sebres-8-6-clock-speedup Closed-Leaf check-in: f65c70bf87 user: sebres tags: sebres-trunk-clock-speedup | |
|
2017-05-16
| ||
| 09:22 | small amend with forgetten static keyword by option Closed-Leaf check-in: 155b0b9754 user: sebres tags: sebres-8-6-clock-speedup | |
|
2017-05-15
| ||
| 18:35 | merge sebres-8-6-clock-speedup check-in: f2b00e3ceb user: sebres tags: sebres-trunk-clock-speedup | |
Changes
Changes to generic/tclClock.c.
| ︙ | ︙ | |||
3106 3107 3108 3109 3110 3111 3112 |
if (opts->timezoneObj == NULL) {
return TCL_ERROR;
}
/* Base (by scan or add) or clock value (by format) */
if (opts->baseObj != NULL) {
| > > > > | > | | | | | 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 |
if (opts->timezoneObj == NULL) {
return TCL_ERROR;
}
/* Base (by scan or add) or clock value (by format) */
if (opts->baseObj != NULL) {
register Tcl_Obj *baseObj = opts->baseObj;
/* bypass integer recognition if looks like option "-now" */
if (
(baseObj->length == 4 && baseObj->bytes && *(baseObj->bytes+1) == 'n') ||
TclGetWideIntFromObj(NULL, baseObj, &baseVal) != TCL_OK
) {
/* we accept "-now" as current date-time */
static const char *const nowOpts[] = {
"-now", NULL
};
int idx;
if (Tcl_GetIndexFromObj(NULL, baseObj, nowOpts, "seconds or -now",
TCL_EXACT, &idx) == TCL_OK
) {
goto baseNow;
}
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"expected integer but got \"%s\"",
Tcl_GetString(baseObj)));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "INTEGER", NULL);
i = 1;
goto badOption;
}
/*
* seconds could be an unsigned number that overflowed. Make sure
* that it isn't.
*/
if (baseObj->typePtr == &tclBignumType) {
Tcl_SetObjResult(interp, dataPtr->literals[LIT_INTEGER_VALUE_TOO_LARGE]);
return TCL_ERROR;
}
} else {
baseNow:
|
| ︙ | ︙ |
Changes to generic/tclClockFmt.c.
| ︙ | ︙ | |||
30 31 32 33 34 35 36 | TCL_DECLARE_MUTEX(ClockFmtMutex); /* Serializes access to common format list. */ static void ClockFmtScnStorageDelete(ClockFmtScnStorage *fss); static void ClockFrmScnFinalize(ClientData clientData); | < < < | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | TCL_DECLARE_MUTEX(ClockFmtMutex); /* Serializes access to common format list. */ static void ClockFmtScnStorageDelete(ClockFmtScnStorage *fss); static void ClockFrmScnFinalize(ClientData clientData); /* * Clock scan and format facilities. */ /* *---------------------------------------------------------------------- * |
| ︙ | ︙ | |||
1902 1903 1904 1905 1906 1907 1908 |
}
}
return ++tokcnt;
}
#define AllocTokenInChain(tok, chain, tokCnt) \
if (++(tok) >= (chain) + (tokCnt)) { \
| | | 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 |
}
}
return ++tokcnt;
}
#define AllocTokenInChain(tok, chain, tokCnt) \
if (++(tok) >= (chain) + (tokCnt)) { \
chain = ckrealloc((char *)(chain), \
(tokCnt + CLOCK_MIN_TOK_CHAIN_BLOCK_SIZE) * sizeof(*(tok))); \
if ((chain) == NULL) { goto done; }; \
(tok) = (chain) + (tokCnt); \
(tokCnt) += CLOCK_MIN_TOK_CHAIN_BLOCK_SIZE; \
} \
memset(tok, 0, sizeof(*(tok)));
|
| ︙ | ︙ |