[Spread-cvs] commit: r670 - trunk/daemon
jschultz at spread.org
jschultz at spread.org
Tue Jan 21 22:45:19 EST 2014
Author: jschultz
Date: 2014-01-21 22:45:18 -0500 (Tue, 21 Jan 2014)
New Revision: 670
Modified:
trunk/daemon/membership.c
trunk/daemon/membership.h
Log:
Cleanup of membership prototypes to be explicit; spacing; prints
Modified: trunk/daemon/membership.c
===================================================================
--- trunk/daemon/membership.c 2014-01-22 02:40:17 UTC (rev 669)
+++ trunk/daemon/membership.c 2014-01-22 03:45:18 UTC (rev 670)
@@ -141,7 +141,7 @@
static void Flip_reps( reps_info *reps_ptr );
static void Flip_rings( char *buf );
-void Memb_init()
+void Memb_init( void )
{
packet_header *pack_ptr;
int32 reference_subnet;
@@ -249,23 +249,27 @@
Memb_token_loss();
}
-void Memb_signal_conf_reload(void)
+void Memb_signal_conf_reload( void )
{
My = Conf_my();
}
-configuration *Memb_active_ptr()
+configuration *Memb_active_ptr( void )
{
- if( State == EVS ) return ( &Future_membership );
- else return( &Membership );
+ return ( State != EVS ? &Membership : &Future_membership );
}
-membership_id Memb_id()
+membership_id Memb_active_id( void )
{
+ return ( State != EVS ? Membership_id : Future_membership_id );
+}
+
+membership_id Memb_id( void )
+{
return( Membership_id );
}
-membership_id Memb_trans_id()
+membership_id Memb_trans_id( void )
{
return( Trans_memb_id );
}
@@ -278,12 +282,12 @@
return( 0 );
}
-int32 Memb_state()
+int32 Memb_state( void )
{
return( State );
}
-int Memb_token_alive()
+int Memb_token_alive( void )
{
return( Token_alive );
}
@@ -768,7 +772,7 @@
}
}
-void Memb_token_loss(void)
+void Memb_token_loss( void )
{
rep_info temp_rep;
int i;
@@ -892,7 +896,7 @@
Memb_token_loss();
}
-static void Shift_to_op(void)
+static void Shift_to_op( void )
{
State = OP;
GlobalStatus.state = OP;
@@ -902,7 +906,7 @@
}
}
-static void Shift_to_seg(void)
+static void Shift_to_seg( void )
{
State = SEG;
GlobalStatus.state = SEG;
@@ -914,12 +918,12 @@
E_queue( Gather_or_represented_event, 0, NULL, Seg_timeout );
}
-static void Shift_to_seg_event(int dmy, void *dmy_ptr)
+static void Shift_to_seg_event( int dmy, void *dmy_ptr )
{
Shift_to_seg();
}
-static void Gather_or_represented(void)
+static void Gather_or_represented( void )
{
int dummy;
@@ -933,12 +937,12 @@
}
}
-static void Gather_or_represented_event(int dmy, void *dmy_ptr)
+static void Gather_or_represented_event( int dmy, void *dmy_ptr )
{
Gather_or_represented();
}
-static void Shift_to_gather(void)
+static void Shift_to_gather( void )
{
State = GATHER;
GlobalStatus.state = GATHER;
@@ -956,7 +960,7 @@
E_queue( Form_or_fail_event, 0, NULL, Gather_timeout );
}
-static void Shift_to_represented(void)
+static void Shift_to_represented( void )
{
State = REPRESENTED;
GlobalStatus.state = REPRESENTED;
@@ -966,7 +970,7 @@
E_queue( Shift_to_seg_event, 0, NULL, Rep_timeout );
}
-static void Form_or_fail(void)
+static void Form_or_fail( void )
{
rep_info temp_rep;
@@ -1014,12 +1018,12 @@
}
}
-static void Form_or_fail_event(int dmy, void *dmy_ptr)
+static void Form_or_fail_event( int dmy, void *dmy_ptr )
{
Form_or_fail();
}
-static void Scast_alive( int code)
+static void Scast_alive( int code )
{
packet_header *pack_ptr;
@@ -1043,7 +1047,7 @@
Scast_alive(code);
}
-static void Send_join(void)
+static void Send_join( void )
{
packet_header *pack_ptr;
int i;
@@ -1074,12 +1078,12 @@
E_queue( Send_join_event, 0, NULL, Join_timeout );
}
-static void Send_join_event(int dmy, void *dmy_ptr)
+static void Send_join_event( int dmy, void *dmy_ptr )
{
Send_join();
}
-void Memb_lookup_new_members(void)
+void Memb_lookup_new_members( void )
{
packet_header *pack_ptr;
int num_missing;
@@ -1134,7 +1138,7 @@
if( num_missing ) Shift_to_gather();
}
-void Memb_lookup_new_members_event(int dmy, void *dmy_ptr)
+void Memb_lookup_new_members_event( int dmy, void *dmy_ptr )
{
Memb_lookup_new_members();
}
@@ -1152,7 +1156,8 @@
if (m->num_members == MAX_PROCS_RING)
{
/* members structure is full -- so we ignore this new member */
- Alarmp( SPLOG_WARNING, MEMB, "Insert_member: members structure full (%u members) so ignore new member (ID %u.%u.%u.%u)\n", m->num_members, IP1(proc_id), IP2(proc_id), IP3(proc_id), IP4(proc_id) );
+ Alarmp( SPLOG_WARNING, MEMB, "Insert_member: members structure full (%u members) so ignore new member (ID %u.%u.%u.%u)\n",
+ m->num_members, IP1(proc_id), IP2(proc_id), IP3(proc_id), IP4(proc_id) );
return( 0 );
}
m->members[m->num_members] = proc_id;
@@ -1351,9 +1356,9 @@
}
}
-static void Create_form1()
+static void Create_form1( void )
{
- token_header form_token;
+ token_header form_token = { 0 };
ring_info *rg_info;
int32 *num_rings;
int32 *holes_procs_ptr;
@@ -1367,9 +1372,9 @@
int cur_num_members;
members_info valid_members;
+ form_token.type = FORM1_TYPE;
form_token.seq = Highest_seq+3333;
form_token.proc_id = My.id;
- form_token.type = FORM1_TYPE;
/* if I am a ring leader - update my F_members */
if( F_reps.reps[0].type == RING_REP )
@@ -1525,8 +1530,7 @@
F_members.num_members = 0;
form_token.type = FORM2_TYPE;
send_scat.elements[2].len = sizeof(membership_id);
- form_token.rtr_len = send_scat.elements[1].len +
- send_scat.elements[2].len + send_scat.elements[3].len;
+ form_token.rtr_len = send_scat.elements[1].len + send_scat.elements[2].len + send_scat.elements[3].len;
Net_ucast_token( My.id, &send_scat );
Net_ucast_token( My.id, &send_scat );
/*Net_ucast_token( My.id, &send_scat );*/
@@ -2381,7 +2385,7 @@
Alarmp( SPLOG_PRINT, PRINT, "====================================================\n");
}
-static void Backoff_membership()
+static void Backoff_membership( void )
{
int pack_entry;
int i;
@@ -2413,12 +2417,12 @@
Alarmp( SPLOG_INFO, MEMB, "Backoff_membership leaving: Last_discarded = %d; Highest_seq = %d; Aru = %d; My_aru = %d\n", Last_discarded, Highest_seq, Aru, My_aru );
}
-void Memb_commit()
+void Memb_commit( void )
{
Commit_set = Future_commit_set;
}
-void Memb_transitional()
+void Memb_transitional( void )
{
int i, j, k;
int num_seg, num_proc;
@@ -2473,7 +2477,7 @@
}
}
-void Memb_regular()
+void Memb_regular( void )
{
int i;
Modified: trunk/daemon/membership.h
===================================================================
--- trunk/daemon/membership.h 2014-01-22 02:40:17 UTC (rev 669)
+++ trunk/daemon/membership.h 2014-01-22 03:45:18 UTC (rev 670)
@@ -48,24 +48,25 @@
#define EVS 6
-void Memb_init();
-configuration *Memb_active_ptr();
-membership_id Memb_id();
-membership_id Memb_trans_id();
+void Memb_init( void );
+configuration *Memb_active_ptr( void );
+membership_id Memb_active_id( void );
+membership_id Memb_id( void );
+membership_id Memb_trans_id( void );
int Memb_is_equal( membership_id m1, membership_id m2 );
-int32 Memb_state();
-int Memb_token_alive();
+int32 Memb_state( void );
+int Memb_token_alive( void );
void Memb_handle_message( sys_scatter *scat );
void Memb_handle_token( sys_scatter *scat );
void Memb_token_loss(void);
void Memb_lookup_new_members(void);
void Memb_token_loss_event(int dmy, void *dmy_ptr);
void Memb_lookup_new_members_event(int dmy, void *dmy_ptr);
-void Memb_signal_conf_reload();
+void Memb_signal_conf_reload( void );
-void Memb_commit();
-void Memb_transitional();
-void Memb_regular();
+void Memb_commit( void );
+void Memb_transitional( void );
+void Memb_regular( void );
void Memb_print_form_token( sys_scatter *scat );
extern bool Memb_Just_Installed;
More information about the Spread-cvs
mailing list