[SCM] CTDB repository - branch master updated - ctdb-1.0.108-42-gdccb549

[Ronnie Sahlberg]

The branch, master has been updated
       via  dccb549fd6a6e338063699544e52f2a1a6a966b5 (commit)
      from  6e8b279ed307eccac08386e98510361ba3ab3d36 (commit)

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


- Log -----------------------------------------------------------------
commit dccb549fd6a6e338063699544e52f2a1a6a966b5
Author: Christian Ambach <christian.ambach at de.ibm.com>
Date:   Tue Dec 8 19:08:37 2009 +0100

    improve time jump logging
    
    add the __location__ macro to the logs to get a better idea
    in which loop the problem occured
    
    Signed-off-by: Christian Ambach <christian.ambach at de.ibm.com>

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

Summary of changes:
 lib/events/events_epoll.c    |    4 ++--
 lib/events/events_select.c   |    4 ++--
 lib/events/events_standard.c |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/events/events_epoll.c b/lib/events/events_epoll.c
index 0dfdb79..99fa36c 100644
--- a/lib/events/events_epoll.c
+++ b/lib/events/events_epoll.c
@@ -472,11 +472,11 @@ static int epoll_event_loop_wait(struct event_context *ev)
 			new_t=time(NULL);
 			if (t != 0) {
 				if (t > new_t) {
-					DEBUG(0,("ERROR Time skipped backward by %d seconds\n", (int)(t-new_t)));
+					DEBUG(0,(__location__ " ERROR Time skipped backward by %d seconds\n", (int)(t-new_t)));
 				}
 				/* We assume here that we get at least one event every 5 seconds */
 				if (new_t > (t+5)) {
-					DEBUG(0,("ERROR Time jumped forward by %d seconds\n", (int)(new_t-t)));
+					DEBUG(0,(__location__ " ERROR Time jumped forward by %d seconds\n", (int)(new_t-t)));
 				}
 			}
 			t=new_t;
diff --git a/lib/events/events_select.c b/lib/events/events_select.c
index 404cd8c..faccc6d 100644
--- a/lib/events/events_select.c
+++ b/lib/events/events_select.c
@@ -287,11 +287,11 @@ static int select_event_loop_wait(struct event_context *ev)
 			new_t=time(NULL);
 			if (t != 0) {
 				if (t > new_t) {
-					DEBUG(0,("ERROR Time skipped backward by %d seconds\n", (int)(t-new_t)));
+					DEBUG(0,(__location__ " ERROR Time skipped backward by %d seconds\n", (int)(t-new_t)));
 				}
 				/* We assume here that we get at least one event every 5 seconds */
 				if (new_t > (t+5)) {
-					DEBUG(0,("ERROR Time jumped forward by %d seconds\n", (int)(new_t-t)));
+					DEBUG(0,(__location__ " ERROR Time jumped forward by %d seconds\n", (int)(new_t-t)));
 				}
 			}
 			t=new_t;
diff --git a/lib/events/events_standard.c b/lib/events/events_standard.c
index 9ee2328..fe128ca 100644
--- a/lib/events/events_standard.c
+++ b/lib/events/events_standard.c
@@ -588,11 +588,11 @@ static int std_event_loop_wait(struct event_context *ev)
 			new_t=time(NULL);
 			if (t != 0) {
 				if (t > new_t) {
-					DEBUG(0,("ERROR Time skipped backward by %d seconds\n", (int)(t-new_t)));
+					DEBUG(0,(__location__ " ERROR Time skipped backward by %d seconds\n", (int)(t-new_t)));
 				}
 				/* We assume here that we get at least one event every 5 seconds */
 				if (new_t > (t+5)) {
-					DEBUG(0,("ERROR Time jumped forward by %d seconds\n", (int)(new_t-t)));
+					DEBUG(0,(__location__ " ERROR Time jumped forward by %d seconds\n", (int)(new_t-t)));
 				}
 			}
 			t=new_t;


-- 
CTDB repository