greg/stasis-aries-wal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix INT64_MAX in C++; add some missing casts

Browse source
This commit is contained in:
Rusty Sears 2013-01-30 14:07:16 -08:00
parent b11d7fb4a7
commit ed791137b1
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
stasis/common.h
View file

@ -71,6 +71,7 @@ terms specified in this license.
#endif #endif
#include <alloca.h> #include <alloca.h>
#define __STDC_LIMIT_MACROS // to get stdint.h to define the *_MAX and *_MIN macros under C++.
#include <stdint.h> // uint32, et. al. (has to be before sys/types.h for mcpp atop some broken gcc headers) #include <stdint.h> // uint32, et. al. (has to be before sys/types.h for mcpp atop some broken gcc headers)
#include <sys/types.h> // for size_t #include <sys/types.h> // for size_t
#include <dirent.h> #include <dirent.h>

4
stasis/util/histogram.h
View file

@ -65,12 +65,12 @@ static inline void stasis_histogram_insert_log_timeval(stasis_histogram_64_t* hi
} }
static inline void stasis_histogram_tick(stasis_histogram_64_t* hist) { static inline void stasis_histogram_tick(stasis_histogram_64_t* hist) {
struct timeval * val = pthread_getspecific(hist->tls); struct timeval * val = (struct timeval *)pthread_getspecific(hist->tls);
if(!val) { val = stasis_alloc(struct timeval); pthread_setspecific(hist->tls, val); } if(!val) { val = stasis_alloc(struct timeval); pthread_setspecific(hist->tls, val); }
gettimeofday(val,0); gettimeofday(val,0);
} }
static inline void stasis_histogram_tock(stasis_histogram_64_t* hist) { static inline void stasis_histogram_tock(stasis_histogram_64_t* hist) {
struct timeval * val = pthread_getspecific(hist->tls); struct timeval * val = (struct timeval *)pthread_getspecific(hist->tls);
assert(val); assert(val);
struct timeval now; struct timeval now;
gettimeofday(&now,0); gettimeofday(&now,0);