[SCM] CTDB repository - branch master updated - eca73bcaa33f88c683b79d57d85b590659018ad8

Ronnie Sahlberg sahlberg at samba.org
Fri Jul 18 03:48:26 GMT 2008


The branch, master has been updated
       via  eca73bcaa33f88c683b79d57d85b590659018ad8 (commit)
       via  e24152fbd06ba4c2b6cfd473751c7f00a676b9ae (commit)
       via  af38c8d4cc03e1b5a314ea2338346c5f8c80aa95 (commit)
       via  05918bcb58acd2add7e13c028de09641a7519cd1 (commit)
       via  9478852f2b4f530994b2211fff45413d1da82dd9 (commit)
      from  c5035657606283d2e35bea40992505e84ca8e7be (commit)

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


- Log -----------------------------------------------------------------
commit eca73bcaa33f88c683b79d57d85b590659018ad8
Merge: c5035657606283d2e35bea40992505e84ca8e7be e24152fbd06ba4c2b6cfd473751c7f00a676b9ae
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Fri Jul 18 13:42:39 2008 +1000

    Merge git://git.samba.org/tridge/ctdb

commit e24152fbd06ba4c2b6cfd473751c7f00a676b9ae
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Jul 18 13:46:01 2008 +1000

    fixed a bug where we would look for a signal past the end of the
    signal arrays
    
    This could cause the events code to get into a loop chewing CPU

commit af38c8d4cc03e1b5a314ea2338346c5f8c80aa95
Merge: 05918bcb58acd2add7e13c028de09641a7519cd1 ccf9334bd20b1398623dd649987aa15119dac14e
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Jul 17 18:45:15 2008 +1000

    Merge commit 'ronnie/master'

commit 05918bcb58acd2add7e13c028de09641a7519cd1
Merge: 9478852f2b4f530994b2211fff45413d1da82dd9 d7e9c0010a40f9335d28cf108e8f5cf411970a03
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Jul 16 16:58:16 2008 +1000

    Merge commit 'ronnie/master'

commit 9478852f2b4f530994b2211fff45413d1da82dd9
Merge: 9043913a54fe707083697f0587c6ffde86ca5a69 2b0bd6c302545f2533a7a67dfc6bb5f9f60799f7
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Jul 16 12:46:43 2008 +1000

    Merge commit 'ronnie/master'

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

Summary of changes:
 lib/events/events_signal.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/events/events_signal.c b/lib/events/events_signal.c
index 2f6d499..128a9bc 100644
--- a/lib/events/events_signal.c
+++ b/lib/events/events_signal.c
@@ -46,15 +46,15 @@ struct sigcounter {
   the poor design of signals means that this table must be static global
 */
 static struct sig_state {
-	struct signal_event *sig_handlers[NUM_SIGNALS];
-	struct sigaction *oldact[NUM_SIGNALS];
-	struct sigcounter signal_count[NUM_SIGNALS];
+	struct signal_event *sig_handlers[NUM_SIGNALS+1];
+	struct sigaction *oldact[NUM_SIGNALS+1];
+	struct sigcounter signal_count[NUM_SIGNALS+1];
 	struct sigcounter got_signal;
 	int pipe_hack[2];
 #ifdef SA_SIGINFO
 	/* with SA_SIGINFO we get quite a lot of info per signal */
-	siginfo_t *sig_info[NUM_SIGNALS];
-	struct sigcounter sig_blocked[NUM_SIGNALS];
+	siginfo_t *sig_info[NUM_SIGNALS+1];
+	struct sigcounter sig_blocked[NUM_SIGNALS+1];
 #endif
 } *sig_state;
 


-- 
CTDB repository


More information about the samba-cvs mailing list