experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid copying timeval onto stack

Browse source
This commit is contained in:
Philip Prindeville 2023-08-14 17:52:59 +00:00 • committed by Olof Hagsand
parent 4a605ff25e
commit dc0f740a04
5 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/backend/backend_client.c
View file

@ -215,7 +215,7 @@ backend_monitoring_state_get(clicon_handle h,
if (ce->ce_source_host) if (ce->ce_source_host)
cprintf(cb, "<source-host>%s</source-host>", ce->ce_source_host); cprintf(cb, "<source-host>%s</source-host>", ce->ce_source_host);
if (ce->ce_time.tv_sec != 0){ if (ce->ce_time.tv_sec != 0){
if (time2str(ce->ce_time, timestr, sizeof(timestr)) < 0){ if (time2str(&ce->ce_time, timestr, sizeof(timestr)) < 0){
clicon_err(OE_UNIX, errno, "time2str"); clicon_err(OE_UNIX, errno, "time2str");
goto done; goto done;
} }

6
lib/src/clixon_netconf_monitoring.c
View file

@ -74,7 +74,7 @@ per_datastore(clicon_handle h,
{ {
int retval = -1; int retval = -1;
uint32_t sid; uint32_t sid;
struct timeval tv = {0,}; struct timeval tv;
char timestr[28]; char timestr[28];
cprintf(cb, "<datastore><name>%s</name>", db); cprintf(cb, "<datastore><name>%s</name>", db);
@ -83,7 +83,7 @@ per_datastore(clicon_handle h,
cprintf(cb, "<global-lock>"); cprintf(cb, "<global-lock>");
cprintf(cb, "<locked-by-session>%u</locked-by-session>", sid); cprintf(cb, "<locked-by-session>%u</locked-by-session>", sid);
xmldb_lock_timestamp(h, db, &tv); xmldb_lock_timestamp(h, db, &tv);
if (time2str(tv, timestr, sizeof(timestr)) < 0){ if (time2str(&tv, timestr, sizeof(timestr)) < 0){
clicon_err(OE_UNIX, errno, "time2str"); clicon_err(OE_UNIX, errno, "time2str");
goto done; goto done;
} }
@ -321,7 +321,7 @@ netconf_monitoring_statistics_init(clicon_handle h)
cvec *cvv = NULL; cvec *cvv = NULL;
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
if (time2str(tv, timestr, sizeof(timestr)) < 0) if (time2str(&tv, timestr, sizeof(timestr)) < 0)
goto done; goto done;
clicon_data_set(h, "netconf-start-time", timestr); /* RFC 6022 */ clicon_data_set(h, "netconf-start-time", timestr); /* RFC 6022 */
if ((cvv = cvec_new(0)) == NULL){ if ((cvv = cvec_new(0)) == NULL){

2
lib/src/clixon_proc.c
View file

@ -753,7 +753,7 @@ clixon_process_status(clicon_handle h,
cprintf(cbret, "<status xmlns=\"%s\">%s</status>", CLIXON_LIB_NS, cprintf(cbret, "<status xmlns=\"%s\">%s</status>", CLIXON_LIB_NS,
clicon_int2str(proc_state_map, pe->pe_state)); clicon_int2str(proc_state_map, pe->pe_state));
if (timerisset(&pe->pe_starttime)){ if (timerisset(&pe->pe_starttime)){
if (time2str(pe->pe_starttime, timestr, sizeof(timestr)) < 0){ if (time2str(&pe->pe_starttime, timestr, sizeof(timestr)) < 0){
clicon_err(OE_UNIX, errno, "time2str"); clicon_err(OE_UNIX, errno, "time2str");
goto done; goto done;
} }

4
lib/src/clixon_stream.c
View file

@ -580,7 +580,7 @@ stream_notify(clicon_handle h,
goto done; goto done;
} }
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
if (time2str(tv, timestr, sizeof(timestr)) < 0){ if (time2str(&tv, timestr, sizeof(timestr)) < 0){
clicon_err(OE_UNIX, errno, "time2str"); clicon_err(OE_UNIX, errno, "time2str");
goto done; goto done;
} }
@ -645,7 +645,7 @@ stream_notify_xml(clicon_handle h,
goto done; goto done;
} }
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
if (time2str(tv, timestr, sizeof(timestr)) < 0){ if (time2str(&tv, timestr, sizeof(timestr)) < 0){
clicon_err(OE_UNIX, errno, "time2str"); clicon_err(OE_UNIX, errno, "time2str");
goto done; goto done;
} }

10
util/clixon_util_stream.c
View file

@ -241,10 +241,9 @@ main(int argc, char **argv)
break; break;
case 's': /* start-time */ case 's': /* start-time */
if (*optarg == '+' || *optarg == '-'){ if (*optarg == '+' || *optarg == '-'){
struct timeval t; struct timeval t = now;
t = now;
t.tv_sec += atoi(optarg); t.tv_sec += atoi(optarg);
if (time2str(t, start, sizeof(start)) < 0) if (time2str(&t, start, sizeof(start)) < 0)
goto done; goto done;
} }
else else
@ -252,10 +251,9 @@ main(int argc, char **argv)
break; break;
case 'e': /* stop-time */ case 'e': /* stop-time */
if (*optarg == '+' || *optarg == '-'){ if (*optarg == '+' || *optarg == '-'){
struct timeval t; struct timeval t = now;
t = now;
t.tv_sec += atoi(optarg); t.tv_sec += atoi(optarg);
if (time2str(t, stop, sizeof(stop)) < 0) if (time2str(&t, stop, sizeof(stop)) < 0)
goto done; goto done;
} }
else else