[SCM] Samba Shared Repository - branch master updated

[Matthieu Patou]

The branch, master has been updated
       via  6a781b5 Add timestamp when running with --maximum-runtime
      from  d237698 blackbox.ldb: Support using system ldbsearch.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6a781b52867900bc6085721fd0e2ededa4f98f50
Author: Matthieu Patou <m...@matws.net>
Date:   Sat Nov 27 13:00:57 2010 +0300

    Add timestamp when running with --maximum-runtime
    
    Autobuild-User: Matthieu Patou <m...@samba.org>
    Autobuild-Date: Sat Nov 27 11:51:12 CET 2010 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source4/smbd/server.c |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 29deb85..1c6a11d 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -178,7 +178,13 @@ _NORETURN_ static void max_runtime_handler(struct 
tevent_context *ev,
                                           struct timeval t, void *private_data)
 {
        const char *binary_name = (const char *)private_data;
-       DEBUG(0,("%s: maximum runtime exceeded - terminating\n", binary_name));
+       struct timeval tv;
+       struct timezone tz;
+       if (gettimeofday(&tv, &tz) == 0) {
+               DEBUG(0,("%s: maximum runtime exceeded - terminating, current 
ts: %d\n", binary_name, (int)tv.tv_sec));
+       } else {
+               DEBUG(0,("%s: maximum runtime exceeded - terminating\n", 
binary_name));
+       }
        exit(0);
 }
 
@@ -438,6 +444,14 @@ static int binary_smbd_main(const char *binary_name, int 
argc, const char *argv[
                      discard_const(binary_name));
 
        if (max_runtime) {
+               struct timeval tv;
+               struct timezone tz;
+
+               if (gettimeofday(&tv, &tz) == 0) {
+                       DEBUG(0,("Called with maxruntime %d - current ts %d\n", 
max_runtime, (int)tv.tv_sec));
+               } else {
+                       DEBUG(0,("Called with maxruntime %d\n", max_runtime));
+               }
                tevent_add_timer(event_ctx, event_ctx,
                                 timeval_current_ofs(max_runtime, 0),
                                 max_runtime_handler,


-- 
Samba Shared Repository