Merge branch 'master' of https://framagit.org/simgrid/simgrid

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

diff --git a/src/smpi/mpi/smpi_info.cpp b/src/smpi/mpi/smpi_info.cpp
index 093da59..73a323e 100644 (file)
--- a/src/smpi/mpi/smpi_info.cpp
+++ b/src/smpi/mpi/smpi_info.cpp
@@ -1,35 +1,16 @@
-/* Copyright (c) 2007-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2019. 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 "smpi_info.hpp"
-#include "xbt/ex.hpp"
-#include "xbt/sysdep.h"
+#include "simgrid/Exception.hpp"
 
-namespace simgrid{
-namespace smpi{
+namespace simgrid {
+namespace smpi {
 
-Info::Info():refcount_(1){
-  dict_= xbt_dict_new_homogeneous(xbt_free_f);
-}
-
-Info::Info(Info* info):refcount_(1){
-  dict_= xbt_dict_new_homogeneous(xbt_free_f);
-  xbt_dict_cursor_t cursor = nullptr;
-  char* key;
-  void* data;
-  xbt_dict_foreach(info->dict_,cursor,key,data){
-    xbt_dict_set(dict_, key, xbt_strdup(static_cast<char*>(data)), nullptr);
-  }
-}
-
-Info::~Info(){
-  xbt_dict_free(&dict_);
-}
-
-void Info::ref(){
+void Info::ref()
+{
   refcount_++;
 }
 
@@ -40,46 +21,39 @@ void Info::unref(Info* info){
   }
 }
 
-void Info::set(char *key, char *value){
-  xbt_dict_set(dict_, key, xbt_strdup(value), nullptr);
-}
-
-int Info::get(char *key, int valuelen, char *value, int *flag){
+int Info::get(const char *key, int valuelen, char *value, int *flag){
   *flag=false;
-  char* tmpvalue=static_cast<char*>(xbt_dict_get_or_null(dict_, key));
-  if(tmpvalue){
+  auto val = map_.find(key);
+  if (val != map_.end()) {
+    std::string tmpvalue = val->second;
+
     memset(value, 0, valuelen);
-    memcpy(value,tmpvalue, (strlen(tmpvalue) + 1 < static_cast<size_t>(valuelen)) ? strlen(tmpvalue) + 1 : valuelen);
+    memcpy(value, tmpvalue.c_str(),
+           (tmpvalue.length() + 1 < static_cast<size_t>(valuelen)) ? tmpvalue.length() + 1 : valuelen);
     *flag=true;
+    return MPI_SUCCESS;
+  } else {
+    return MPI_ERR_INFO_KEY;
   }
-  return MPI_SUCCESS;
 }
 
-
-int Info::remove(char *key){
-  try {
-    xbt_dict_remove(dict_, key);
-  }
-  catch(xbt_ex& e){
+int Info::remove(const char *key){
+  if (map_.erase(key) == 0)
     return MPI_ERR_INFO_NOKEY;
-  }
-  return MPI_SUCCESS;
+  else
+    return MPI_SUCCESS;
 }
 
 int Info::get_nkeys(int *nkeys){
-  *nkeys=xbt_dict_size(dict_);
+  *nkeys = map_.size();
   return MPI_SUCCESS;
 }
 
 int Info::get_nthkey(int n, char *key){
-  xbt_dict_cursor_t cursor = nullptr;
-  char *keyn;
-  void* data;
   int num=0;
-  xbt_dict_foreach(dict_,cursor,keyn,data){
-    if(num==n){
-      strncpy(key,keyn,strlen(keyn)+1);
-      xbt_dict_cursor_free(&cursor);
+  for (auto const& elm : map_) {
+    if (num == n) {
+      strncpy(key, elm.first.c_str(), elm.first.length() + 1);
       return MPI_SUCCESS;
     }
     num++;
@@ -87,14 +61,16 @@ int Info::get_nthkey(int n, char *key){
   return MPI_ERR_ARG;
 }
 
-int Info::get_valuelen(char *key, int *valuelen, int *flag){
+int Info::get_valuelen(const char *key, int *valuelen, int *flag){
   *flag=false;
-  char* tmpvalue=static_cast<char*>(xbt_dict_get_or_null(dict_, key));
-  if(tmpvalue){
-    *valuelen=strlen(tmpvalue);
+  auto val = map_.find(key);
+  if (val != map_.end()) {
+    *valuelen = val->second.length();
     *flag=true;
+    return MPI_SUCCESS;
+  } else {
+    return MPI_ERR_INFO_KEY;
   }
-  return MPI_SUCCESS;
 }
 
 Info* Info::f2c(int id){
@@ -103,4 +79,3 @@ Info* Info::f2c(int id){
 
 }
 }
-