Merge trunk revision 2558:

r2558 | fabbione | 2009-11-30 16:01:51 -0700 (Mon, 30 Nov 2009) | 3 lines

Fix threads vs fork init order



git-svn-id: http://svn.fedorahosted.org/svn/corosync/branches/flatiron@2613 fd59a12c-fef9-0310-b244-a6a79926bd2f

exec/main.c

@@ -1247,13 +1247,6 @@ int main (int argc, char **argv)
 	(void)signal (SIGPIPE, SIG_IGN);
 #endif
 
-	corosync_timer_init (
-		serialize_lock,
-		serialize_unlock,
-		sched_priority);
-
-	corosync_poll_handle = poll_create ();
-
 	/*
 	 * Load the object database interface
 	 */
@@ -1413,6 +1406,13 @@ int main (int argc, char **argv)
 	}
 	logsys_fork_completed();
 
+	corosync_timer_init (
+		serialize_lock,
+		serialize_unlock,
+		sched_priority);
+
+	corosync_poll_handle = poll_create ();
+
 	/*
 	 * Sleep for a while to let other nodes in the cluster
 	 * understand that this node has been away (if it was