[Spread-cvs] commit: r619 - branches/spread_4_2_debug/daemon

[jschultz at spread.org]

Author: jschultz
Date: 2013-11-12 12:34:53 -0500 (Tue, 12 Nov 2013)
New Revision: 619

Modified:
   branches/spread_4_2_debug/daemon/membership.c
   branches/spread_4_2_debug/daemon/protocol.c
   branches/spread_4_2_debug/daemon/protocol.h
Log:
Exporting Just_Installed so membership can turn it off if/when we lose the token


Modified: branches/spread_4_2_debug/daemon/membership.c
===================================================================
--- branches/spread_4_2_debug/daemon/membership.c	2013-11-08 21:28:31 UTC (rev 618)
+++ branches/spread_4_2_debug/daemon/membership.c	2013-11-12 17:34:53 UTC (rev 619)
@@ -766,7 +766,6 @@
 	case SEG:
 	case REPRESENTED:
 	    Alarm( EXIT, "Memb_token_loss: bug !!! state is %d\n",State);
-
 	    break;
 
 	case GATHER:
@@ -837,6 +836,7 @@
     Shift_to_seg();
 
     Token_alive = 0;
+    Just_Installed = FALSE;
     E_dequeue( Memb_token_loss,    0, NULL );
     E_dequeue( Send_join,	   0, NULL );
     E_dequeue( Form_or_fail,	   0, NULL );

Modified: branches/spread_4_2_debug/daemon/protocol.c
===================================================================
--- branches/spread_4_2_debug/daemon/protocol.c	2013-11-08 21:28:31 UTC (rev 618)
+++ branches/spread_4_2_debug/daemon/protocol.c	2013-11-12 17:34:53 UTC (rev 619)
@@ -73,7 +73,7 @@
 /* Used to indicate a need to reload configuration at end of current membership */
 static  bool            Prot_Need_Conf_Reload  = FALSE;
 
-static  bool            Just_Installed = FALSE;
+bool                    Just_Installed = FALSE;
 
 /* ### Pack: 1 line */
 static	packet_info	Buffered_packets[ARCH_SCATTER_SIZE];

Modified: branches/spread_4_2_debug/daemon/protocol.h
===================================================================
--- branches/spread_4_2_debug/daemon/protocol.h	2013-11-08 21:28:31 UTC (rev 618)
+++ branches/spread_4_2_debug/daemon/protocol.h	2013-11-12 17:34:53 UTC (rev 619)
@@ -56,6 +56,8 @@
 #define NORMAL_DOWNQUEUE        0
 #define GROUPS_DOWNQUEUE        1
 
+extern bool Just_Installed;
+
 void	Prot_init(void);
 void	Prot_set_down_queue( int queue_type );
 void	Prot_new_message( down_link *down_ptr, int not_used_in_spread3_p );