From 443bfd2b7a393a40b9bbf04fb2f3257f16150e95 Mon Sep 17 00:00:00 2001
From: "Elsa Gonsiorowski (Uranus)" <me@gonsie.com>
Date: Wed, 26 Feb 2014 17:46:16 -0500
Subject: [PATCH] removed periodic pe function

- removed g_tw_periodicity variable
- removed pe_periodic_f type
- removed periodic function call in tw-sched.c (conservative)
---
 core/ross-extern.h | 2 --
 core/ross-global.c | 7 -------
 core/ross-types.h  | 2 --
 core/tw-pe.c       | 1 -
 core/tw-sched.c    | 5 -----
 5 files changed, 17 deletions(-)

diff --git a/core/ross-extern.h b/core/ross-extern.h
index 4fdd37a72..2f1d63770 100644
--- a/core/ross-extern.h
+++ b/core/ross-extern.h
@@ -47,8 +47,6 @@ extern size_t		g_tw_event_msg_sz;
 extern unsigned int	g_tw_memory_nqueues;
 extern size_t		g_tw_memory_sz;
 
-extern unsigned int     g_tw_periodicity;
-
 extern tw_stime         g_tw_lookahead;
 extern tw_stime         g_tw_min_detected_offset;
 
diff --git a/core/ross-global.c b/core/ross-global.c
index 49edc568c..2ddc17266 100644
--- a/core/ross-global.c
+++ b/core/ross-global.c
@@ -42,13 +42,6 @@ unsigned int	g_tw_memory_nqueues = 0;
 size_t		g_tw_memory_sz = 0;
 size_t		g_tw_event_msg_sz = 0;
 
-        /*
-         * Number of iterations in scheduler (invoked from tw_run)
-         * before calling application callout.  Default is to call
-         * callout for each iteration.
-         */
-unsigned int    g_tw_periodicity = 1;
-
         /*
          * Minimum lookahead for a model -- model defined when
          * using the Simple Synchronization Protocol (conservative)
diff --git a/core/ross-types.h b/core/ross-types.h
index b09f57378..73ad3efac 100644
--- a/core/ross-types.h
+++ b/core/ross-types.h
@@ -60,7 +60,6 @@ typedef unsigned long long tw_stat;
 typedef void (*pe_init_f) (tw_pe * pe);
 typedef void (*pe_gvt_f) (tw_pe * pe);
 typedef void (*pe_final_f) (tw_pe * pe);
-typedef void (*pe_periodic_f) (tw_pe * pe);
 
 /** tw_petype @brief Virtual Functions for per PE ops
  *
@@ -73,7 +72,6 @@ struct tw_petype
   pe_init_f post_lp_init;  /**< @brief PE initialization routine, after LP init */
   pe_gvt_f gvt;  /**< @brief PE per GVT routine */
   pe_final_f final;  /**< @brief PE finilization routine */
-  pe_periodic_f periodic; /**< @brief Callout made for K loops of tw scheduler */
 };
 
 /*
diff --git a/core/tw-pe.c b/core/tw-pe.c
index 3706e1329..917fc81bf 100644
--- a/core/tw-pe.c
+++ b/core/tw-pe.c
@@ -17,7 +17,6 @@ tw_pe_settype(tw_pe * pe, const tw_petype * type)
 	copy_pef(post_lp_init, dummy_pe_f);
 	copy_pef(gvt, dummy_pe_f);
 	copy_pef(final, dummy_pe_f);
-        copy_pef(periodic, dummy_pe_f);
 
 #undef copy_pef
 }
diff --git a/core/tw-sched.c b/core/tw-sched.c
index 07fb79c6b..0f383abd7 100644
--- a/core/tw-sched.c
+++ b/core/tw-sched.c
@@ -327,7 +327,6 @@ tw_scheduler_conservative(tw_pe * me)
 {
   tw_clock start;
   unsigned int msg_i;
-  unsigned int round = 0;
   
   tw_sched_init(me);
   tw_wall_now(&me->start_time);
@@ -403,10 +402,6 @@ tw_scheduler_conservative(tw_pe * me)
 	  tw_event_free(me, cev);
 	}
 
-        if(me->type.periodic && (++round % g_tw_periodicity))
-        {
-            (*me->type.periodic)(me);
-        }
     }