Changeset 745 for trunk/server/source4/smbd/process_thread.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/smbd/process_thread.c (modified) (11 diffs)

trunk/server/source4/smbd/process_thread.c

@@ -30 +30 @@
 #include "system/wait.h"
 #include "system/filesys.h"
+#include "system/time.h"
 #include "lib/events/events.h"
 #include "lib/util/dlinklist.h"
@@ -63 +64 @@
 */
 static void thread_accept_connection(struct tevent_context *ev, 
-                                     struct loadparm_context *lp_ctx, 
+                                     struct loadparm_context *lp_ctx,
                                      struct socket_context *sock,
                                      void (*new_conn)(struct tevent_context *, 
@@ -133 +134 @@
         struct new_task_state *new_task = talloc_get_type(thread_parm, struct new_task_state);
 
-        new_task->new_task(new_task->ev, new_task->lp_ctx, pthread_self(), 
+        new_task->new_task(new_task->ev, new_task->lp_ctx, pthread_self(),
                            new_task->private_data);
 
@@ -189 +190 @@
 
 /* called when a task goes down */
-static void thread_terminate(struct tevent_context *event_ctx, struct loadparm_context *lp_ctx, const char *reason) 
+static void thread_terminate(struct tevent_context *event_ctx, struct loadparm_context *lp_ctx, const char *reason)
 {
         DEBUG(10,("thread_terminate: reason[%s]\n",reason));
@@ -234 +235 @@
 }
 
-static void mutex_start_timer(struct timeval *tp1)
-{
-        gettimeofday(tp1,NULL);
-}
-
-static double mutex_end_timer(struct timeval tp1)
-{
-        struct timeval tp2;
-        gettimeofday(&tp2,NULL);
+static void mutex_start_timer(struct timespec *tp1)
+{
+        clock_gettime_mono(tp1);
+}
+
+static double mutex_end_timer(struct timespec tp1)
+{
+        struct timespec tp2;
+
+        clock_gettime_mono(&tp2);
         return((tp2.tv_sec - tp1.tv_sec) + 
-               (tp2.tv_usec - tp1.tv_usec)*1.0e-6);
+               (tp2.tv_nsec - tp1.tv_nsec)*1.0e-9);
 }
 
@@ -255 +257 @@
         int rc;
         double t;
-        struct timeval tp1;
+        struct timespec tp1;
         /* Test below is ONLY for debugging */
         if ((rc = pthread_mutex_trylock(mutex))) {
@@ -317 +319 @@
         int rc;
         double t;
-        struct timeval tp1;
+        struct timespec tp1;
         /* Test below is ONLY for debugging */
         if ((rc = pthread_rwlock_tryrdlock(rwlock))) {
@@ -346 +348 @@
         int rc;
         double t;
-        struct timeval tp1;
+        struct timespec tp1;
         /* Test below is ONLY for debugging */
         if ((rc = pthread_rwlock_trywrlock(rwlock))) {
@@ -460 +462 @@
 {
 #ifdef SIGSEGV
-        CatchSignal(SIGSEGV,SIGNAL_CAST thread_sig_fault);
+        CatchSignal(SIGSEGV, thread_sig_fault);
 #endif
 #ifdef SIGBUS
-        CatchSignal(SIGBUS,SIGNAL_CAST thread_sig_fault);
+        CatchSignal(SIGBUS, thread_sig_fault);
 #endif
 #ifdef SIGABRT
-        CatchSignal(SIGABRT,SIGNAL_CAST thread_sig_fault);
+        CatchSignal(SIGABRT, thread_sig_fault);
 #endif
 }
@@ -510 +512 @@
   called when the process model is selected
 */
-static void thread_model_init(struct tevent_context *event_context)
+static void thread_model_init(void)
 {
         struct mutex_ops m_ops;
@@ -519 +521 @@
 
         pthread_key_create(&title_key, NULL);
-        pthread_setspecific(title_key, talloc_strdup(event_context, ""));
+        pthread_setspecific(title_key, NULL);
 
         /* register mutex/rwlock handlers */