diff options
| author | Björn Jacke <bj@sernet.de> | 2010-08-24 11:14:19 +0200 |
|---|---|---|
| committer | Björn Jacke <bj@sernet.de> | 2010-08-31 09:07:42 +0200 |
| commit | 8c6ca6e25a4d33e4f9ae2ef13a3872cd533ba6f6 (patch) | |
| tree | f50dc3fa86a857c4dd244b2914f4227fc0abe773 | |
| parent | 8589f46b86b8acd0439e1325818cc69f9050240d (diff) | |
| download | samba-8c6ca6e25a4d33e4f9ae2ef13a3872cd533ba6f6.tar.gz samba-8c6ca6e25a4d33e4f9ae2ef13a3872cd533ba6f6.tar.bz2 samba-8c6ca6e25a4d33e4f9ae2ef13a3872cd533ba6f6.zip | |
s3: we have clock_gettime everywhere, remove ifdefs
| -rw-r--r-- | source3/include/smbprofile.h | 13 | ||||
| -rw-r--r-- | source3/profile/profile.c | 7 |
2 files changed, 0 insertions, 20 deletions
diff --git a/source3/include/smbprofile.h b/source3/include/smbprofile.h index e9015ffc78..60764794fc 100644 --- a/source3/include/smbprofile.h +++ b/source3/include/smbprofile.h @@ -894,8 +894,6 @@ extern bool do_profile_times; #define DEC_PROFILE_COUNT(x) profile_p->x-- #define ADD_PROFILE_COUNT(x,y) profile_p->x += (y) -#if defined(HAVE_CLOCK_GETTIME) - extern clockid_t __profile_clock; static inline uint64_t profile_timestamp(void) @@ -911,17 +909,6 @@ static inline uint64_t profile_timestamp(void) return (ts.tv_sec * 1000000) + (ts.tv_nsec / 1000); /* usec */ } -#else - -static inline uint64_t profile_timestamp(void) -{ - struct timeval tv; - GetTimeOfDay(&tv); - return (tv.tv_sec * 1000000) + tv.tv_usec; -} - -#endif - /* end of helper macros */ #define DO_PROFILE_INC(x) \ diff --git a/source3/profile/profile.c b/source3/profile/profile.c index c8e7c38da7..4a61753ea3 100644 --- a/source3/profile/profile.c +++ b/source3/profile/profile.c @@ -29,11 +29,9 @@ #ifdef WITH_PROFILE static int shm_id; static bool read_only; -#if defined(HAVE_CLOCK_GETTIME) clockid_t __profile_clock; bool have_profiling_clock = False; #endif -#endif struct profile_header *profile_h; struct profile_stats *profile_p; @@ -138,8 +136,6 @@ static void reqprofile_message(struct messaging_context *msg_ctx, open the profiling shared memory area ******************************************************************/ -#ifdef HAVE_CLOCK_GETTIME - /* Find a clock. Just because the definition for a particular clock ID is * present doesn't mean the system actually supports it. */ @@ -195,7 +191,6 @@ static void init_clock_gettime(void) ("could not find a working clock for profiling")); return; } -#endif bool profile_setup(struct messaging_context *msg_ctx, bool rdonly) { @@ -203,9 +198,7 @@ bool profile_setup(struct messaging_context *msg_ctx, bool rdonly) read_only = rdonly; -#ifdef HAVE_CLOCK_GETTIME init_clock_gettime(); -#endif again: /* try to use an existing key */ |