<p>Philip Prindeville has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/18013">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">time: add support for time64 libcs<br><br>On 32-bit low-end platforms, unnecessary promotions to 64-bit values<br>can be expensive, especially if division is subsequently involved<br>(such as during base10 formatting, etc). We also want to avoid any<br>potential loss-of-precision when down-converting back in the opposite<br>direction.<br><br>Lastly, a 64-bit integer formats as 20 digits at most in base10.<br>Don't need to have any 100 byte buffers to hold that.<br><br>ASTERISK-29674 #close<br><br>Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com><br>Change-Id: Id7b25bdca8f92e34229f6454f6c3e500f2cd6f56<br>---<br>M include/asterisk/time.h<br>M res/res_calendar_caldav.c<br>M res/res_calendar_icalendar.c<br>M res/res_http_media_cache.c<br>M res/res_odbc.c<br>M res/res_pjsip/location.c<br>M res/res_pjsip/pjsip_options.c<br>M res/res_pjsip_history.c<br>M res/res_pjsip_pubsub.c<br>M res/res_pjsip_registrar.c<br>M res/res_stir_shaken.c<br>11 files changed, 26 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/13/18013/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/asterisk/time.h b/include/asterisk/time.h</span><br><span>index e2ab513..d9b26b9 100644</span><br><span>--- a/include/asterisk/time.h</span><br><span>+++ b/include/asterisk/time.h</span><br><span>@@ -29,6 +29,14 @@</span><br><span> #include <sys/time.h></span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef __USE_TIME_BITS64</span><br><span style="color: hsl(120, 100%, 40%);">+#define TIME_T_FMT PRId64</span><br><span style="color: hsl(120, 100%, 40%);">+#define TIME_T_FMT_U PRIu64</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+#define TIME_T_FMT "ld"</span><br><span style="color: hsl(120, 100%, 40%);">+#define TIME_T_FMT_U "lu"</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #ifdef HAVE_UNISTD_H</span><br><span> #include <unistd.h></span><br><span> #endif</span><br><span>diff --git a/res/res_calendar_caldav.c b/res/res_calendar_caldav.c</span><br><span>index 9bdde0e..01804f2 100644</span><br><span>--- a/res/res_calendar_caldav.c</span><br><span>+++ b/res/res_calendar_caldav.c</span><br><span>@@ -404,8 +404,8 @@</span><br><span> if (!ast_strlen_zero(event->summary)) {</span><br><span> ast_string_field_set(event, uid, event->summary);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- char tmp[100];</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(tmp, sizeof(tmp), "%ld", event->start);</span><br><span style="color: hsl(120, 100%, 40%);">+ char tmp[24];</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, event->start);</span><br><span> ast_string_field_set(event, uid, tmp);</span><br><span> }</span><br><span> }</span><br><span>diff --git a/res/res_calendar_icalendar.c b/res/res_calendar_icalendar.c</span><br><span>index 999cf0e..b69b646 100644</span><br><span>--- a/res/res_calendar_icalendar.c</span><br><span>+++ b/res/res_calendar_icalendar.c</span><br><span>@@ -245,8 +245,8 @@</span><br><span> if (!ast_strlen_zero(event->summary)) {</span><br><span> ast_string_field_set(event, uid, event->summary);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- char tmp[100];</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(tmp, sizeof(tmp), "%ld", event->start);</span><br><span style="color: hsl(120, 100%, 40%);">+ char tmp[24];</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, event->start);</span><br><span> ast_string_field_set(event, uid, tmp);</span><br><span> }</span><br><span> }</span><br><span>diff --git a/res/res_http_media_cache.c b/res/res_http_media_cache.c</span><br><span>index c0363b1..05698d3 100644</span><br><span>--- a/res/res_http_media_cache.c</span><br><span>+++ b/res/res_http_media_cache.c</span><br><span>@@ -152,7 +152,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Use 'now' if we didn't get an expiration time */</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(time_buf, sizeof(time_buf), "%30lu", actual_expires.tv_sec);</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(time_buf, sizeof(time_buf), "%30" TIME_T_FMT_U, actual_expires.tv_sec);</span><br><span> </span><br><span> ast_bucket_file_metadata_set(bucket_file, "__actual_expires", time_buf);</span><br><span> }</span><br><span>@@ -306,7 +306,7 @@</span><br><span> return 1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (sscanf(metadata->value, "%lu", &expires.tv_sec) != 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sscanf(metadata->value, "%" TIME_T_FMT_U, &expires.tv_sec) != 1) {</span><br><span> return 1;</span><br><span> }</span><br><span> </span><br><span>diff --git a/res/res_odbc.c b/res/res_odbc.c</span><br><span>index 63fdf37..cd9fcc9 100644</span><br><span>--- a/res/res_odbc.c</span><br><span>+++ b/res/res_odbc.c</span><br><span>@@ -1029,7 +1029,7 @@</span><br><span> /* Dont connect while server is marked as unreachable via negative_connection_cache */</span><br><span> negative_cache_expiration = obj->parent->last_negative_connect.tv_sec + obj->parent->negative_connection_cache.tv_sec;</span><br><span> if (time(NULL) < negative_cache_expiration) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_log(LOG_WARNING, "Not connecting to %s. Negative connection cache for %ld seconds\n", obj->parent->name, negative_cache_expiration - time(NULL));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_log(LOG_WARNING, "Not connecting to %s. Negative connection cache for %" TIME_T_FMT " seconds\n", obj->parent->name, negative_cache_expiration - time(NULL));</span><br><span> return ODBC_FAIL;</span><br><span> }</span><br><span> </span><br><span>diff --git a/res/res_pjsip/location.c b/res/res_pjsip/location.c</span><br><span>index bae8a2d..6c48eba 100644</span><br><span>--- a/res/res_pjsip/location.c</span><br><span>+++ b/res/res_pjsip/location.c</span><br><span>@@ -489,7 +489,7 @@</span><br><span> static int expiration_struct2str(const void *obj, const intptr_t *args, char **buf)</span><br><span> {</span><br><span> const struct ast_sip_contact *contact = obj;</span><br><span style="color: hsl(0, 100%, 40%);">- return (ast_asprintf(buf, "%ld", contact->expiration_time.tv_sec) < 0) ? -1 : 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return (ast_asprintf(buf, "%" TIME_T_FMT, contact->expiration_time.tv_sec) < 0) ? -1 : 0;</span><br><span> }</span><br><span> </span><br><span> static int permanent_uri_sort_fn(const void *obj_left, const void *obj_right, int flags)</span><br><span>diff --git a/res/res_pjsip/pjsip_options.c b/res/res_pjsip/pjsip_options.c</span><br><span>index e1f048e..58c0b19 100644</span><br><span>--- a/res/res_pjsip/pjsip_options.c</span><br><span>+++ b/res/res_pjsip/pjsip_options.c</span><br><span>@@ -2733,7 +2733,7 @@</span><br><span> ast_str_append(&buf, 0, "AOR: %s\r\n", wrapper->aor_id);</span><br><span> ast_str_append(&buf, 0, "URI: %s\r\n", contact->uri);</span><br><span> ast_str_append(&buf, 0, "UserAgent: %s\r\n", contact->user_agent);</span><br><span style="color: hsl(0, 100%, 40%);">- ast_str_append(&buf, 0, "RegExpire: %ld\r\n", contact->expiration_time.tv_sec);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&buf, 0, "RegExpire: %" TIME_T_FMT "\r\n", contact->expiration_time.tv_sec);</span><br><span> if (!ast_strlen_zero(contact->via_addr)) {</span><br><span> ast_str_append(&buf, 0, "ViaAddress: %s", contact->via_addr);</span><br><span> if (contact->via_port) {</span><br><span>diff --git a/res/res_pjsip_history.c b/res/res_pjsip_history.c</span><br><span>index de1063b..2214ac2 100644</span><br><span>--- a/res/res_pjsip_history.c</span><br><span>+++ b/res/res_pjsip_history.c</span><br><span>@@ -199,7 +199,7 @@</span><br><span> {</span><br><span> struct timeval right = { 0, };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (sscanf(op_right->field, "%ld", &right.tv_sec) != 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sscanf(op_right->field, "%" TIME_T_FMT, &right.tv_sec) != 1) {</span><br><span> ast_log(LOG_WARNING, "Unable to extract field '%s': not a timestamp\n", op_right->field);</span><br><span> return -1;</span><br><span> }</span><br><span>@@ -270,7 +270,7 @@</span><br><span> {</span><br><span> struct timeval right = { 0, };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (sscanf(op_right->field, "%ld", &right.tv_sec) != 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sscanf(op_right->field, "%" TIME_T_FMT, &right.tv_sec) != 1) {</span><br><span> ast_log(LOG_WARNING, "Unable to extract field '%s': not a timestamp\n", op_right->field);</span><br><span> return -1;</span><br><span> }</span><br><span>@@ -319,7 +319,7 @@</span><br><span> {</span><br><span> struct timeval right = { 0, };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (sscanf(op_right->field, "%ld", &right.tv_sec) != 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sscanf(op_right->field, "%" TIME_T_FMT, &right.tv_sec) != 1) {</span><br><span> ast_log(LOG_WARNING, "Unable to extract field '%s': not a timestamp\n", op_right->field);</span><br><span> return -1;</span><br><span> }</span><br><span>@@ -668,7 +668,7 @@</span><br><span> char uri[128];</span><br><span> </span><br><span> pjsip_uri_print(PJSIP_URI_IN_REQ_URI, entry->msg->line.req.uri, uri, sizeof(uri));</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(line, len, "%-5.5d %-10.10ld %-5.5s %-24.24s %.*s %s SIP/2.0",</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(line, len, "%-5.5d %-10.10" TIME_T_FMT " %-5.5s %-24.24s %.*s %s SIP/2.0",</span><br><span> entry->number,</span><br><span> entry->timestamp.tv_sec,</span><br><span> entry->transmitted ? "* ==>" : "* <==",</span><br><span>@@ -677,7 +677,7 @@</span><br><span> pj_strbuf(&entry->msg->line.req.method.name),</span><br><span> uri);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(line, len, "%-5.5d %-10.10ld %-5.5s %-24.24s SIP/2.0 %u %.*s",</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(line, len, "%-5.5d %-10.10" TIME_T_FMT " %-5.5s %-24.24s SIP/2.0 %u %.*s",</span><br><span> entry->number,</span><br><span> entry->timestamp.tv_sec,</span><br><span> entry->transmitted ? "* ==>" : "* <==",</span><br><span>@@ -1169,7 +1169,7 @@</span><br><span> pj_sockaddr_print(&entry->src, addr, sizeof(addr), 3);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ast_cli(a->fd, "<--- History Entry %d %s %s at %-10.10ld --->\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_cli(a->fd, "<--- History Entry %d %s %s at %-10.10" TIME_T_FMT " --->\n",</span><br><span> entry->number,</span><br><span> entry->transmitted ? "Sent to" : "Received from",</span><br><span> addr,</span><br><span>diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c</span><br><span>index 31394e2..c0d7535 100644</span><br><span>--- a/res/res_pjsip_pubsub.c</span><br><span>+++ b/res/res_pjsip_pubsub.c</span><br><span>@@ -4744,7 +4744,7 @@</span><br><span> static int persistence_expires_struct2str(const void *obj, const intptr_t *args, char **buf)</span><br><span> {</span><br><span> const struct subscription_persistence *persistence = obj;</span><br><span style="color: hsl(0, 100%, 40%);">- return (ast_asprintf(buf, "%ld", persistence->expires.tv_sec) < 0) ? -1 : 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return (ast_asprintf(buf, "%" TIME_T_FMT, persistence->expires.tv_sec) < 0) ? -1 : 0;</span><br><span> }</span><br><span> </span><br><span> #define RESOURCE_LIST_INIT_SIZE 4</span><br><span>diff --git a/res/res_pjsip_registrar.c b/res/res_pjsip_registrar.c</span><br><span>index 9c999c1..0282900 100644</span><br><span>--- a/res/res_pjsip_registrar.c</span><br><span>+++ b/res/res_pjsip_registrar.c</span><br><span>@@ -1370,7 +1370,7 @@</span><br><span> while (check_interval) {</span><br><span> sleep(check_interval);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- sprintf(time, "%ld", ast_tvnow().tv_sec);</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(time, 64, "%" TIME_T_FMT, ast_tvnow().tv_sec);</span><br><span> var = ast_variable_new("expiration_time <=", time, "");</span><br><span> </span><br><span> ast_debug(4, "Woke up at %s Interval: %d\n", time, check_interval);</span><br><span>diff --git a/res/res_stir_shaken.c b/res/res_stir_shaken.c</span><br><span>index 373a1a1..da5a1c0 100644</span><br><span>--- a/res/res_stir_shaken.c</span><br><span>+++ b/res/res_stir_shaken.c</span><br><span>@@ -389,7 +389,7 @@</span><br><span> actual_expires.tv_sec += EXPIRATION_BUFFER;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(time_buf, sizeof(time_buf), "%30lu", actual_expires.tv_sec);</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(time_buf, sizeof(time_buf), "%30" TIME_T_FMT, actual_expires.tv_sec);</span><br><span> </span><br><span> ast_db_put(hash, "expiration", time_buf);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/18013">change 18013</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/18013"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id7b25bdca8f92e34229f6454f6c3e500f2cd6f56 </div>
<div style="display:none"> Gerrit-Change-Number: 18013 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Philip Prindeville <philipp@redfish-solutions.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>