Fix more format strings and parameters.

icc is really paranoid...

diff --git a/src/instr/instr_paje_trace.c b/src/instr/instr_paje_trace.c
index f4790d3..02cedbf 100644 (file)
--- a/src/instr/instr_paje_trace.c
+++ b/src/instr/instr_paje_trace.c
@@ -340,7 +340,8 @@ static void insert_into_buffer (paje_event_t tbi)
     tbi->free (tbi);
     return;
   }
     tbi->free (tbi);
     return;
   }

-  XBT_DEBUG("%s: insert event_type=%d, timestamp=%f, buffersize=%ld)", __FUNCTION__, tbi->event_type, tbi->timestamp, xbt_dynar_length(buffer));
+  XBT_DEBUG("%s: insert event_type=%d, timestamp=%f, buffersize=%lu)",
+           __FUNCTION__, (int)tbi->event_type, tbi->timestamp, xbt_dynar_length(buffer));

 
   unsigned int i;
   for (i = xbt_dynar_length(buffer); i > 0; i--) {
 
   unsigned int i;
   for (i = xbt_dynar_length(buffer); i > 0; i--) {


@@ -352,15 +353,15 @@ static void insert_into_buffer (paje_event_t tbi)
   if (i == 0)
     XBT_DEBUG("%s: inserted at beginning", __FUNCTION__);
   else
   if (i == 0)
     XBT_DEBUG("%s: inserted at beginning", __FUNCTION__);
   else

-    XBT_DEBUG("%s: inserted at%s %d", __FUNCTION__,
+    XBT_DEBUG("%s: inserted at%s %u", __FUNCTION__,

               (i == xbt_dynar_length(buffer) - 1 ? " end, pos =" : ""), i);
 }
 
 static void print_pajeDefineContainerType(paje_event_t event)
 {
               (i == xbt_dynar_length(buffer) - 1 ? " end, pos =" : ""), i);
 }
 
 static void print_pajeDefineContainerType(paje_event_t event)
 {

-  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type);

   fprintf(tracing_file, "%d %s %s %s\n",
   fprintf(tracing_file, "%d %s %s %s\n",

-      event->event_type,
+      (int)event->event_type,

       ((defineContainerType_t)event->data)->type->id,
       ((defineContainerType_t)event->data)->type->father->id,
       ((defineContainerType_t)event->data)->type->name);
       ((defineContainerType_t)event->data)->type->id,
       ((defineContainerType_t)event->data)->type->father->id,
       ((defineContainerType_t)event->data)->type->name);


@@ -368,9 +369,9 @@ static void print_pajeDefineContainerType(paje_event_t event)
 
 static void print_pajeDefineVariableType(paje_event_t event)
 {
 
 static void print_pajeDefineVariableType(paje_event_t event)
 {

-  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type);

   fprintf(tracing_file, "%d %s %s %s \"%s\"\n",
   fprintf(tracing_file, "%d %s %s %s \"%s\"\n",

-      event->event_type,
+      (int)event->event_type,

       ((defineVariableType_t)event->data)->type->id,
       ((defineVariableType_t)event->data)->type->father->id,
       ((defineVariableType_t)event->data)->type->name,
       ((defineVariableType_t)event->data)->type->id,
       ((defineVariableType_t)event->data)->type->father->id,
       ((defineVariableType_t)event->data)->type->name,


@@ -379,9 +380,9 @@ static void print_pajeDefineVariableType(paje_event_t event)
 
 static void print_pajeDefineStateType(paje_event_t event)
 {
 
 static void print_pajeDefineStateType(paje_event_t event)
 {

-  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type);

   fprintf(tracing_file, "%d %s %s %s\n",
   fprintf(tracing_file, "%d %s %s %s\n",

-      event->event_type,
+      (int)event->event_type,

       ((defineStateType_t)event->data)->type->id,
       ((defineStateType_t)event->data)->type->father->id,
       ((defineStateType_t)event->data)->type->name);
       ((defineStateType_t)event->data)->type->id,
       ((defineStateType_t)event->data)->type->father->id,
       ((defineStateType_t)event->data)->type->name);


@@ -389,9 +390,9 @@ static void print_pajeDefineStateType(paje_event_t event)
 
 static void print_pajeDefineEventType(paje_event_t event)
 {
 
 static void print_pajeDefineEventType(paje_event_t event)
 {

-  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type);

   fprintf(tracing_file, "%d %s %s %s \"%s\"\n",
   fprintf(tracing_file, "%d %s %s %s \"%s\"\n",

-      event->event_type,
+      (int)event->event_type,

       ((defineEventType_t)event->data)->type->id,
       ((defineEventType_t)event->data)->type->father->id,
       ((defineEventType_t)event->data)->type->name,
       ((defineEventType_t)event->data)->type->id,
       ((defineEventType_t)event->data)->type->father->id,
       ((defineEventType_t)event->data)->type->name,


@@ -400,9 +401,9 @@ static void print_pajeDefineEventType(paje_event_t event)
 
 static void print_pajeDefineLinkType(paje_event_t event)
 {
 
 static void print_pajeDefineLinkType(paje_event_t event)
 {

-  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type);

   fprintf(tracing_file, "%d %s %s %s %s %s\n",
   fprintf(tracing_file, "%d %s %s %s %s %s\n",

-      event->event_type,
+      (int)event->event_type,

       ((defineLinkType_t)event->data)->type->id,
       ((defineLinkType_t)event->data)->type->father->id,
       ((defineLinkType_t)event->data)->source->id,
       ((defineLinkType_t)event->data)->type->id,
       ((defineLinkType_t)event->data)->type->father->id,
       ((defineLinkType_t)event->data)->source->id,


@@ -412,9 +413,9 @@ static void print_pajeDefineLinkType(paje_event_t event)
 
 static void print_pajeDefineEntityValue (paje_event_t event)
 {
 
 static void print_pajeDefineEntityValue (paje_event_t event)
 {

-  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type);

   fprintf(tracing_file, "%d %s %s %s \"%s\"\n",
   fprintf(tracing_file, "%d %s %s %s \"%s\"\n",

-      event->event_type,
+      (int)event->event_type,

       ((defineEntityValue_t)event->data)->value->id,
       ((defineEntityValue_t)event->data)->value->father->id,
       ((defineEntityValue_t)event->data)->value->name,
       ((defineEntityValue_t)event->data)->value->id,
       ((defineEntityValue_t)event->data)->value->father->id,
       ((defineEntityValue_t)event->data)->value->name,


@@ -423,17 +424,17 @@ static void print_pajeDefineEntityValue (paje_event_t event)
 
 static void print_pajeCreateContainer(paje_event_t event)
 {
 
 static void print_pajeCreateContainer(paje_event_t event)
 {

-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);

   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %s \"%s\"\n",
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %s \"%s\"\n",

-        event->event_type,
+        (int)event->event_type,

         ((createContainer_t)event->data)->container->id,
         ((createContainer_t)event->data)->container->type->id,
         ((createContainer_t)event->data)->container->father->id,
         ((createContainer_t)event->data)->container->name);
   }else{
     fprintf(tracing_file, "%d %lf %s %s %s \"%s\"\n",
         ((createContainer_t)event->data)->container->id,
         ((createContainer_t)event->data)->container->type->id,
         ((createContainer_t)event->data)->container->father->id,
         ((createContainer_t)event->data)->container->name);
   }else{
     fprintf(tracing_file, "%d %lf %s %s %s \"%s\"\n",

-        event->event_type,
+        (int)event->event_type,

         event->timestamp,
         ((createContainer_t)event->data)->container->id,
         ((createContainer_t)event->data)->container->type->id,
         event->timestamp,
         ((createContainer_t)event->data)->container->id,
         ((createContainer_t)event->data)->container->type->id,


@@ -444,15 +445,15 @@ static void print_pajeCreateContainer(paje_event_t event)
 
 static void print_pajeDestroyContainer(paje_event_t event)
 {
 
 static void print_pajeDestroyContainer(paje_event_t event)
 {

-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);

   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s\n",
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s\n",

-        event->event_type,
+        (int)event->event_type,

         ((destroyContainer_t)event->data)->container->type->id,
         ((destroyContainer_t)event->data)->container->id);
   }else{
     fprintf(tracing_file, "%d %lf %s %s\n",
         ((destroyContainer_t)event->data)->container->type->id,
         ((destroyContainer_t)event->data)->container->id);
   }else{
     fprintf(tracing_file, "%d %lf %s %s\n",

-        event->event_type,
+        (int)event->event_type,

         event->timestamp,
         ((destroyContainer_t)event->data)->container->type->id,
         ((destroyContainer_t)event->data)->container->id);
         event->timestamp,
         ((destroyContainer_t)event->data)->container->type->id,
         ((destroyContainer_t)event->data)->container->id);


@@ -461,16 +462,16 @@ static void print_pajeDestroyContainer(paje_event_t event)
 
 static void print_pajeSetVariable(paje_event_t event)
 {
 
 static void print_pajeSetVariable(paje_event_t event)
 {

-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);

   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %f\n",
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %f\n",

-        event->event_type,
+        (int)event->event_type,

         ((setVariable_t)event->data)->type->id,
         ((setVariable_t)event->data)->container->id,
         ((setVariable_t)event->data)->value);
   }else{
     fprintf(tracing_file, "%d %lf %s %s %f\n",
         ((setVariable_t)event->data)->type->id,
         ((setVariable_t)event->data)->container->id,
         ((setVariable_t)event->data)->value);
   }else{
     fprintf(tracing_file, "%d %lf %s %s %f\n",

-        event->event_type,
+        (int)event->event_type,

         event->timestamp,
         ((setVariable_t)event->data)->type->id,
         ((setVariable_t)event->data)->container->id,
         event->timestamp,
         ((setVariable_t)event->data)->type->id,
         ((setVariable_t)event->data)->container->id,


@@ -480,16 +481,16 @@ static void print_pajeSetVariable(paje_event_t event)
 
 static void print_pajeAddVariable(paje_event_t event)
 {
 
 static void print_pajeAddVariable(paje_event_t event)
 {

-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);

   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %f\n",
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %f\n",

-        event->event_type,
+        (int)event->event_type,

         ((addVariable_t)event->data)->type->id,
         ((addVariable_t)event->data)->container->id,
         ((addVariable_t)event->data)->value);
   }else{
     fprintf(tracing_file, "%d %lf %s %s %f\n",
         ((addVariable_t)event->data)->type->id,
         ((addVariable_t)event->data)->container->id,
         ((addVariable_t)event->data)->value);
   }else{
     fprintf(tracing_file, "%d %lf %s %s %f\n",

-        event->event_type,
+        (int)event->event_type,

         event->timestamp,
         ((addVariable_t)event->data)->type->id,
         ((addVariable_t)event->data)->container->id,
         event->timestamp,
         ((addVariable_t)event->data)->type->id,
         ((addVariable_t)event->data)->container->id,


@@ -499,16 +500,16 @@ static void print_pajeAddVariable(paje_event_t event)
 
 static void print_pajeSubVariable(paje_event_t event)
 {
 
 static void print_pajeSubVariable(paje_event_t event)
 {

-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);

   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %f\n",
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %f\n",

-        event->event_type,
+        (int)event->event_type,

         ((subVariable_t)event->data)->type->id,
         ((subVariable_t)event->data)->container->id,
         ((subVariable_t)event->data)->value);
   }else{
     fprintf(tracing_file, "%d %lf %s %s %f\n",
         ((subVariable_t)event->data)->type->id,
         ((subVariable_t)event->data)->container->id,
         ((subVariable_t)event->data)->value);
   }else{
     fprintf(tracing_file, "%d %lf %s %s %f\n",

-        event->event_type,
+        (int)event->event_type,

         event->timestamp,
         ((subVariable_t)event->data)->type->id,
         ((subVariable_t)event->data)->container->id,
         event->timestamp,
         ((subVariable_t)event->data)->type->id,
         ((subVariable_t)event->data)->container->id,


@@ -518,16 +519,16 @@ static void print_pajeSubVariable(paje_event_t event)
 
 static void print_pajeSetState(paje_event_t event)
 {
 
 static void print_pajeSetState(paje_event_t event)
 {

-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);

   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %s\n",
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %s\n",

-        event->event_type,
+        (int)event->event_type,

         ((setState_t)event->data)->type->id,
         ((setState_t)event->data)->container->id,
         ((setState_t)event->data)->value->id);
   }else{
     fprintf(tracing_file, "%d %lf %s %s %s\n",
         ((setState_t)event->data)->type->id,
         ((setState_t)event->data)->container->id,
         ((setState_t)event->data)->value->id);
   }else{
     fprintf(tracing_file, "%d %lf %s %s %s\n",

-        event->event_type,
+        (int)event->event_type,

         event->timestamp,
         ((setState_t)event->data)->type->id,
         ((setState_t)event->data)->container->id,
         event->timestamp,
         ((setState_t)event->data)->type->id,
         ((setState_t)event->data)->container->id,


@@ -537,16 +538,16 @@ static void print_pajeSetState(paje_event_t event)
 
 static void print_pajePushState(paje_event_t event)
 {
 
 static void print_pajePushState(paje_event_t event)
 {

-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);

   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %s\n",
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %s\n",

-        event->event_type,
+        (int)event->event_type,

         ((pushState_t)event->data)->type->id,
         ((pushState_t)event->data)->container->id,
         ((pushState_t)event->data)->value->id);
   }else{
     fprintf(tracing_file, "%d %lf %s %s %s\n",
         ((pushState_t)event->data)->type->id,
         ((pushState_t)event->data)->container->id,
         ((pushState_t)event->data)->value->id);
   }else{
     fprintf(tracing_file, "%d %lf %s %s %s\n",

-        event->event_type,
+        (int)event->event_type,

         event->timestamp,
         ((pushState_t)event->data)->type->id,
         ((pushState_t)event->data)->container->id,
         event->timestamp,
         ((pushState_t)event->data)->type->id,
         ((pushState_t)event->data)->container->id,


@@ -556,15 +557,15 @@ static void print_pajePushState(paje_event_t event)
 
 static void print_pajePopState(paje_event_t event)
 {
 
 static void print_pajePopState(paje_event_t event)
 {

-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);

   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s\n",
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s\n",

-        event->event_type,
+        (int)event->event_type,

         ((popState_t)event->data)->type->id,
         ((popState_t)event->data)->container->id);
   }else{
     fprintf(tracing_file, "%d %lf %s %s\n",
         ((popState_t)event->data)->type->id,
         ((popState_t)event->data)->container->id);
   }else{
     fprintf(tracing_file, "%d %lf %s %s\n",

-        event->event_type,
+        (int)event->event_type,

         event->timestamp,
         ((popState_t)event->data)->type->id,
         ((popState_t)event->data)->container->id);
         event->timestamp,
         ((popState_t)event->data)->type->id,
         ((popState_t)event->data)->container->id);


@@ -573,10 +574,10 @@ static void print_pajePopState(paje_event_t event)
 
 static void print_pajeStartLink(paje_event_t event)
 {
 
 static void print_pajeStartLink(paje_event_t event)
 {

-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);

   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %s %s %s\n",
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %s %s %s\n",

-        event->event_type,
+        (int)event->event_type,

         ((startLink_t)event->data)->type->id,
         ((startLink_t)event->data)->container->id,
         ((startLink_t)event->data)->value,
         ((startLink_t)event->data)->type->id,
         ((startLink_t)event->data)->container->id,
         ((startLink_t)event->data)->value,


@@ -584,7 +585,7 @@ static void print_pajeStartLink(paje_event_t event)
         ((startLink_t)event->data)->key);
   }else {
     fprintf(tracing_file, "%d %lf %s %s %s %s %s\n",
         ((startLink_t)event->data)->key);
   }else {
     fprintf(tracing_file, "%d %lf %s %s %s %s %s\n",

-        event->event_type,
+        (int)event->event_type,

         event->timestamp,
         ((startLink_t)event->data)->type->id,
         ((startLink_t)event->data)->container->id,
         event->timestamp,
         ((startLink_t)event->data)->type->id,
         ((startLink_t)event->data)->container->id,


@@ -596,10 +597,10 @@ static void print_pajeStartLink(paje_event_t event)
 
 static void print_pajeEndLink(paje_event_t event)
 {
 
 static void print_pajeEndLink(paje_event_t event)
 {

-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);

   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %s %s %s\n",
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %s %s %s\n",

-        event->event_type,
+        (int)event->event_type,

         ((endLink_t)event->data)->type->id,
         ((endLink_t)event->data)->container->id,
         ((endLink_t)event->data)->value,
         ((endLink_t)event->data)->type->id,
         ((endLink_t)event->data)->container->id,
         ((endLink_t)event->data)->value,


@@ -607,7 +608,7 @@ static void print_pajeEndLink(paje_event_t event)
         ((endLink_t)event->data)->key);
   }else {
     fprintf(tracing_file, "%d %lf %s %s %s %s %s\n",
         ((endLink_t)event->data)->key);
   }else {
     fprintf(tracing_file, "%d %lf %s %s %s %s %s\n",

-        event->event_type,
+        (int)event->event_type,

         event->timestamp,
         ((endLink_t)event->data)->type->id,
         ((endLink_t)event->data)->container->id,
         event->timestamp,
         ((endLink_t)event->data)->type->id,
         ((endLink_t)event->data)->container->id,


@@ -619,16 +620,16 @@ static void print_pajeEndLink(paje_event_t event)
 
 static void print_pajeNewEvent (paje_event_t event)
 {
 
 static void print_pajeNewEvent (paje_event_t event)
 {

-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);

   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %s\n",
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %s\n",

-        event->event_type,
+        (int)event->event_type,

         ((newEvent_t)event->data)->type->id,
         ((newEvent_t)event->data)->container->id,
         ((newEvent_t)event->data)->value->id);
   }else{
     fprintf(tracing_file, "%d %lf %s %s %s\n",
         ((newEvent_t)event->data)->type->id,
         ((newEvent_t)event->data)->container->id,
         ((newEvent_t)event->data)->value->id);
   }else{
     fprintf(tracing_file, "%d %lf %s %s %s\n",

-        event->event_type,
+        (int)event->event_type,

         event->timestamp,
         ((newEvent_t)event->data)->type->id,
         ((newEvent_t)event->data)->container->id,
         event->timestamp,
         ((newEvent_t)event->data)->type->id,
         ((newEvent_t)event->data)->container->id,


@@ -638,7 +639,7 @@ static void print_pajeNewEvent (paje_event_t event)
 
 static void free_paje_event (paje_event_t event)
 {
 
 static void free_paje_event (paje_event_t event)
 {

-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);

   switch (event->event_type){
   case PAJE_StartLink:
     xbt_free (((startLink_t)(event->data))->value);
   switch (event->event_type){
   case PAJE_StartLink:
     xbt_free (((startLink_t)(event->data))->value);


@@ -665,7 +666,7 @@ void new_pajeDefineContainerType(type_t type)
   event->data = xbt_new0(s_defineContainerType_t, 1);
   ((defineContainerType_t)(event->data))->type = type;
 
   event->data = xbt_new0(s_defineContainerType_t, 1);
   ((defineContainerType_t)(event->data))->type = type;
 

-  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type);

 
   //print it
   event->print (event);
 
   //print it
   event->print (event);


@@ -682,7 +683,7 @@ void new_pajeDefineVariableType(type_t type)
   event->data = xbt_new0(s_defineVariableType_t, 1);
   ((defineVariableType_t)(event->data))->type = type;
 
   event->data = xbt_new0(s_defineVariableType_t, 1);
   ((defineVariableType_t)(event->data))->type = type;
 

-  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type);

 
   //print it
   event->print (event);
 
   //print it
   event->print (event);


@@ -699,7 +700,7 @@ void new_pajeDefineStateType(type_t type)
   event->data = xbt_new0(s_defineStateType_t, 1);
   ((defineStateType_t)(event->data))->type = type;
 
   event->data = xbt_new0(s_defineStateType_t, 1);
   ((defineStateType_t)(event->data))->type = type;
 

-  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type);

 
   //print it
   event->print (event);
 
   //print it
   event->print (event);


@@ -716,7 +717,7 @@ void new_pajeDefineEventType(type_t type)
   event->data = xbt_new0(s_defineEventType_t, 1);
   ((defineEventType_t)(event->data))->type = type;
 
   event->data = xbt_new0(s_defineEventType_t, 1);
   ((defineEventType_t)(event->data))->type = type;
 

-  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type);

 
   //print it
   event->print (event);
 
   //print it
   event->print (event);


@@ -735,7 +736,7 @@ void new_pajeDefineLinkType(type_t type, type_t source, type_t dest)
   ((defineLinkType_t)(event->data))->source = source;
   ((defineLinkType_t)(event->data))->dest = dest;
 
   ((defineLinkType_t)(event->data))->source = source;
   ((defineLinkType_t)(event->data))->dest = dest;
 

-  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type);

 
   //print it
   event->print (event);
 
   //print it
   event->print (event);


@@ -752,7 +753,7 @@ void new_pajeDefineEntityValue (val_t value)
   event->data = xbt_new0(s_defineEntityValue_t, 1);
   ((defineEntityValue_t)(event->data))->value = value;
 
   event->data = xbt_new0(s_defineEntityValue_t, 1);
   ((defineEntityValue_t)(event->data))->value = value;
 

-  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type);

 
   //print it
   event->print (event);
 
   //print it
   event->print (event);


@@ -769,7 +770,7 @@ void new_pajeCreateContainer (container_t container)
   event->data = xbt_new0(s_createContainer_t, 1);
   ((createContainer_t)(event->data))->container = container;
 
   event->data = xbt_new0(s_createContainer_t, 1);
   ((createContainer_t)(event->data))->container = container;
 

-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);

 
   //print it
   event->print (event);
 
   //print it
   event->print (event);


@@ -786,7 +787,7 @@ void new_pajeDestroyContainer (container_t container)
   event->data = xbt_new0(s_destroyContainer_t, 1);
   ((destroyContainer_t)(event->data))->container = container;
 
   event->data = xbt_new0(s_destroyContainer_t, 1);
   ((destroyContainer_t)(event->data))->container = container;
 

-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);

 
   //print it
   event->print (event);
 
   //print it
   event->print (event);


@@ -805,7 +806,7 @@ void new_pajeSetVariable (double timestamp, container_t container, type_t type,
   ((setVariable_t)(event->data))->container = container;
   ((setVariable_t)(event->data))->value = value;
 
   ((setVariable_t)(event->data))->container = container;
   ((setVariable_t)(event->data))->value = value;
 

-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);

 
   insert_into_buffer (event);
 }
 
   insert_into_buffer (event);
 }


@@ -823,7 +824,7 @@ void new_pajeAddVariable (double timestamp, container_t container, type_t type,
   ((addVariable_t)(event->data))->container = container;
   ((addVariable_t)(event->data))->value = value;
 
   ((addVariable_t)(event->data))->container = container;
   ((addVariable_t)(event->data))->value = value;
 

-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);

 
   insert_into_buffer (event);
 }
 
   insert_into_buffer (event);
 }


@@ -840,7 +841,7 @@ void new_pajeSubVariable (double timestamp, container_t container, type_t type,
   ((subVariable_t)(event->data))->container = container;
   ((subVariable_t)(event->data))->value = value;
 
   ((subVariable_t)(event->data))->container = container;
   ((subVariable_t)(event->data))->value = value;
 

-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);

 
   insert_into_buffer (event);
 }
 
   insert_into_buffer (event);
 }


@@ -857,7 +858,7 @@ void new_pajeSetState (double timestamp, container_t container, type_t type, val
   ((setState_t)(event->data))->container = container;
   ((setState_t)(event->data))->value = value;
 
   ((setState_t)(event->data))->container = container;
   ((setState_t)(event->data))->value = value;
 

-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);

 
   insert_into_buffer (event);
 }
 
   insert_into_buffer (event);
 }


@@ -875,7 +876,7 @@ void new_pajePushState (double timestamp, container_t container, type_t type, va
   ((pushState_t)(event->data))->container = container;
   ((pushState_t)(event->data))->value = value;
 
   ((pushState_t)(event->data))->container = container;
   ((pushState_t)(event->data))->value = value;
 

-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);

 
   insert_into_buffer (event);
 }
 
   insert_into_buffer (event);
 }


@@ -892,7 +893,7 @@ void new_pajePopState (double timestamp, container_t container, type_t type)
   ((popState_t)(event->data))->type = type;
   ((popState_t)(event->data))->container = container;
 
   ((popState_t)(event->data))->type = type;
   ((popState_t)(event->data))->container = container;
 

-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);

 
   insert_into_buffer (event);
 }
 
   insert_into_buffer (event);
 }


@@ -911,7 +912,7 @@ void new_pajeStartLink (double timestamp, container_t container, type_t type, co
   ((startLink_t)(event->data))->value = xbt_strdup(value);
   ((startLink_t)(event->data))->key = xbt_strdup(key);
 
   ((startLink_t)(event->data))->value = xbt_strdup(value);
   ((startLink_t)(event->data))->key = xbt_strdup(key);
 

-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);

 
   insert_into_buffer (event);
 }
 
   insert_into_buffer (event);
 }


@@ -930,7 +931,7 @@ void new_pajeEndLink (double timestamp, container_t container, type_t type, cont
   ((endLink_t)(event->data))->value = xbt_strdup(value);
   ((endLink_t)(event->data))->key = xbt_strdup(key);
 
   ((endLink_t)(event->data))->value = xbt_strdup(value);
   ((endLink_t)(event->data))->key = xbt_strdup(key);
 

-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);

 
   insert_into_buffer (event);
 }
 
   insert_into_buffer (event);
 }


@@ -947,7 +948,7 @@ void new_pajeNewEvent (double timestamp, container_t container, type_t type, val
   ((newEvent_t)(event->data))->container = container;
   ((newEvent_t)(event->data))->value = value;
 
   ((newEvent_t)(event->data))->container = container;
   ((newEvent_t)(event->data))->value = value;
 

-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);

 
   insert_into_buffer (event);
 }
 
   insert_into_buffer (event);
 }

diff --git a/src/instr/instr_smpi.c b/src/instr/instr_smpi.c
index ea8d33b..92914be 100644 (file)
--- a/src/instr/instr_smpi.c
+++ b/src/instr/instr_smpi.c
@@ -86,7 +86,7 @@ static char *TRACE_smpi_put_key(int src, int dst, char *key, int n)
   }
   //generate the key
   static unsigned long long counter = 0;
   }
   //generate the key
   static unsigned long long counter = 0;

-  snprintf(key, n, "%d%d%lld", src, dst, counter++);
+  snprintf(key, n, "%d%d%llu", src, dst, counter++);

 
   //push it
   char *a = (char*)xbt_strdup(key);
 
   //push it
   char *a = (char*)xbt_strdup(key);

diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index d24b438..6ea9268 100644 (file)
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -585,7 +585,7 @@ void MC_diff(void){
 
   int i;
 
 
   int i;
 

-  XBT_INFO("Number of regions : %d", sn->num_reg);
+  XBT_INFO("Number of regions : %u", sn->num_reg);

 
   for(i=0; i<sn->num_reg; i++){
     
 
   for(i=0; i<sn->num_reg; i++){
     

diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c
index 4b4a00c..70555b5 100644 (file)
--- a/src/mc/mc_liveness.c
+++ b/src/mc/mc_liveness.c
@@ -37,7 +37,7 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
 
   
   if(s1->num_reg != s2->num_reg){
 
   
   if(s1->num_reg != s2->num_reg){

-    XBT_DEBUG("Different num_reg (s1 = %d, s2 = %d)", s1->num_reg, s2->num_reg);
+    XBT_DEBUG("Different num_reg (s1 = %u, s2 = %u)", s1->num_reg, s2->num_reg);

     return 1;
   }
 
     return 1;
   }
 


@@ -152,7 +152,7 @@ int reached(xbt_state_t st){
     //xbt_dict_t current_rdv_points = SIMIX_get_rdv_points();
      
     xbt_dynar_foreach(reached_pairs, cursor, pair_test){
     //xbt_dict_t current_rdv_points = SIMIX_get_rdv_points();
      
     xbt_dynar_foreach(reached_pairs, cursor, pair_test){

-      XBT_DEBUG("Pair reached #%d", cursor+1);
+      XBT_DEBUG("Pair reached #%u", cursor+1);

       if(automaton_state_compare(pair_test->automaton_state, st) == 0){
        if(propositional_symbols_compare_value(pair_test->prop_ato, prop_ato) == 0){
          //XBT_DEBUG("Rdv points size %d - %d", xbt_dict_length(pair_test->rdv_points), xbt_dict_length(current_rdv_points));
       if(automaton_state_compare(pair_test->automaton_state, st) == 0){
        if(propositional_symbols_compare_value(pair_test->prop_ato, prop_ato) == 0){
          //XBT_DEBUG("Rdv points size %d - %d", xbt_dict_length(pair_test->rdv_points), xbt_dict_length(current_rdv_points));


@@ -244,7 +244,7 @@ int rdv_points_compare(xbt_dict_t d1, xbt_dict_t d2){ /* d1 = pair_test, d2 = cu
               req2 = (smx_simcall_t) xbt_fifo_get_item_content(item_req2);
               
               if(req1->call != req2->call){
               req2 = (smx_simcall_t) xbt_fifo_get_item_content(item_req2);
               
               if(req1->call != req2->call){

-                XBT_DEBUG("Different simcall call in simcalls of action (%d - %d)", req1->call, req2->call);
+                XBT_DEBUG("Different simcall call in simcalls of action (%d - %d)", (int)req1->call, (int)req2->call);

                 return 1;
               }
               if(req1->issuer->pid != req2->issuer->pid){
                 return 1;
               }
               if(req1->issuer->pid != req2->issuer->pid){


@@ -1008,7 +1008,7 @@ void MC_ddfs(int search_cycle){
              if(reached(pair_succ->automaton_state)){
                //if(reached_hash(pair_succ->automaton_state)){
              
              if(reached(pair_succ->automaton_state)){
                //if(reached_hash(pair_succ->automaton_state)){
              

-               XBT_DEBUG("Next pair (depth = %d, %d interleave) already reached !", xbt_fifo_size(mc_stack_liveness) + 1, MC_state_interleave_size(pair_succ->graph_state));
+               XBT_DEBUG("Next pair (depth = %d, %u interleave) already reached !", xbt_fifo_size(mc_stack_liveness) + 1, MC_state_interleave_size(pair_succ->graph_state));

 
                XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
                XBT_INFO("|             ACCEPTANCE CYCLE            |");
 
                XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
                XBT_INFO("|             ACCEPTANCE CYCLE            |");


@@ -1098,7 +1098,7 @@ void MC_ddfs(int search_cycle){
        }
 
        if(MC_state_interleave_size(current_pair->graph_state) > 0){
        }
 
        if(MC_state_interleave_size(current_pair->graph_state) > 0){

-         XBT_DEBUG("Backtracking to depth %u", xbt_fifo_size(mc_stack_liveness));
+         XBT_DEBUG("Backtracking to depth %d", xbt_fifo_size(mc_stack_liveness));

          MC_replay_liveness(mc_stack_liveness, 0);
        }
       }
          MC_replay_liveness(mc_stack_liveness, 0);
        }
       }


@@ -1251,9 +1251,9 @@ void MC_ddfs(int search_cycle){
   }
 
   if(xbt_fifo_size(mc_stack_liveness) == MAX_DEPTH_LIVENESS ){
   }
 
   if(xbt_fifo_size(mc_stack_liveness) == MAX_DEPTH_LIVENESS ){

-    XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u, depth = %d) shifted in stack, maximum depth reached", current_pair->graph_state, current_pair->automaton_state, search_cycle, xbt_fifo_size(mc_stack_liveness) );
+    XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %d, depth = %d) shifted in stack, maximum depth reached", current_pair->graph_state, current_pair->automaton_state, search_cycle, xbt_fifo_size(mc_stack_liveness) );

   }else{
   }else{

-    XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u, depth = %d) shifted in stack", current_pair->graph_state, current_pair->automaton_state, search_cycle, xbt_fifo_size(mc_stack_liveness) );
+    XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %d, depth = %d) shifted in stack", current_pair->graph_state, current_pair->automaton_state, search_cycle, xbt_fifo_size(mc_stack_liveness) );

   }
 
   
   }
 
   

diff --git a/src/xbt/ex.c b/src/xbt/ex.c
index bdb3aa2..4eb0569 100644 (file)
--- a/src/xbt/ex.c
+++ b/src/xbt/ex.c
@@ -297,7 +297,7 @@ XBT_TEST_UNIT("value", test_value, "exception value passing")
   CATCH(ex) {
     xbt_test_add("exception value passing");
     if (ex.category != unknown_error)
   CATCH(ex) {
     xbt_test_add("exception value passing");
     if (ex.category != unknown_error)

-      xbt_test_fail("category=%d (!= 1)", ex.category);
+      xbt_test_fail("category=%d (!= 1)", (int)ex.category);

     if (ex.value != 2)
       xbt_test_fail("value=%d (!= 2)", ex.value);
     if (strcmp(ex.msg, "toto"))
     if (ex.value != 2)
       xbt_test_fail("value=%d (!= 2)", ex.value);
     if (strcmp(ex.msg, "toto"))