diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2012-06-13 09:13:04 -0400 | 
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2012-06-29 14:08:14 -0700 | 
| commit | 5672e77d3102a990a2aa11e7e56ebfe6a0eee369 (patch) | |
| tree | c92612a433383c70a9e4557ddaffbcdc348e0921 /rpc/rpc-lib/src | |
| parent | d87bd36040128c6553e8ee06a363eeb60d16e72c (diff) | |
localtime and ctime are not MT-SAFE
There are a number of nit-level issues throughout the source with
the use of localtime and ctime. While they apparently aren't causing
too many problems, apart from the one in bz 828058, they ought to be
fixed.  Among the "real" problems that are fixed in this patch:
 1) general localtime and ctime not MT-SAFE. There's a non-zero chance
    that another thread calling localtime (or ctime) will over-write
    the static data about to be used in another thread
 2) localtime(& <64-bit-type>) or ctime(& <64-bit-type>) generally
    not a problem on 64-bit or little-endian 32-bit. But even though
    we probably have zero users on big-ending 32-bit platforms, it's
    still incorrect.
 3) multiple nested calls passed as params. Last one wins, i.e. over-
    writes result of prior calls.
 4) Inconsistent error handling. Most of these calls are for logging,
    tracing, or dumping. I submit that if an error somehow occurs in
    the call to localtime or ctime, the log/trace/dump still should
    still occur.
 5) Appliances should all have their clocks set to UTC, and all log
    entries, traces, and dumps should use GMT.
 6) fix strtok(), change to strtok_r()
Other things this patch fixes/changes (that aren't bugs per se):
 1) Change "%Y-%m-%d %H:%M:%S" and similar to their equivalent shorthand,
    e.g. "%F %T"
 2) change sizeof(timestr) to sizeof timestr. sizeof is an operator,
    not a function. You don't use i +(32), why use sizeof(<var>).
    (And yes, you do use parens with sizeof(<type>).)
 3) change 'char timestr[256]' to 'char timestr[32]' where appropriate.
    Per-thread stack is limited. Time strings are never longer than ~20
    characters, so why waste 220+ bytes on the stack?
Things this patch doesn't fix:
 1) hodgepodge of %Y-%m-%d %H:%M:%S versus %Y/%m/%d-%H%M%S and other
    variations. It's not clear to me whether this ever matters, not to
    mention 3rd party log filtering tools may already rely on a
    particular format. Still it would be nice to have a single manifest
    constant and have every call to localtime/strftime consistently use
    the same format.
Change-Id: I827cad7bf53e57b69c0173f67abe72884249c1a9
BUG: 832173
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.com/3568
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'rpc/rpc-lib/src')
| -rw-r--r-- | rpc/rpc-lib/src/rpc-clnt.c | 13 | 
1 files changed, 5 insertions, 8 deletions
diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c index 356b10c29a7..21066dfc596 100644 --- a/rpc/rpc-lib/src/rpc-clnt.c +++ b/rpc/rpc-lib/src/rpc-clnt.c @@ -144,7 +144,6 @@ call_bail (void *data)          struct saved_frame    *saved_frame = NULL;          struct saved_frame    *trav = NULL;          struct saved_frame    *tmp = NULL; -        struct tm              frame_sent_tm;          char                   frame_sent[256] = {0,};          struct timeval         timeout = {0,};          struct iovec           iov = {0,}; @@ -191,8 +190,8 @@ call_bail (void *data)          pthread_mutex_unlock (&conn->lock);          list_for_each_entry_safe (trav, tmp, &list, list) { -                localtime_r (&trav->saved_at.tv_sec, &frame_sent_tm); -                strftime (frame_sent, 32, "%Y-%m-%d %H:%M:%S", &frame_sent_tm); +                gf_time_fmt (frame_sent, sizeof frame_sent, +                             trav->saved_at.tv_sec, gf_timefmt_FT);                  snprintf (frame_sent + strlen (frame_sent),                            256 - strlen (frame_sent),                            ".%"GF_PRI_SUSECONDS, trav->saved_at.tv_usec); @@ -343,17 +342,15 @@ saved_frames_unwind (struct saved_frames *saved_frames)          struct rpc_clnt      *clnt = NULL;  	struct saved_frame   *trav = NULL;  	struct saved_frame   *tmp = NULL; -        struct tm            *frame_sent_tm = NULL; -        char                 timestr[256] = {0,}; +        char                  timestr[1024] = {0,};          struct iovec          iov = {0,};          list_splice_init (&saved_frames->lk_sf.list, &saved_frames->sf.list);  	list_for_each_entry_safe (trav, tmp, &saved_frames->sf.list, list) { -                frame_sent_tm = localtime (&trav->saved_at.tv_sec); -                strftime (timestr, sizeof(timestr), "%Y-%m-%d %H:%M:%S", -                          frame_sent_tm); +                gf_time_fmt (timestr, sizeof timestr, +                             trav->saved_at.tv_sec, gf_timefmt_FT);                  snprintf (timestr + strlen (timestr),                            sizeof(timestr) - strlen (timestr),                            ".%"GF_PRI_SUSECONDS, trav->saved_at.tv_usec);  | 
