NDMeshStreamer: removing experimental code for accelerating termination
authorLukasz Wesolowski <wesolwsk@illinois.edu>
Mon, 18 Jun 2012 22:55:22 +0000 (17:55 -0500)
committerLukasz Wesolowski <wesolwsk@illinois.edu>
Mon, 18 Jun 2012 22:55:22 +0000 (17:55 -0500)
src/libs/ck-libs/NDMeshStreamer/NDMeshStreamer.h

index c999f8d09ec6cb37777304a67242823437f0484c..5bd7622e1e2c28c9cf1aeb7d66d7507abd345f9b 100644 (file)
@@ -17,7 +17,6 @@
 // #define CACHE_LOCATIONS
 // #define SUPPORT_INCOMPLETE_MESH
 // #define CACHE_ARRAY_METADATA // only works for 1D array clients
-// #define STREAMER_EXPERIMENTAL
 // #define STREAMER_VERBOSE_OUTPUT
 #define STAGED_COMPLETION
 
@@ -122,10 +121,6 @@ private:
   double progressPeriodInMs_; 
   bool isPeriodicFlushEnabled_; 
   bool hasSentRecently_;
-#ifdef STREAMER_EXPERIMENTAL
-  bool hasSentPreviously_;
-  bool immediateMode_; 
-#endif
   MeshStreamerMessage<dtype> ***dataBuffers_;
 
   CProxy_CompletionDetector detector_;
@@ -337,9 +332,6 @@ MeshStreamer<dtype>::MeshStreamer(
 
   isPeriodicFlushEnabled_ = false; 
   detectorLocalObj_ = NULL;
-#ifdef STREAMER_EXPERIMENTAL
-  immediateMode_ = false; 
-#endif
 
 #ifdef CACHE_LOCATIONS
   cachedLocations_ = new MeshLocation[numMembers_];
@@ -583,10 +575,6 @@ void MeshStreamer<dtype>::associateCallback(
                          CProxy_CompletionDetector detector, 
                          int prio) {
 
-#ifdef STREAMER_EXPERIMENTAL
-  immediateMode_ = false;
-  hasSentPreviously_ = false; 
-#endif
   yieldCount_ = 0; 
   prio_ = prio;
   userCallback_ = endCb; 
@@ -646,12 +634,6 @@ void MeshStreamer<dtype>::receiveAlongRoute(MeshStreamerMessage<dtype> *msg) {
     lastDestinationPe = destinationPe; 
   }
 
-#ifdef STREAMER_EXPERIMENTAL
-  if (immediateMode_) {
-    flushToIntermediateDestinations();
-  }
-#endif
-
 #ifdef STAGED_COMPLETION
   markMessageReceived(msg->dimension, msg->finalMsgCount); 
 #endif
@@ -863,20 +845,6 @@ void MeshStreamer<dtype>::flushDirect(){
     
   }
 
-#ifdef STREAMER_EXPERIMENTAL
-  // switch into immediate sending mode when 
-  // number of items buffered is small; avoid doing the switch 
-  // at the beginning before any sending has taken place
-  if (hasSentPreviously_ && 
-      (numDataItemsBuffered_ < .1 * maxNumDataItemsBuffered_)) {
-    immediateMode_ = true; 
-  } 
-
-  if (!hasSentPreviously_) {
-    hasSentPreviously_ = hasSentRecently_; 
-  }
-#endif
-
   hasSentRecently_ = false; 
 
 }