improved control-skeleton.c

[ue-pp-terminationdetectionalgorithm.git] / control-skeleton.c

diff --git a/control-skeleton.c b/control-skeleton.c
index 2d0ac7878738ff461bf37746fbc1ec93b53bb587..e58ba34936332059d4dd2effe9f3f8e1df94d187 100644 (file)
--- a/control-skeleton.c
+++ b/control-skeleton.c
@@ -34,7 +34,7 @@ static pthread_mutex_t state_mutex = PTHREAD_MUTEX_INITIALIZER;
 static node_state_t    state       = PASSIVE_STATE;
 static int             parent      = -1; // -1 indicates null/no parent
 static int             deficit     = 0;  // C_i counter (unacknowledged messages)
 static node_state_t    state       = PASSIVE_STATE;
 static int             parent      = -1; // -1 indicates null/no parent
 static int             deficit     = 0;  // C_i counter (unacknowledged messages)

-static bool            is_initiator = false;
+static bool            initiator = false;

 
 // --- HELPER FUNCTION ---
 // MUST BE DECLARED ABOVE THE OTHER FUNCTIONS!
 
 // --- HELPER FUNCTION ---
 // MUST BE DECLARED ABOVE THE OTHER FUNCTIONS!


@@ -43,7 +43,7 @@ static void try_resolve_tree(int my_id)
 {
     if (state == PASSIVE_STATE && deficit == 0)
     {
 {
     if (state == PASSIVE_STATE && deficit == 0)
     {

-        if (is_initiator) {
+        if (initiator) {

             // Root is passive and deficit is 0 -> Global Termination!
             return; 
         }
             // Root is passive and deficit is 0 -> Global Termination!
             return; 
         }


@@ -68,7 +68,7 @@ void *detect_termination(void *_args)
 {
     thread_args_t *args = _args;
     int id = args->id;
 {
     thread_args_t *args = _args;
     int id = args->id;

-    is_initiator = args->initiator;
+    initiator = args->initiator;

     
     // (Removed unused 'processes' variable to fix compiler warning)
 
     
     // (Removed unused 'processes' variable to fix compiler warning)
 


@@ -77,7 +77,7 @@ void *detect_termination(void *_args)
         pthread_mutex_lock(&state_mutex);
         
         // CHECK GLOBAL TERMINATION CONDITION
         pthread_mutex_lock(&state_mutex);
         
         // CHECK GLOBAL TERMINATION CONDITION

-        if (is_initiator && state == PASSIVE_STATE && deficit == 0)
+        if (initiator && state == PASSIVE_STATE && deficit == 0)

         {
             trace("%d: [CONTROL] GLOBAL TERMINATION DETECTED!\n", id);
             pthread_mutex_unlock(&state_mutex);
         {
             trace("%d: [CONTROL] GLOBAL TERMINATION DETECTED!\n", id);
             pthread_mutex_unlock(&state_mutex);


@@ -121,7 +121,7 @@ void *detect_termination(void *_args)
 void control_basic_start_hook(int id)
 {
     pthread_mutex_lock(&state_mutex);
 void control_basic_start_hook(int id)
 {
     pthread_mutex_lock(&state_mutex);

-    state   = is_initiator ? ACTIVE_STATE : PASSIVE_STATE;
+    state   = initiator ? ACTIVE_STATE : PASSIVE_STATE;

     parent  = -1;
     deficit = 0;
     pthread_mutex_unlock(&state_mutex);
     parent  = -1;
     deficit = 0;
     pthread_mutex_unlock(&state_mutex);