merge conflicts

[simgrid.git] / src / simix / smx_smurf.c

diff --git a/src/simix/smx_smurf.c b/src/simix/smx_smurf.c
index 840166a..f193032 100644 (file)
--- a/src/simix/smx_smurf.c
+++ b/src/simix/smx_smurf.c
@@ -5,88 +5,33 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_smurf, simix,
                                 "Logging specific to SIMIX (SMURF)");
 
-/* Tables with the requests to handle at the end of this round of scheduling
- * user processes. There is one for each thread of execution. */
-static xbt_swag_t *req_lists;
-
-void SIMIX_request_init(void)
+XBT_INLINE smx_req_t SIMIX_req_mine()
 {
-  s_smx_req_t req;
-  int i, nthreads = SIMIX_context_get_nthreads();
-
-  req_lists = xbt_new0(xbt_swag_t, nthreads);
-  for(i=0; i < nthreads; i++)
-    req_lists[i] = xbt_swag_new(xbt_swag_offset(req, reqtable_hookup));
-
-}
-
-void SIMIX_request_destroy(void)
-{
-  int i, nthreads = SIMIX_context_get_nthreads();
-
-  for(i=0; i < nthreads; i++)
-    xbt_swag_free(req_lists[i]);
-
-  xbt_free(req_lists);
-}
-
-xbt_swag_t SIMIX_request_get_reqlist(int thread_pid)
-{
-  return req_lists[thread_pid];
-}
-
-/* FIXME: we may want to save the initialization of issuer... */
-XBT_INLINE smx_req_t SIMIX_req_mine() {
   smx_process_t issuer = SIMIX_process_self();
   return &issuer->request;
 }
 
-void SIMIX_request_push()
+/**
+ * \brief Makes the current process do a request to the kernel and yields
+ * until completion.
+ * \param self the current process
+ */
+void SIMIX_request_push(smx_process_t self)
 {
-  xbt_swag_t req_table;
-  smx_process_t issuer = SIMIX_process_self();
-
-  if (issuer != simix_global->maestro_process){
-    issuer->request.issuer = issuer;
-    req_table = SIMIX_request_get_reqlist(SIMIX_context_get_thread_id());
-
-    xbt_swag_insert_at_tail(&issuer->request, req_table);
-
-    XBT_DEBUG("Pushed request %s (%d) of %s",
-        SIMIX_request_name(issuer->request.call), issuer->request.call,
-        issuer->name);
-
-    XBT_DEBUG("Yield process '%s' on request of type %s (%d)", issuer->name,
-        SIMIX_request_name(issuer->request.call), issuer->request.call);
-    SIMIX_process_yield();
+  if (self != simix_global->maestro_process) {
+    XBT_DEBUG("Yield process '%s' on request of type %s (%d)", self->name,
+        SIMIX_request_name(self->request.call), self->request.call);
+    SIMIX_process_yield(self);
   } else {
-    SIMIX_request_pre(&issuer->request, 0);
-  }
-}
-
-smx_req_t SIMIX_request_pop(void)
-{
-  int i;
-  smx_req_t req = NULL;
-  int nthreads = SIMIX_context_get_nthreads();
-
-  for(i=0; i < nthreads; i++){
-    if((req = xbt_swag_extract(req_lists[i]))){
-      XBT_DEBUG("Popped request %s (%d) of %s",
-          SIMIX_request_name(req->issuer->request.call),
-          req->issuer->request.call,
-          req->issuer->name);
-      return req;
-    }
+    SIMIX_request_pre(&self->request, 0);
   }
-
-  return NULL;
 }
 
 void SIMIX_request_answer(smx_req_t req)
 {
   if (req->issuer != simix_global->maestro_process){
-    XBT_DEBUG("Answer request %s (%d)", SIMIX_request_name(req->call), req->call);
+    XBT_DEBUG("Answer request %s (%d) issued by %s (%p)", SIMIX_request_name(req->call), req->call,
+        req->issuer->name, req->issuer);
     req->issuer->request.call = REQ_NO_REQ;
     xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, req->issuer);
   }
@@ -539,6 +484,7 @@ void SIMIX_request_pre(smx_req_t req, int value)
           SIMIX_host_get_name(SIMIX_process_get_host(req->issuer))
           );
       break;
+
   }
 }