From 05630b4e9dfedba509529bd95f6a59a9fe941474 Mon Sep 17 00:00:00 2001
From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Wed, 16 Mar 2016 10:40:51 +0100
Subject: [PATCH] [mc] Remove unused MC bits in parmap

---
 src/xbt/parmap.cpp | 124 ---------------------------------------------
 1 file changed, 124 deletions(-)

diff --git a/src/xbt/parmap.cpp b/src/xbt/parmap.cpp
index de1dc57c1a..028ece10b6 100644
--- a/src/xbt/parmap.cpp
+++ b/src/xbt/parmap.cpp
@@ -59,11 +59,6 @@ static void xbt_parmap_busy_worker_signal(xbt_parmap_t parmap);
 static void xbt_parmap_busy_master_signal(xbt_parmap_t parmap);
 static void xbt_parmap_busy_worker_wait(xbt_parmap_t parmap, unsigned round);
 
-#if HAVE_MC
-static void xbt_parmap_mc_work(xbt_parmap_t parmap, int worker_id);
-static void *xbt_parmap_mc_worker_main(void *arg);
-#endif
-
 /**
  * \brief Parallel map structure
  */
@@ -78,14 +73,6 @@ typedef struct s_xbt_parmap {
   xbt_dynar_t data;                /**< parameters to pass to fun in parallel */
   std::atomic<unsigned int> index; /**< index of the next element of data to pick */
 
-#if HAVE_MC
-  int finish;
-  void* ref_snapshot;
-  int_f_pvoid_pvoid_t snapshot_compare;
-  unsigned int length;
-  void* mc_data;
-#endif
-
   /* posix only */
   xbt_os_cond_t ready_cond;
   xbt_os_mutex_t ready_mutex;
@@ -150,40 +137,6 @@ xbt_parmap_t xbt_parmap_new(unsigned int num_workers, e_xbt_parmap_mode_t mode)
   return parmap;
 }
 
-#if HAVE_MC
-/**
- * \brief Creates a parallel map object
- * \param num_workers number of worker threads to create
- * \param mode how to synchronize the worker threads
- * \return the parmap created
- */
-xbt_parmap_t xbt_parmap_mc_new(unsigned int num_workers, e_xbt_parmap_mode_t mode)
-{
-  unsigned int i;
-
-  XBT_DEBUG("Create new parmap (%u workers)", num_workers);
-
-  /* Initialize the thread pool data structure */
-  xbt_parmap_t parmap = new s_xbt_parmap_t();
-  parmap->workers = xbt_new(xbt_os_thread_t, num_workers);
-
-  parmap->num_workers = num_workers;
-  parmap->status = XBT_PARMAP_WORK;
-  xbt_parmap_set_mode(parmap, mode);
-
-  /* Create the pool of worker threads */
-  xbt_parmap_thread_data_t data;
-  parmap->workers[0] = NULL;
-  for (i = 1; i < num_workers; i++) {
-    data = xbt_new0(s_xbt_parmap_thread_data_t, 1);
-    data->parmap = parmap;
-    data->worker_id = i;
-    parmap->workers[i] = xbt_os_thread_create(NULL, xbt_parmap_mc_worker_main, data, NULL);
-  }
-  return parmap;
-}
-#endif
-
 /**
  * \brief Destroys a parmap
  * \param parmap the parmap to destroy
@@ -344,83 +297,6 @@ static void *xbt_parmap_worker_main(void *arg)
   }
 }
 
-#if HAVE_MC
-/**
- * \brief Applies a list of tasks in parallel.
- * \param parmap a parallel map object
- * \param fun the function to call in parallel
- * \param data each element of this dynar will be passed as an argument to fun
- */
-int xbt_parmap_mc_apply(xbt_parmap_t parmap, int_f_pvoid_pvoid_t fun, void* data, unsigned int length,
-                        void* ref_snapshot)
-{
-  /* Assign resources to worker threads */
-  parmap->snapshot_compare = fun;
-  parmap->mc_data = data;
-  parmap->index = 0;
-  parmap->finish = -1;
-  parmap->length = length;
-  parmap->ref_snapshot = ref_snapshot;
-  parmap->master_signal_f(parmap);
-  xbt_parmap_mc_work(parmap, 0);
-  parmap->master_wait_f(parmap);
-  XBT_DEBUG("Job done");
-  return parmap->finish;
-}
-
-static void xbt_parmap_mc_work(xbt_parmap_t parmap, int worker_id)
-{
-  unsigned int data_size = (parmap->length / parmap->num_workers) + ((parmap->length % parmap->num_workers) ? 1 :0);
-  void* start = (char*)parmap->mc_data + (data_size*worker_id*sizeof(void*));
-  void* end = MIN((char *)start + data_size* sizeof(void*), (char*)parmap->mc_data + parmap->length*sizeof(void*));
-
-  //XBT_CRITICAL("Worker %d : %p -> %p (%d)", worker_id, start, end, data_size);
-
-  while ( start < end && parmap->finish == -1) {
-    //XBT_CRITICAL("Starting with %p", start);
-    int res = parmap->snapshot_compare(*(void**)start, parmap->ref_snapshot);
-    start = (char *)start + sizeof(start);
-    if (!res){
-      parmap->finish = ((char*)start - (char*)parmap->mc_data) / sizeof(void*);
-      //XBT_CRITICAL("Find good one %p (%p)", start, parmap->mc_data);
-      break;
-    }
-  }
-}
-
-/**
- * \brief Main function of a worker thread.
- * \param arg the parmap
- */
-static void *xbt_parmap_mc_worker_main(void *arg)
-{
-  xbt_parmap_thread_data_t data = (xbt_parmap_thread_data_t) arg;
-  xbt_parmap_t parmap = data->parmap;
-  unsigned round = 0;
-  /* smx_context_t context = SIMIX_context_new(NULL, 0, NULL, NULL, NULL); */
-  /* SIMIX_context_set_current(context); */
-
-  XBT_DEBUG("New worker thread created");
-
-  /* Worker's main loop */
-  while (1) {
-    parmap->worker_wait_f(parmap, ++round);
-    if (parmap->status == XBT_PARMAP_WORK) {
-      XBT_DEBUG("Worker %d got a job", data->worker_id);
-
-      xbt_parmap_mc_work(parmap, data->worker_id);
-      parmap->worker_signal_f(parmap);
-
-      XBT_DEBUG("Worker %d has finished", data->worker_id);
-    /* We are destroying the parmap */
-    } else {
-      xbt_free(data);
-      return NULL;
-    }
-  }
-}
-#endif
-
 #if HAVE_FUTEX_H
 static void futex_wait(unsigned *uaddr, unsigned val)
 {
-- 
2.20.1