rpms/openais/FC-6 revision-1316.patch, NONE, 1.1 revision-1319.patch, NONE, 1.1 openais.spec, 1.23, 1.24

[fedora-cvs-commits at redhat.com]

Author: sdake

Update of /cvs/dist/rpms/openais/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv18360/FC-6

Modified Files:
	openais.spec 
Added Files:
	revision-1316.patch revision-1319.patch 
Log Message:
auto-import openais-0.80.1-21 on branch FC-6 from openais-0.80.1-21.src.rpm

revision-1316.patch:
 main.c  |   13 ++++++++++---
 print.c |   49 +++++++++++++++++++++++++------------------------
 2 files changed, 35 insertions(+), 27 deletions(-)

--- NEW FILE revision-1316.patch ---
Index: exec/main.c
===================================================================
--- exec/main.c	(revision 1315)
+++ exec/main.c	(revision 1316)
@@ -108,10 +108,18 @@
 static void sigsegv_handler (int num)
 {
 	signal (SIGSEGV, SIG_DFL);
-	log_atsegv ();
+	log_flush ();
 	raise (SIGSEGV);
 }
 
+static void sigabrt_handler (int num)
+{
+	signal (SIGABRT, SIG_DFL);
+	log_flush ();
+	raise (SIGABRT);
+}
+
+
 struct totem_ip_address *this_ip;
 struct totem_ip_address this_non_loopback_ip;
 #define LOCALHOST_IP inet_addr("127.0.0.1")
@@ -396,10 +404,9 @@
 	totemip_localhost(AF_INET, &this_non_loopback_ip);
 
 	signal (SIGINT, sigintr_handler);
-
 	signal (SIGUSR2, sigusr2_handler);
-
 	signal (SIGSEGV, sigsegv_handler);
+	signal (SIGABRT, sigabrt_handler);
 
 	openais_timer_init (
 		serialize_mutex_lock,
Index: exec/print.c
===================================================================
--- exec/print.c	(revision 1315)
+++ exec/print.c	(revision 1316)
@@ -338,7 +338,6 @@
 		NULL,
 		log_printf_worker_fn);
 
-	log_setup_called = 1;
 
 	/*
 	** Flush what we have buffered
@@ -348,6 +347,9 @@
 	internal_log_printf(__FILE__, __LINE__, LOG_LEVEL_DEBUG, "log setup\n");
 
 	atexit (log_atexit);
+
+	log_setup_called = 1;
+
 	return (0);
 }
 
@@ -394,25 +396,6 @@
 	}
 }
 
-void log_flush(void)
-{
-	struct log_entry *entry = head;
-	struct log_entry *tmp;
-
-	/* do not buffer these printouts */
-	logmode &= ~LOG_MODE_BUFFER;
-
-	while (entry) {
-		internal_log_printf(entry->file, entry->line,
-			entry->level, entry->str);
-		tmp = entry;
-		entry = entry->next;
-		free(tmp);
-	}
-
-	head = tail = NULL;
-}
-
 static void log_atexit (void)
 {
 	if (log_setup_called) {
@@ -420,9 +403,27 @@
 	}
 }
 
-void log_atsegv (void)
+void log_flush (void)
 {
-	log_setup_called = 0;
-	worker_thread_group_exit (&log_thread_group);
-	worker_thread_group_atsegv (&log_thread_group);
+	if (log_setup_called) {
+		log_setup_called = 0;
+		worker_thread_group_exit (&log_thread_group);
+		worker_thread_group_atsegv (&log_thread_group);
+	} else {
+		struct log_entry *entry = head;
+		struct log_entry *tmp;
+
+		/* do not buffer these printouts */
+		logmode &= ~LOG_MODE_BUFFER;
+
+		while (entry) {
+			internal_log_printf(entry->file, entry->line,
+				entry->level, entry->str);
+			tmp = entry;
+			entry = entry->next;
+			free(tmp);
+		}
+
+		head = tail = NULL;
+	}
 }

revision-1319.patch:
 main.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE revision-1319.patch ---
Index: exec/main.h
===================================================================
--- exec/main.h	(revision 1316)
+++ exec/main.h	(revision 1319)
@@ -46,7 +46,7 @@
  * Size of the queue (entries) for I/O's to the API over socket IPC.
  */
 
-#define SIZEQUEUE 800
+#define SIZEQUEUE 5000
 
 #define SOCKET_SERVICE_INIT 254
 


Index: openais.spec
===================================================================
RCS file: /cvs/dist/rpms/openais/FC-6/openais.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- openais.spec	29 Nov 2006 21:10:17 -0000	1.23
+++ openais.spec	5 Dec 2006 16:51:47 -0000	1.24
@@ -1,7 +1,7 @@
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
 Version: 0.80.1
-Release: 18%{?dist}
+Release: 21%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://developer.osdl.org/dev/openais/
@@ -50,6 +50,8 @@
 Patch40: revision-1313.patch
 Patch41: revision-1314.patch
 Patch42: revision-1315.patch
+Patch43: revision-1316.patch
+Patch44: revision-1319.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: i386 ppc x86_64 ppc64 ia64 s390 s390x
@@ -117,6 +119,8 @@
 %patch40
 %patch41
 %patch42
+%patch43
+%patch44
 
 %build
 # -O3 required for performance reasons
@@ -250,6 +254,19 @@
 %{_mandir}/man3/evs_membership_get.3*
 
 %changelog
+* Tue Dec 5 2006 Steven Dake <sdake at redhat.com> - 0.80.1-21
+- Resolves: rhbz#216492
+- Add upstream revision 1319 - Increase outbound buffer size to 5000 messages.
+- Add upstream revision 1316 - Improvements on segfault logging.
+- This is the fc6 version.
+
+* Wed Nov 29 2006 Steven Dake <sdake at redhat.com> - 0.80.1-20
+- Resolves: rhbz#216492
+- Need new res line to commit.  This is the same as 0.80.1-18.
+
+* Wed Nov 29 2006 Steven Dake <sdake at redhat.com> - 0.80.1-19
+- This is the rhel5 version of 0.80.1-18.
+
 * Wed Nov 29 2006 Steven Dake <sdake at redhat.com> - 0.80.1-18
 - Add upstream revision 1315 - Fix compile error in libcpg.
 - Add upstream revision 1314 - Change rundir to /var/openais.