more cosmetic cleanups

diff --git a/src/bindings/java/jmsg_file.cpp b/src/bindings/java/jmsg_file.cpp
index 9f60fc3..98e7f94 100644 (file)
--- a/src/bindings/java/jmsg_file.cpp
+++ b/src/bindings/java/jmsg_file.cpp
@@ -35,17 +35,17 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_File_open(JNIEnv *env, jobject jfile
 
 JNIEXPORT jlong JNICALL Java_org_simgrid_msg_File_read(JNIEnv *env, jobject jfile, jlong jsize) {
   msg_file_t file = jfile_get_native(env, jfile);
 
 JNIEXPORT jlong JNICALL Java_org_simgrid_msg_File_read(JNIEnv *env, jobject jfile, jlong jsize) {
   msg_file_t file = jfile_get_native(env, jfile);

-  return (jlong)MSG_file_read(file, (sg_size_t)jsize);
+  return (jlong)MSG_file_read(file, static_cast<sg_size_t>(jsize));

 }
 
 JNIEXPORT jlong JNICALL Java_org_simgrid_msg_File_write(JNIEnv *env, jobject jfile, jlong jsize) {
   msg_file_t file = jfile_get_native(env, jfile);
 }
 
 JNIEXPORT jlong JNICALL Java_org_simgrid_msg_File_write(JNIEnv *env, jobject jfile, jlong jsize) {
   msg_file_t file = jfile_get_native(env, jfile);

-  return (jlong)MSG_file_write(file, (sg_size_t)jsize);
+  return (jlong)MSG_file_write(file, static_cast<sg_size_t>(jsize));

 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_File_seek(JNIEnv *env, jobject jfile, jlong offset, jlong origin) {
   msg_file_t file = jfile_get_native(env, jfile);
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_File_seek(JNIEnv *env, jobject jfile, jlong offset, jlong origin) {
   msg_file_t file = jfile_get_native(env, jfile);

-  MSG_file_seek(file, (sg_offset_t)offset, (int) origin);
+  MSG_file_seek(file, static_cast<sg_offset_t>(offset), static_cast<int>(origin));

 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_File_close(JNIEnv *env, jobject jfile) {
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_File_close(JNIEnv *env, jobject jfile) {

diff --git a/src/bindings/java/jtrace.cpp b/src/bindings/java/jtrace.cpp
index df49268..79b8257 100644 (file)
--- a/src/bindings/java/jtrace.cpp
+++ b/src/bindings/java/jtrace.cpp
@@ -187,4 +187,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableAddWithTime (JNI
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableSubWithTime (JNIEnv *, jclass, jdouble, jstring, jstring, jdouble);
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableAdd (JNIEnv *, jclass, jstring, jstring, jstring, jdouble);
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSub (JNIEnv *, jclass, jstring, jstring, jstring, jdouble);
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableSubWithTime (JNIEnv *, jclass, jdouble, jstring, jstring, jdouble);
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableAdd (JNIEnv *, jclass, jstring, jstring, jstring, jdouble);
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSub (JNIEnv *, jclass, jstring, jstring, jstring, jdouble);

+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSetWithTime (JNIEnv *env, jclass cls, jdouble, jstring, jstring, jstring, jdouble);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcdstVariableAddWithTime (JNIEnv *env, jclass cls, jdouble, jstring, jstring, jstring, jdouble);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSubWithTime (JNIEnv *env, jclass cls, jdouble, jstring, jstring, jstring, jdouble);

 */
 */

diff --git a/src/bindings/java/jtrace.h b/src/bindings/java/jtrace.h
index 136ecd1..377f071 100644 (file)
--- a/src/bindings/java/jtrace.h
+++ b/src/bindings/java/jtrace.h
@@ -12,41 +12,56 @@
 extern "C" {
 #endif
 
 extern "C" {
 #endif
 

-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableDeclare (JNIEnv *env, jclass klass, jstring);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableDeclare (JNIEnv *env, jclass klass, jstring);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableDeclareWithColor (JNIEnv *env, jclass klass, jstring, jstring);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSet (JNIEnv *env, jclass klass, jstring, jstring, jdouble);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableSet (JNIEnv *env, jclass klass, jstring, jstring, jdouble);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableAdd (JNIEnv *env, jclass klass, jstring, jstring, jdouble);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSub (JNIEnv *env, jclass klass, jstring, jstring, jdouble);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSetWithTime (JNIEnv *env, jclass klass, jdouble, jstring, jstring, jdouble);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableAddWithTime (JNIEnv *env, jclass klass, jdouble, jstring, jstring, jdouble);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSubWithTime (JNIEnv *env, jclass klass, jdouble, jstring, jstring, jdouble);
-JNIEXPORT jobjectArray JNICALL Java_org_simgrid_trace_Trace_getHostVariablesName (JNIEnv *env, jclass klass);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableDeclare (JNIEnv *env, jclass cls, jstring jvar);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableDeclare (JNIEnv *env, jclass cls, jstring jvar);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableDeclareWithColor (JNIEnv *env, jclass cls, jstring jvar,
+                                                                                  jstring jcolor);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSet (JNIEnv *env, jclass cls, jstring js_host,
+                                                                     jstring jvar, jdouble value);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableSet (JNIEnv *env, jclass cls, jstring js_wn,
+                                                                   jstring jvar, jdouble value);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableAdd (JNIEnv *env, jclass cls, jstring js_host,
+                                                                     jstring jvar, jdouble value);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSub (JNIEnv *env, jclass cls, jstring js_host,
+                                                                     jstring jvar, jdouble value);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSetWithTime (JNIEnv *env, jclass cls, jdouble, jstring, jstring, jdouble);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableAddWithTime (JNIEnv *env, jclass cls, jdouble, jstring, jstring, jdouble);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSubWithTime (JNIEnv *env, jclass cls, jdouble, jstring, jstring, jdouble);
+JNIEXPORT jobjectArray JNICALL Java_org_simgrid_trace_Trace_getHostVariablesName (JNIEnv *env, jclass cls);

 
 

-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableDeclare (JNIEnv *env, jclass klass, jstring);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableDeclareWithColor (JNIEnv *env, jclass klass, jstring, jstring);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableSet (JNIEnv *env, jclass klass, jstring, jstring, jdouble);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableAdd (JNIEnv *env, jclass klass, jstring, jstring, jdouble);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableSub (JNIEnv *env, jclass klass, jstring, jstring, jdouble);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableSetWithTime (JNIEnv *env, jclass klass, jdouble, jstring, jstring, jdouble);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableAddWithTime (JNIEnv *env, jclass klass, jdouble, jstring, jstring, jdouble);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableSubWithTime (JNIEnv *env, jclass klass, jdouble, jstring, jstring, jdouble);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSet (JNIEnv *env, jclass klass, jstring, jstring, jstring, jdouble);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableAdd (JNIEnv *env, jclass klass, jstring, jstring, jstring, jdouble);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSub (JNIEnv *env, jclass klass, jstring, jstring, jstring, jdouble);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableDeclare (JNIEnv *env, jclass cls, jstring jvar);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableDeclareWithColor (JNIEnv *env, jclass cls, jstring jvar,
+                                                                                  jstring jcolor);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableSet (JNIEnv *env, jclass cls, jstring jlink,
+                                                                     jstring jvar, jdouble jvalue);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableAdd (JNIEnv *env, jclass cls, jstring jlink,
+                                                                     jstring jvar, jdouble jvalue);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableSub (JNIEnv *env, jclass cls, jstring jlink,
+                                                                     jstring jvar, jdouble jvalue);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSet (JNIEnv *env, jclass cls, jstring jsrc,
+                                                                           jstring jdst, jstring jvar, jdouble jvalue);
+JNIEXPORT jobjectArray JNICALL Java_org_simgrid_trace_Trace_getLinkVariablesName (JNIEnv *env, jclass cls);

 
 

-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSetWithTime (JNIEnv *env, jclass klass, jdouble, jstring, jstring, jstring, jdouble);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcdstVariableAddWithTime (JNIEnv *env, jclass klass, jdouble, jstring, jstring, jstring, jdouble);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSubWithTime (JNIEnv *env, jclass klass, jdouble, jstring, jstring, jstring, jdouble);
-
-JNIEXPORT jobjectArray JNICALL Java_org_simgrid_trace_Trace_getLinkVariablesName (JNIEnv *env, jclass klass);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostStateDeclare (JNIEnv *env, jclass klass, jstring);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostStateDeclareValue (JNIEnv *env, jclass klass, jstring, jstring, jstring);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostSetState (JNIEnv *env, jclass klass, jstring, jstring, jstring);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostPushState (JNIEnv *env, jclass klass, jstring, jstring, jstring);
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostPopState (JNIEnv *env, jclass klass, jstring, jstring);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostStateDeclare(JNIEnv * env, jclass cls, jstring js);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostStateDeclareValue (JNIEnv *env, jclass cls, jstring js_state,
+                                                                           jstring js_value, jstring js_color);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostSetState (JNIEnv *env, jclass cls, jstring js_host,
+                                                                  jstring js_state, jstring js_value);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostPushState (JNIEnv *env, jclass cls, jstring js_host,
+                                                                   jstring js_state, jstring js_value);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostPopState (JNIEnv *env, jclass cls, jstring js_host,
+                                                                  jstring js_state);

 
 

+/* Missing calls
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableSetWithTime (JNIEnv *env, jclass cls, jdouble, jstring, jstring, jdouble);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableAddWithTime (JNIEnv *env, jclass cls, jdouble, jstring, jstring, jdouble);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableSubWithTime (JNIEnv *env, jclass cls, jdouble, jstring, jstring, jdouble);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableAdd (JNIEnv *env, jclass cls, jstring, jstring, jstring, jdouble);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSub (JNIEnv *env, jclass cls, jstring, jstring, jstring, jdouble);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSetWithTime (JNIEnv *env, jclass cls, jdouble, jstring, jstring, jstring, jdouble);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcdstVariableAddWithTime (JNIEnv *env, jclass cls, jdouble, jstring, jstring, jstring, jdouble);
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSubWithTime (JNIEnv *env, jclass cls, jdouble, jstring, jstring, jstring, jdouble);
+*/

 #ifdef __cplusplus
 }
 #endif
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp
index 758a256..b8b28ef 100644 (file)
--- a/src/instr/instr_interface.cpp
+++ b/src/instr/instr_interface.cpp
@@ -29,12 +29,15 @@ extern xbt_dict_t trivaEdgeTypes;
 
 static xbt_dynar_t instr_dict_to_dynar (xbt_dict_t filter)
 {
 
 static xbt_dynar_t instr_dict_to_dynar (xbt_dict_t filter)
 {

-  if (!TRACE_is_enabled()) return nullptr;
-  if (!TRACE_needs_platform()) return nullptr;
+  if (!TRACE_is_enabled())
+    return nullptr;
+  if (!TRACE_needs_platform())
+    return nullptr;

 
   xbt_dynar_t ret = xbt_dynar_new (sizeof(char*), &xbt_free_ref);
   xbt_dict_cursor_t cursor = nullptr;
 
   xbt_dynar_t ret = xbt_dynar_new (sizeof(char*), &xbt_free_ref);
   xbt_dict_cursor_t cursor = nullptr;

-  char *name, *value;
+  char *name;
+  char *value;

   xbt_dict_foreach(filter, cursor, name, value) {
     xbt_dynar_push_as (ret, char*, xbt_strdup(name));
   }
   xbt_dict_foreach(filter, cursor, name, value) {
     xbt_dynar_push_as (ret, char*, xbt_strdup(name));
   }


@@ -79,16 +82,20 @@ void TRACE_category(const char *category)
 void TRACE_category_with_color (const char *category, const char *color)
 {
   /* safe switch */
 void TRACE_category_with_color (const char *category, const char *color)
 {
   /* safe switch */

-  if (!TRACE_is_enabled()) return;
+  if (!TRACE_is_enabled())
+    return;

 
 

-  if (!(TRACE_categorized() && category != nullptr)) return;
+  if (!(TRACE_categorized() && category != nullptr))
+    return;

 
   /* if platform is not traced, we can't deal with categories */
 
   /* if platform is not traced, we can't deal with categories */

-  if (!TRACE_needs_platform()) return;
+  if (!TRACE_needs_platform())
+    return;

 
   //check if category is already created
 
   //check if category is already created

-  char *created = (char*)xbt_dict_get_or_null(created_categories, category);
-  if (created) return;
+  char *created = static_cast<char*>(xbt_dict_get_or_null(created_categories, category));
+  if (created)
+    return;

   xbt_dict_set (created_categories, category, xbt_strdup("1"), nullptr);
 
   //define final_color
   xbt_dict_set (created_categories, category, xbt_strdup("1"), nullptr);
 
   //define final_color


@@ -121,10 +128,12 @@ void TRACE_category_with_color (const char *category, const char *color)
  *
  *  \see MSG_task_set_category, SD_task_set_category
  */
  *
  *  \see MSG_task_set_category, SD_task_set_category
  */

-xbt_dynar_t TRACE_get_categories (void)
+xbt_dynar_t TRACE_get_categories ()

 {
 {

-  if (!TRACE_is_enabled()) return nullptr;
-  if (!TRACE_categorized()) return nullptr;
+  if (!TRACE_is_enabled())
+    return nullptr;
+  if (!TRACE_categorized())
+    return nullptr;

 
   return instr_dict_to_dynar (created_categories);
 }
 
   return instr_dict_to_dynar (created_categories);
 }


@@ -142,15 +151,18 @@ xbt_dynar_t TRACE_get_categories (void)
 void TRACE_declare_mark(const char *mark_type)
 {
   /* safe switch */
 void TRACE_declare_mark(const char *mark_type)
 {
   /* safe switch */

-  if (!TRACE_is_enabled()) return;
+  if (!TRACE_is_enabled())
+    return;

 
   /* if platform is not traced, we don't allow marks */
 
   /* if platform is not traced, we don't allow marks */

-  if (!TRACE_needs_platform()) return;
+  if (!TRACE_needs_platform())
+    return;

 
 

-  if (!mark_type) THROWF (tracing_error, 1, "mark_type is nullptr");
+  if (!mark_type)
+    THROWF (tracing_error, 1, "mark_type is nullptr");

 
   //check if mark_type is already declared
 
   //check if mark_type is already declared

-  char *created = (char*)xbt_dict_get_or_null(declared_marks, mark_type);
+  char *created = static_cast<char*>(xbt_dict_get_or_null(declared_marks, mark_type));

   if (created) {
     THROWF (tracing_error, 1, "mark_type with name (%s) is already declared", mark_type);
   }
   if (created) {
     THROWF (tracing_error, 1, "mark_type with name (%s) is already declared", mark_type);
   }


@@ -178,13 +190,17 @@ void TRACE_declare_mark(const char *mark_type)
 void TRACE_declare_mark_value_with_color (const char *mark_type, const char *mark_value, const char *mark_color)
 {
   /* safe switch */
 void TRACE_declare_mark_value_with_color (const char *mark_type, const char *mark_value, const char *mark_color)
 {
   /* safe switch */

-  if (!TRACE_is_enabled()) return;
+  if (!TRACE_is_enabled())
+    return;

 
   /* if platform is not traced, we don't allow marks */
 
   /* if platform is not traced, we don't allow marks */

-  if (!TRACE_needs_platform()) return;
+  if (!TRACE_needs_platform())
+    return;

 
 

-  if (!mark_type) THROWF (tracing_error, 1, "mark_type is nullptr");
-  if (!mark_value) THROWF (tracing_error, 1, "mark_value is nullptr");
+  if (!mark_type)
+    THROWF (tracing_error, 1, "mark_type is nullptr");
+  if (!mark_value)
+    THROWF (tracing_error, 1, "mark_value is nullptr");

 
   type_t type = PJ_type_get (mark_type, PJ_type_get_root());
   if (!type){
 
   type_t type = PJ_type_get (mark_type, PJ_type_get_root());
   if (!type){


@@ -192,7 +208,8 @@ void TRACE_declare_mark_value_with_color (const char *mark_type, const char *mar
   }
 
   char white[INSTR_DEFAULT_STR_SIZE] = "1.0 1.0 1.0";
   }
 
   char white[INSTR_DEFAULT_STR_SIZE] = "1.0 1.0 1.0";

-  if (!mark_color) mark_color = white;
+  if (!mark_color)
+    mark_color = white;

 
   XBT_DEBUG("MARK,declare_value %s %s %s", mark_type, mark_value, mark_color);
   PJ_value_new (mark_value, mark_color, type);
 
   XBT_DEBUG("MARK,declare_value %s %s %s", mark_type, mark_value, mark_color);
   PJ_value_new (mark_value, mark_color, type);


@@ -232,13 +249,17 @@ void TRACE_declare_mark_value (const char *mark_type, const char *mark_value)
 void TRACE_mark(const char *mark_type, const char *mark_value)
 {
   /* safe switch */
 void TRACE_mark(const char *mark_type, const char *mark_value)
 {
   /* safe switch */

-  if (!TRACE_is_enabled()) return;
+  if (!TRACE_is_enabled())
+    return;

 
   /* if platform is not traced, we don't allow marks */
 
   /* if platform is not traced, we don't allow marks */

-  if (!TRACE_needs_platform()) return;
+  if (!TRACE_needs_platform())
+    return;

 
 

-  if (!mark_type) THROWF (tracing_error, 1, "mark_type is nullptr");
-  if (!mark_value) THROWF (tracing_error, 1, "mark_value is nullptr");
+  if (!mark_type)
+    THROWF (tracing_error, 1, "mark_type is nullptr");
+  if (!mark_value)
+    THROWF (tracing_error, 1, "mark_value is nullptr");

 
   //check if mark_type is already declared
   type_t type = PJ_type_get (mark_type, PJ_type_get_root());
 
   //check if mark_type is already declared
   type_t type = PJ_type_get (mark_type, PJ_type_get_root());


@@ -260,7 +281,8 @@ void TRACE_mark(const char *mark_type, const char *mark_value)
  */
 xbt_dynar_t TRACE_get_marks (void)
 {
  */
 xbt_dynar_t TRACE_get_marks (void)
 {

-  if (!TRACE_is_enabled()) return nullptr;
+  if (!TRACE_is_enabled())
+    return nullptr;

 
   return instr_dict_to_dynar (declared_marks);
 }
 
   return instr_dict_to_dynar (declared_marks);
 }


@@ -269,10 +291,12 @@ static void instr_user_variable(double time, const char *resource, const char *v
                          double value, InstrUserVariable what, const char *color, xbt_dict_t filter)
 {
   /* safe switch */
                          double value, InstrUserVariable what, const char *color, xbt_dict_t filter)
 {
   /* safe switch */

-  if (!TRACE_is_enabled()) return;
+  if (!TRACE_is_enabled())
+    return;

 
   /* if platform is not traced, we don't allow user variables */
 
   /* if platform is not traced, we don't allow user variables */

-  if (!TRACE_needs_platform()) return;
+  if (!TRACE_needs_platform())
+    return;

 
   //check if variable is already declared
   char *created = (char*)xbt_dict_get_or_null(filter, variable);
 
   //check if variable is already declared
   char *created = (char*)xbt_dict_get_or_null(filter, variable);


@@ -281,44 +305,31 @@ static void instr_user_variable(double time, const char *resource, const char *v
       return;
     }else{
       xbt_dict_set (filter, variable, xbt_strdup("1"), nullptr);
       return;
     }else{
       xbt_dict_set (filter, variable, xbt_strdup("1"), nullptr);

+      instr_new_user_variable_type (father_type, variable, color);

     }
   }else{
     if (!created){//not declared, ignore
       return;
     }
   }else{
     if (!created){//not declared, ignore
       return;

-    }
-  }
-
-  char valuestr[100];
-  snprintf(valuestr, 100, "%g", value);
-
-  switch (what){
-  case INSTR_US_DECLARE:
-    instr_new_user_variable_type (father_type, variable, color);
-    break;
-  case INSTR_US_SET:
-    {
-      container_t container = PJ_container_get(resource);
-      type_t type = PJ_type_get (variable, container->type);
-      new_pajeSetVariable(time, container, type, value);
-    }
-    break;
-  case INSTR_US_ADD:
-    {
-      container_t container = PJ_container_get(resource);
-      type_t type = PJ_type_get (variable, container->type);
-      new_pajeAddVariable(time, container, type, value);
-    }
-    break;
-  case INSTR_US_SUB:
-    {
+    } else {
+      char valuestr[100];
+      snprintf(valuestr, 100, "%g", value);

       container_t container = PJ_container_get(resource);
       type_t type = PJ_type_get (variable, container->type);
       container_t container = PJ_container_get(resource);
       type_t type = PJ_type_get (variable, container->type);

-      new_pajeSubVariable(time, container, type, value);
+      switch (what){
+      case INSTR_US_SET:
+        new_pajeSetVariable(time, container, type, value);
+        break;
+      case INSTR_US_ADD:
+        new_pajeAddVariable(time, container, type, value);
+        break;
+      case INSTR_US_SUB:
+        new_pajeSubVariable(time, container, type, value);
+        break;
+      default:
+        THROW_IMPOSSIBLE;
+        break;
+      }

     }
     }

-     break;
-  default:
-    //TODO: launch exception
-    break;

   }
 }
 
   }
 }
 


@@ -326,10 +337,12 @@ static void instr_user_srcdst_variable(double time, const char *src, const char
                               const char *father_type, double value, InstrUserVariable what)
 {
   sg_netcard_t src_elm = sg_netcard_by_name_or_null(src);
                               const char *father_type, double value, InstrUserVariable what)
 {
   sg_netcard_t src_elm = sg_netcard_by_name_or_null(src);

-  if(!src_elm) xbt_die("Element '%s' not found!",src);
+  if(!src_elm)
+    xbt_die("Element '%s' not found!",src);

 
   sg_netcard_t dst_elm = sg_netcard_by_name_or_null(dst);
 
   sg_netcard_t dst_elm = sg_netcard_by_name_or_null(dst);

-  if(!dst_elm) xbt_die("Element '%s' not found!",dst);
+  if(!dst_elm)
+    xbt_die("Element '%s' not found!",dst);

 
   std::vector<Link*> *route = new std::vector<Link*>();
   routing_platf->getRouteAndLatency (src_elm, dst_elm, route,nullptr);
 
   std::vector<Link*> *route = new std::vector<Link*>();
   routing_platf->getRouteAndLatency (src_elm, dst_elm, route,nullptr);


@@ -352,9 +365,11 @@ static void instr_user_srcdst_variable(double time, const char *src, const char
 int TRACE_platform_graph_export_graphviz (const char *filename)
 {
   /* returns 1 if successful, 0 otherwise */
 int TRACE_platform_graph_export_graphviz (const char *filename)
 {
   /* returns 1 if successful, 0 otherwise */

-  if (!TRACE_is_enabled()) return 0;
+  if (!TRACE_is_enabled())
+    return 0;

   xbt_graph_t g = instr_routing_platform_graph();
   xbt_graph_t g = instr_routing_platform_graph();

-  if (g == nullptr) return 0;
+  if (g == nullptr)
+    return 0;

   instr_routing_platform_graph_export_graphviz (g, filename);
   xbt_graph_free_graph(g, xbt_free_f, xbt_free_f, nullptr);
   return 1;
   instr_routing_platform_graph_export_graphviz (g, filename);
   xbt_graph_free_graph(g, xbt_free_f, xbt_free_f, nullptr);
   return 1;


@@ -1042,7 +1057,7 @@ void TRACE_host_reset_state (const char *host, const char *state)
  *
  *  \return A dynar with the types, must be freed with xbt_dynar_free.
  */
  *
  *  \return A dynar with the types, must be freed with xbt_dynar_free.
  */

-xbt_dynar_t TRACE_get_node_types (void)
+xbt_dynar_t TRACE_get_node_types ()

 {
   return instr_dict_to_dynar (trivaNodeTypes);
 }
 {
   return instr_dict_to_dynar (trivaNodeTypes);
 }


@@ -1055,7 +1070,7 @@ xbt_dynar_t TRACE_get_node_types (void)
  *
  *  \return A dynar with the types, must be freed with xbt_dynar_free.
  */
  *
  *  \return A dynar with the types, must be freed with xbt_dynar_free.
  */

-xbt_dynar_t TRACE_get_edge_types (void)
+xbt_dynar_t TRACE_get_edge_types ()

 {
   return instr_dict_to_dynar (trivaEdgeTypes);
 }
 {
   return instr_dict_to_dynar (trivaEdgeTypes);
 }


@@ -1064,7 +1079,7 @@ xbt_dynar_t TRACE_get_edge_types (void)
  *  \brief Pauses all tracing activities.
  *  \see TRACE_resume
  */
  *  \brief Pauses all tracing activities.
  *  \see TRACE_resume
  */

-void TRACE_pause (void)
+void TRACE_pause ()

 {
   instr_pause_tracing();
 }
 {
   instr_pause_tracing();
 }


@@ -1073,7 +1088,7 @@ void TRACE_pause (void)
  *  \brief Resumes all tracing activities.
  *  \see TRACE_pause
  */
  *  \brief Resumes all tracing activities.
  *  \see TRACE_pause
  */

-void TRACE_resume (void)
+void TRACE_resume ()

 {
   instr_resume_tracing();
 }
 {
   instr_resume_tracing();
 }

diff --git a/src/smpi/smpi_dvfs.cpp b/src/smpi/smpi_dvfs.cpp
index 2bfb0c8..efd24c3 100644 (file)
--- a/src/smpi/smpi_dvfs.cpp
+++ b/src/smpi/smpi_dvfs.cpp
@@ -82,13 +82,19 @@ typedef char *address;
 typedef short int shortint;
 typedef float real;
 typedef double doublereal;
 typedef short int shortint;
 typedef float real;
 typedef double doublereal;

-typedef struct { real r, i; } complex;
-typedef struct { doublereal r, i; } doublecomplex;
+typedef struct {
+  real r;
+  real i;
+} complex;
+typedef struct {
+  doublereal r;
+  doublereal i;
+} doublecomplex;

 
 extern "C" XBT_PUBLIC(doublereal) smpi_get_host_power_peak_at_(integer *pstate_index);
 doublereal smpi_get_host_power_peak_at_(integer *pstate_index)
 {
 
 extern "C" XBT_PUBLIC(doublereal) smpi_get_host_power_peak_at_(integer *pstate_index);
 doublereal smpi_get_host_power_peak_at_(integer *pstate_index)
 {

-  return (doublereal)smpi_get_host_power_peak_at((int)*pstate_index);
+  return static_cast<doublereal>(smpi_get_host_power_peak_at((int)*pstate_index));

 }
 
 extern "C" XBT_PUBLIC(doublereal) smpi_get_host_current_power_peak_();
 }
 
 extern "C" XBT_PUBLIC(doublereal) smpi_get_host_current_power_peak_();


@@ -100,19 +106,19 @@ doublereal smpi_get_host_current_power_peak_()
 extern "C" XBT_PUBLIC(integer) smpi_get_host_nb_pstates_();
 integer smpi_get_host_nb_pstates_()
 {
 extern "C" XBT_PUBLIC(integer) smpi_get_host_nb_pstates_();
 integer smpi_get_host_nb_pstates_()
 {

-  return (integer)smpi_get_host_nb_pstates();
+  return static_cast<integer>(smpi_get_host_nb_pstates());

 }
 
 extern "C" XBT_PUBLIC(void) smpi_set_host_pstate_(integer *pstate_index);
 void smpi_set_host_pstate_(integer *pstate_index)
 {
 }
 
 extern "C" XBT_PUBLIC(void) smpi_set_host_pstate_(integer *pstate_index);
 void smpi_set_host_pstate_(integer *pstate_index)
 {

-  smpi_set_host_pstate((int)*pstate_index);
+  smpi_set_host_pstate(static_cast<int>(*pstate_index));

 }
 
 extern "C" XBT_PUBLIC(doublereal) smpi_get_host_consumed_energy_();
 doublereal smpi_get_host_consumed_energy_()
 {
 }
 
 extern "C" XBT_PUBLIC(doublereal) smpi_get_host_consumed_energy_();
 doublereal smpi_get_host_consumed_energy_()
 {

-  return (doublereal)smpi_get_host_consumed_energy();
+  return static_cast<doublereal>(smpi_get_host_consumed_energy());

 }
 
 #endif
 }
 
 #endif