Don't modify loop counter inside of loop body.

[simgrid.git] / src / smpi / mpi / smpi_f2c.cpp

diff --git a/src/smpi/mpi/smpi_f2c.cpp b/src/smpi/mpi/smpi_f2c.cpp
index e5a5706..1989c12 100644 (file)
--- a/src/smpi/mpi/smpi_f2c.cpp
+++ b/src/smpi/mpi/smpi_f2c.cpp
@@ -1,90 +1,60 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "private.h"
 #include "smpi_f2c.hpp"
-#include "smpi_process.hpp"
+#include "private.hpp"
+#include "src/smpi/include/smpi_actor.hpp"
 
-#include <cstdio>
+int mpi_in_place_;
+int mpi_bottom_;
+int mpi_status_ignore_;
+int mpi_statuses_ignore_;
 
 namespace simgrid{
 namespace smpi{
 
-xbt_dict_t F2C::f2c_lookup_=nullptr;
-int F2C::f2c_id_=0;
+std::unordered_map<int, F2C*>* F2C::f2c_lookup_ = nullptr;
+int F2C::f2c_id_ = 0;
 
-xbt_dict_t F2C::f2c_lookup(){
-  return f2c_lookup_;
-}
-
-void F2C::set_f2c_lookup(xbt_dict_t dict){
-  f2c_lookup_=dict;
-}
+// Keep it non trivially-constructible, or it will break MC+smpi on FreeBSD with Clang (don't ask why)
+F2C::F2C() = default;
 
-void F2C::f2c_id_increment(){
-  f2c_id_++;
-};
+int F2C::add_f()
+{
+  if (f2c_lookup_ == nullptr)
+    f2c_lookup_ = new std::unordered_map<int, F2C*>();
 
-int F2C::f2c_id(){
-  return f2c_id_;
-};
-
-char* F2C::get_key(char* key, int id) {
-  std::snprintf(key, KEY_SIZE, "%x",id);
-  return key;
-}
-
-char* F2C::get_key_id(char* key, int id) {
-  std::snprintf(key, KEY_SIZE, "%x_%d",id, smpi_process()->index());
-  return key;
-}
-
-void F2C::delete_lookup(){
-  xbt_dict_free(&f2c_lookup_);
-}
-
-xbt_dict_t F2C::lookup(){
-  return f2c_lookup_;
-}
-
-void F2C::free_f(int id){
-  char key[KEY_SIZE];
-  xbt_dict_remove(f2c_lookup_, get_key(key, id));
-}
-
-int F2C::add_f(){
-  if(f2c_lookup_==nullptr){
-    f2c_lookup_=xbt_dict_new_homogeneous(nullptr);
-  }
-  char key[KEY_SIZE];
-  xbt_dict_set(f2c_lookup_, get_key(key, f2c_id_), this, nullptr);
+  my_f2c_id_                 = f2c_id();
+  (*f2c_lookup_)[my_f2c_id_] = this;
   f2c_id_increment();
-  return f2c_id_-1;
+  return my_f2c_id_;
 }
 
-int F2C::c2f(){
-  if(f2c_lookup_==nullptr){
-    f2c_lookup_=xbt_dict_new_homogeneous(nullptr);
+int F2C::c2f()
+{
+  if (f2c_lookup_ == nullptr) {
+    f2c_lookup_ = new std::unordered_map<int, F2C*>();
   }
 
-  char* existing_key = xbt_dict_get_key(f2c_lookup_, this);
-  if(existing_key!=nullptr){
-    return atoi(existing_key);}
-  else{
-    return this->add_f();}
+  if(my_f2c_id_==-1)
+    /* this function wasn't found, add it */
+    return this->add_f();
+  else
+    return my_f2c_id_;
 }
 
-F2C* F2C::f2c(int id){
-  if(f2c_lookup_==nullptr){
-    f2c_lookup_=xbt_dict_new_homogeneous(nullptr);
-  }
+F2C* F2C::f2c(int id)
+{
+  if (f2c_lookup_ == nullptr)
+    f2c_lookup_ = new std::unordered_map<int, F2C*>();
+
   if(id >= 0){
-    char key[KEY_SIZE];
-    return static_cast<F2C*>(xbt_dict_get_or_null(f2c_lookup_, get_key(key, id)));
+    auto comm = f2c_lookup_->find(id);
+    return comm == f2c_lookup_->end() ? nullptr : comm->second;
   }else
-    return NULL;
+    return nullptr;
 }
 
 }