Changeset 740 for vendor/current/source3/profile/profile.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/profile/profile.c (modified) (7 diffs)

vendor/current/source3/profile/profile.c

@@ -21 +21 @@
 
 #include "includes.h"
+#include "system/shmem.h"
+#include "system/filesys.h"
+#include "messages.h"
+#include "smbprofile.h"
 
 #ifdef WITH_PROFILE
@@ -29 +33 @@
 static int shm_id;
 static bool read_only;
-#if defined(HAVE_CLOCK_GETTIME)
-clockid_t __profile_clock;
-bool have_profiling_clock = False;
-#endif
 #endif
 
@@ -61 +61 @@
                 break;
         case 2:         /* turn on complete profiling */
-
-#if defined(HAVE_CLOCK_GETTIME)
-                if (!have_profiling_clock) {
-                        do_profile_flag = True;
-                        do_profile_times = False;
-                        DEBUG(1,("INFO: Profiling counts turned ON from "
-                                "pid %d\n", (int)procid_to_pid(&src)));
-                        DEBUGADD(1,("INFO: Profiling times disabled "
-                                "due to lack of a suitable clock\n"));
-                        break;
-                }
-#endif
-
                 do_profile_flag = True;
                 do_profile_times = True;
@@ -137 +124 @@
   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.
- */
-static void init_clock_gettime(void)
-{
-        struct timespec ts;
-
-        have_profiling_clock = False;
-
-#ifdef HAVE_CLOCK_PROCESS_CPUTIME_ID
-        /* CLOCK_PROCESS_CPUTIME_ID is sufficiently fast that the
-         * always profiling times is plausible. Unfortunately on Linux
-         * it is only accurate if we can guarantee we will not be scheduled
-         * scheduled onto a different CPU between samples. Until there is
-         * some way to set processor affinity, we can only use this on
-         * uniprocessors.
-         */
-        if (!this_is_smp()) {
-            if (clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ts) == 0) {
-                    DEBUG(10, ("Using CLOCK_PROCESS_CPUTIME_ID "
-                                "for profile_clock\n"));
-                    __profile_clock = CLOCK_PROCESS_CPUTIME_ID;
-                    have_profiling_clock = True;
-            }
-        }
-#endif
-
-#ifdef HAVE_CLOCK_MONOTONIC
-        if (!have_profiling_clock &&
-            clock_gettime(CLOCK_MONOTONIC, &ts) == 0) {
-                DEBUG(10, ("Using CLOCK_MONOTONIC for profile_clock\n"));
-                __profile_clock = CLOCK_MONOTONIC;
-                have_profiling_clock = True;
-        }
-#endif
-
-#ifdef HAVE_CLOCK_REALTIME
-        /* POSIX says that CLOCK_REALTIME should be defined everywhere
-         * where we have clock_gettime...
-         */
-        if (!have_profiling_clock &&
-            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"));
-        }
-
-#endif
-
-        SMB_WARN(have_profiling_clock == True,
-                ("could not find a working clock for profiling"));
-        return;
-}
-#endif
-
 bool profile_setup(struct messaging_context *msg_ctx, bool rdonly)
 {
@@ -202 +129 @@
 
         read_only = rdonly;
-
-#ifdef HAVE_CLOCK_GETTIME
-        init_clock_gettime();
-#endif
 
  again:
@@ -315 +238 @@
             "syscall_ntimes",           /* PR_VALUE_SYSCALL_NTIMES */
             "syscall_ftruncate",        /* PR_VALUE_SYSCALL_FTRUNCATE */
+            "syscall_fallocate",        /* PR_VALUE_SYSCALL_FALLOCATE */
             "syscall_fcntl_lock",       /* PR_VALUE_SYSCALL_FCNTL_LOCK */
             "syscall_kernel_flock",     /* PR_VALUE_SYSCALL_KERNEL_FLOCK */
@@ -455 +379 @@
             "run_elections",            /* PR_VALUE_RUN_ELECTIONS */
             "election",                 /* PR_VALUE_ELECTION */
+            "smb2_negprot",             /* PR_VALUE_SMB2_NEGPROT */
+            "smb2_sesssetup",           /* PR_VALUE_SMB2_SESSETUP */
+            "smb2_logoff",              /* PR_VALUE_SMB2_LOGOFF */
+            "smb2_tcon",                /* PR_VALUE_SMB2_TCON */
+            "smb2_tdis",                /* PR_VALUE_SMB2_TDIS */
+            "smb2_create",              /* PR_VALUE_SMB2_CREATE */
+            "smb2_close",               /* PR_VALUE_SMB2_CLOSE */
+            "smb2_flush",               /* PR_VALUE_SMB2_FLUSH */
+            "smb2_read",                /* PR_VALUE_SMB2_READ */
+            "smb2_write",               /* PR_VALUE_SMB2_WRITE */
+            "smb2_lock",                /* PR_VALUE_SMB2_LOCK */
+            "smb2_ioctl",               /* PR_VALUE_SMB2_IOCTL */
+            "smb2_cancel",              /* PR_VALUE_SMB2_CANCEL */
+            "smb2_keepalive",           /* PR_VALUE_SMB2_KEEPALIVE */
+            "smb2_find",                /* PR_VALUE_SMB2_FIND */
+            "smb2_notify",              /* PR_VALUE_SMB2_NOTIFY */
+            "smb2_getinfo",             /* PR_VALUE_SMB2_GETINFO */
+            "smb2_setinfo"              /* PR_VALUE_SMB2_SETINFO */
+            "smb2_break",               /* PR_VALUE_SMB2_BREAK */
             "" /* PR_VALUE_MAX */
         };