r16116: Hoist the slow CLOCK_REALTIME message inside the branch so we never
authorJames Peach <jpeach@samba.org>
Fri, 9 Jun 2006 10:50:45 +0000 (10:50 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 16:17:21 +0000 (11:17 -0500)
confuse an uninitialised __profile_clock with CLOCK_REALTIME. Flip the
condition argument to SMB_WARN around so that it's correct (though
completely non-intuitive).

source/profile/profile.c

index b0db629682986d7a01b1cff6b902a8194dcded76..c3512ec01d83eca19b232ffc8883354b3fc9ea5f 100644 (file)
@@ -150,7 +150,6 @@ static void init_clock_gettime(void)
                DEBUG(10, ("Using CLOCK_MONOTONIC for profile_clock\n"));
                __profile_clock = CLOCK_MONOTONIC;
                have_profiling_clock = True;
-               return;
        }
 #endif
 
@@ -162,15 +161,16 @@ static void init_clock_gettime(void)
            clock_gettime(CLOCK_REALTIME, &ts) == 0) {
                __profile_clock = CLOCK_REALTIME;
                have_profiling_clock = True;
+
+               SMB_WARN(__profile_clock != CLOCK_REALTIME,
+                       ("forced to use a slow profiling clock"));
        }
 
-       SMB_WARN(__profile_clock == CLOCK_REALTIME,
-               ("Using (slow) CLOCK_REALTIME for profile_clock"));
 #endif
 
-       SMB_WARN(have_profiling_clock == False,
+       SMB_WARN(have_profiling_clock == True,
                ("could not find a working clock for profiling"));
-       return have_profiling_clock;
+       return;
 }
 #endif