remove a couple of MSC_VER stuff

  and some blank lines too

diff --git a/include/xbt/str.h b/include/xbt/str.h
index 05da4c6..634291f 100644 (file)
--- a/include/xbt/str.h
+++ b/include/xbt/str.h
@@ -16,10 +16,6 @@
 #include <stdarg.h>             /* va_* */
 #include <stdio.h>  /* FILE */
 
 #include <stdarg.h>             /* va_* */
 #include <stdio.h>  /* FILE */
 

-#ifdef _MSC_VER
-#define strcasecmp _stricmp
-#endif
-

 SG_BEGIN_DECL()
 
 /** @addtogroup XBT_str
 SG_BEGIN_DECL()
 
 /** @addtogroup XBT_str


@@ -44,11 +40,9 @@ XBT_PUBLIC(xbt_dynar_t) xbt_str_split_str(const char *s, const char *sep);
 XBT_PUBLIC(char *) xbt_str_join(xbt_dynar_t dynar, const char *sep);
 XBT_PUBLIC(char *) xbt_str_join_array(const char *const *strs, const char *sep);
 
 XBT_PUBLIC(char *) xbt_str_join(xbt_dynar_t dynar, const char *sep);
 XBT_PUBLIC(char *) xbt_str_join_array(const char *const *strs, const char *sep);
 

-/* */

 XBT_PUBLIC(void) xbt_str_subst(char *str, char from, char to, int amount);
 XBT_PUBLIC(char *) xbt_str_varsubst(const char *str, xbt_dict_t patterns);
 
 XBT_PUBLIC(void) xbt_str_subst(char *str, char from, char to, int amount);
 XBT_PUBLIC(char *) xbt_str_varsubst(const char *str, xbt_dict_t patterns);
 

-/* */

 XBT_PUBLIC(char *) xbt_str_from_file(FILE * file);
 
 XBT_PUBLIC(long int) xbt_str_parse_int(const char* str, const char* error_msg);
 XBT_PUBLIC(char *) xbt_str_from_file(FILE * file);
 
 XBT_PUBLIC(long int) xbt_str_parse_int(const char* str, const char* error_msg);


@@ -62,7 +56,6 @@ XBT_PUBLIC(double) xbt_str_parse_double(const char* str, const char* error_msg);
  */
 static inline unsigned int xbt_str_hash_ext(const char *str, int str_len)
 {
  */
 static inline unsigned int xbt_str_hash_ext(const char *str, int str_len)
 {

-

 #ifdef DJB2_HASH_FUNCTION
   /* fast implementation of djb2 algorithm */
   int c;
 #ifdef DJB2_HASH_FUNCTION
   /* fast implementation of djb2 algorithm */
   int c;


@@ -118,9 +111,7 @@ static inline unsigned int xbt_str_hash(const char *str)
 
   while (*str) {
     /* multiply by the 32 bit FNV magic prime mod 2^32 */
 
   while (*str) {
     /* multiply by the 32 bit FNV magic prime mod 2^32 */

-    hash +=
-        (hash << 1) + (hash << 4) + (hash << 7) + (hash << 8) +
-        (hash << 24);
+    hash += (hash << 1) + (hash << 4) + (hash << 7) + (hash << 8) + (hash << 24);

 
     /* xor the bottom with the current byte */
     hash ^= (unsigned int) *str++;
 
     /* xor the bottom with the current byte */
     hash ^= (unsigned int) *str++;


@@ -138,6 +129,5 @@ static inline unsigned int xbt_str_hash(const char *str)
 }
 
 /**@}*/
 }
 
 /**@}*/

-

 SG_END_DECL()
 #endif                          /* XBT_STR_H */
 SG_END_DECL()
 #endif                          /* XBT_STR_H */

diff --git a/src/xbt/automaton/automaton.c b/src/xbt/automaton/automaton.c
index 35a829f..f1c1345 100644 (file)
--- a/src/xbt/automaton/automaton.c
+++ b/src/xbt/automaton/automaton.c
@@ -93,7 +93,6 @@ xbt_automaton_exp_label_t xbt_automaton_exp_label_new(int type, ...){
   return label;
 }
 
   return label;
 }
 

-

 xbt_dynar_t xbt_automaton_get_states(xbt_automaton_t a){
   return a->states;
 }
 xbt_dynar_t xbt_automaton_get_states(xbt_automaton_t a){
   return a->states;
 }


@@ -155,14 +154,13 @@ void xbt_automaton_display(xbt_automaton_t a){
   printf("\n\nCurrent state: %s\n", a->current_state->id);
 
   printf("\nStates' List: %lu\n\n", xbt_dynar_length(a->states));
   printf("\n\nCurrent state: %s\n", a->current_state->id);
 
   printf("\nStates' List: %lu\n\n", xbt_dynar_length(a->states));

- 
-  
+

   xbt_dynar_foreach(a->states, cursor, state)
     printf("ID: %s, type: %d\n", state->id, state->type);
 
   xbt_automaton_transition_t transition;
   printf("\nTransitions: %lu\n\n", xbt_dynar_length(a->transitions));
   xbt_dynar_foreach(a->states, cursor, state)
     printf("ID: %s, type: %d\n", state->id, state->type);
 
   xbt_automaton_transition_t transition;
   printf("\nTransitions: %lu\n\n", xbt_dynar_length(a->transitions));

-  
+

   xbt_dynar_foreach(a->transitions, cursor, transition){
     printf("label:");
     xbt_automaton_exp_label_display(transition->label);
   xbt_dynar_foreach(a->transitions, cursor, transition){
     printf("label:");
     xbt_automaton_exp_label_display(transition->label);


@@ -171,7 +169,6 @@ void xbt_automaton_display(xbt_automaton_t a){
 }
 
 void xbt_automaton_exp_label_display(xbt_automaton_exp_label_t label){
 }
 
 void xbt_automaton_exp_label_display(xbt_automaton_exp_label_t label){

-

   switch(label->type){
   case 0 :
     printf("(");
   switch(label->type){
   case 0 :
     printf("(");


@@ -199,7 +196,6 @@ void xbt_automaton_exp_label_display(xbt_automaton_exp_label_t label){
     printf("(1)");
     break;
   }
     printf("(1)");
     break;
   }

-

 }
 
 xbt_automaton_state_t xbt_automaton_get_current_state(xbt_automaton_t a){
 }
 
 xbt_automaton_state_t xbt_automaton_get_current_state(xbt_automaton_t a){


@@ -307,7 +303,6 @@ int xbt_automaton_exp_label_compare(xbt_automaton_exp_label_t l1, xbt_automaton_
     return 1;
 
   switch(l1->type){
     return 1;
 
   switch(l1->type){

-

   case 0 : // OR 
   case 1 : // AND
     if(xbt_automaton_exp_label_compare(l1->u.or_and.left_exp, l2->u.or_and.left_exp))
   case 0 : // OR 
   case 1 : // AND
     if(xbt_automaton_exp_label_compare(l1->u.or_and.left_exp, l2->u.or_and.left_exp))


@@ -315,30 +310,22 @@ int xbt_automaton_exp_label_compare(xbt_automaton_exp_label_t l1, xbt_automaton_
     else
       return xbt_automaton_exp_label_compare(l1->u.or_and.right_exp, l2->u.or_and.right_exp);
     break;
     else
       return xbt_automaton_exp_label_compare(l1->u.or_and.right_exp, l2->u.or_and.right_exp);
     break;

-

   case 2 : // NOT
     return xbt_automaton_exp_label_compare(l1->u.exp_not, l2->u.exp_not);
     break;
   case 2 : // NOT
     return xbt_automaton_exp_label_compare(l1->u.exp_not, l2->u.exp_not);
     break;

-

   case 3 : // predicat
     return (strcmp(l1->u.predicat, l2->u.predicat));
     break;
   case 3 : // predicat
     return (strcmp(l1->u.predicat, l2->u.predicat));
     break;

-

   case 4 : // 1
     return 0;
     break;
   case 4 : // 1
     return 0;
     break;

-

   default :
     return -1;
     break;
   default :
     return -1;
     break;

-

   }
   }

-

 }
 
 }
 

-

 int xbt_automaton_propositional_symbols_compare_value(xbt_dynar_t s1, xbt_dynar_t s2){
 int xbt_automaton_propositional_symbols_compare_value(xbt_dynar_t s1, xbt_dynar_t s2){

-

   int *iptr1, *iptr2;
   unsigned int cursor;
   unsigned int nb_elem = xbt_dynar_length(s1);
   int *iptr1, *iptr2;
   unsigned int cursor;
   unsigned int nb_elem = xbt_dynar_length(s1);


@@ -353,8 +340,6 @@ int xbt_automaton_propositional_symbols_compare_value(xbt_dynar_t s1, xbt_dynar_
   return 0;
 }
 
   return 0;
 }
 

-/************ Free functions ****************/
-

 static void xbt_automaton_transition_free(xbt_automaton_transition_t t);
 static void xbt_automaton_exp_label_free(xbt_automaton_exp_label_t e);
 static void xbt_automaton_propositional_symbol_free(xbt_automaton_propositional_symbol_t ps);
 static void xbt_automaton_transition_free(xbt_automaton_transition_t t);
 static void xbt_automaton_exp_label_free(xbt_automaton_exp_label_t e);
 static void xbt_automaton_propositional_symbol_free(xbt_automaton_propositional_symbol_t ps);

diff --git a/src/xbt/parmap.cpp b/src/xbt/parmap.cpp
index f574884..0a32bda 100644 (file)
--- a/src/xbt/parmap.cpp
+++ b/src/xbt/parmap.cpp
@@ -145,7 +145,7 @@ xbt_parmap_t xbt_parmap_new(unsigned int num_workers, e_xbt_parmap_mode_t mode)
       core_bind++;
     else
       core_bind = 0; 
       core_bind++;
     else
       core_bind = 0; 

-#endif    
+#endif

   }
   return parmap;
 }
   }
   return parmap;
 }


@@ -178,8 +178,7 @@ xbt_parmap_t xbt_parmap_mc_new(unsigned int num_workers, e_xbt_parmap_mode_t mod
     data = xbt_new0(s_xbt_parmap_thread_data_t, 1);
     data->parmap = parmap;
     data->worker_id = i;
     data = xbt_new0(s_xbt_parmap_thread_data_t, 1);
     data->parmap = parmap;
     data->worker_id = i;

-    parmap->workers[i] = xbt_os_thread_create(NULL, xbt_parmap_mc_worker_main,
-                                              data, NULL);
+    parmap->workers[i] = xbt_os_thread_create(NULL, xbt_parmap_mc_worker_main, data, NULL);

   }
   return parmap;
 }
   }
   return parmap;
 }


@@ -228,7 +227,6 @@ static void xbt_parmap_set_mode(xbt_parmap_t parmap, e_xbt_parmap_mode_t mode)
   parmap->mode = mode;
 
   switch (mode) {
   parmap->mode = mode;
 
   switch (mode) {

-

     case XBT_PARMAP_POSIX:
       parmap->master_wait_f = xbt_parmap_posix_master_wait;
       parmap->worker_signal_f = xbt_parmap_posix_worker_signal;
     case XBT_PARMAP_POSIX:
       parmap->master_wait_f = xbt_parmap_posix_master_wait;
       parmap->worker_signal_f = xbt_parmap_posix_worker_signal;


@@ -240,8 +238,6 @@ static void xbt_parmap_set_mode(xbt_parmap_t parmap, e_xbt_parmap_mode_t mode)
       parmap->done_cond = xbt_os_cond_init();
       parmap->done_mutex = xbt_os_mutex_init();
       break;
       parmap->done_cond = xbt_os_cond_init();
       parmap->done_mutex = xbt_os_mutex_init();
       break;

-
-

     case XBT_PARMAP_FUTEX:
 #if HAVE_FUTEX_H
       parmap->master_wait_f = xbt_parmap_futex_master_wait;
     case XBT_PARMAP_FUTEX:
 #if HAVE_FUTEX_H
       parmap->master_wait_f = xbt_parmap_futex_master_wait;


@@ -257,9 +253,7 @@ static void xbt_parmap_set_mode(xbt_parmap_t parmap, e_xbt_parmap_mode_t mode)
 #else
       xbt_die("Futex is not available on this OS.");
 #endif
 #else
       xbt_die("Futex is not available on this OS.");
 #endif

-

     case XBT_PARMAP_BUSY_WAIT:
     case XBT_PARMAP_BUSY_WAIT:

-#ifndef _MSC_VER

       parmap->master_wait_f = xbt_parmap_busy_master_wait;
       parmap->worker_signal_f = xbt_parmap_busy_worker_signal;
       parmap->master_signal_f = xbt_parmap_busy_master_signal;
       parmap->master_wait_f = xbt_parmap_busy_master_wait;
       parmap->worker_signal_f = xbt_parmap_busy_worker_signal;
       parmap->master_signal_f = xbt_parmap_busy_master_signal;


@@ -270,10 +264,6 @@ static void xbt_parmap_set_mode(xbt_parmap_t parmap, e_xbt_parmap_mode_t mode)
       xbt_os_cond_destroy(parmap->done_cond);
       xbt_os_mutex_destroy(parmap->done_mutex);
       break;
       xbt_os_cond_destroy(parmap->done_cond);
       xbt_os_mutex_destroy(parmap->done_mutex);
       break;

-#else
-      xbt_die("Busy waiting not implemented on Windows yet.");
-#endif
-

     case XBT_PARMAP_DEFAULT:
       THROW_IMPOSSIBLE;
       break;
     case XBT_PARMAP_DEFAULT:
       THROW_IMPOSSIBLE;
       break;


@@ -317,8 +307,7 @@ void* xbt_parmap_next(xbt_parmap_t parmap)
 static void xbt_parmap_work(xbt_parmap_t parmap)
 {
   unsigned index;
 static void xbt_parmap_work(xbt_parmap_t parmap)
 {
   unsigned index;

-  while ((index = parmap->index++)
-         < xbt_dynar_length(parmap->data))
+  while ((index = parmap->index++) < xbt_dynar_length(parmap->data))

     parmap->fun(xbt_dynar_get_as(parmap->data, index, void*));
 }
 
     parmap->fun(xbt_dynar_get_as(parmap->data, index, void*));
 }
 


@@ -340,14 +329,12 @@ static void *xbt_parmap_worker_main(void *arg)
   while (1) {
     parmap->worker_wait_f(parmap, ++round);
     if (parmap->status == XBT_PARMAP_WORK) {
   while (1) {
     parmap->worker_wait_f(parmap, ++round);
     if (parmap->status == XBT_PARMAP_WORK) {

-

       XBT_DEBUG("Worker %d got a job", data->worker_id);
 
       xbt_parmap_work(parmap);
       parmap->worker_signal_f(parmap);
 
       XBT_DEBUG("Worker %d has finished", data->worker_id);
       XBT_DEBUG("Worker %d got a job", data->worker_id);
 
       xbt_parmap_work(parmap);
       parmap->worker_signal_f(parmap);
 
       XBT_DEBUG("Worker %d has finished", data->worker_id);

-

     /* We are destroying the parmap */
     } else {
       SIMIX_context_free(context);
     /* We are destroying the parmap */
     } else {
       SIMIX_context_free(context);


@@ -358,7 +345,6 @@ static void *xbt_parmap_worker_main(void *arg)
 }
 
 #if HAVE_MC
 }
 
 #if HAVE_MC

-

 /**
  * \brief Applies a list of tasks in parallel.
  * \param parmap a parallel map object
 /**
  * \brief Applies a list of tasks in parallel.
  * \param parmap a parallel map object


@@ -384,11 +370,10 @@ int xbt_parmap_mc_apply(xbt_parmap_t parmap, int_f_pvoid_pvoid_t fun,
 
 static void xbt_parmap_mc_work(xbt_parmap_t parmap, int worker_id)
 {
 
 static void xbt_parmap_mc_work(xbt_parmap_t parmap, int worker_id)
 {

-  unsigned int data_size = (parmap->length / parmap->num_workers) +
-    ((parmap->length % parmap->num_workers) ? 1 :0);
+  unsigned int data_size = (parmap->length / parmap->num_workers) + ((parmap->length % parmap->num_workers) ? 1 :0);

   void* start = (char*)parmap->mc_data + (data_size*worker_id*sizeof(void*));
   void* end = MIN((char *)start + data_size* sizeof(void*), (char*)parmap->mc_data + parmap->length*sizeof(void*));
   void* start = (char*)parmap->mc_data + (data_size*worker_id*sizeof(void*));
   void* end = MIN((char *)start + data_size* sizeof(void*), (char*)parmap->mc_data + parmap->length*sizeof(void*));

-  
+

   //XBT_CRITICAL("Worker %d : %p -> %p (%d)", worker_id, start, end, data_size);
 
   while ( start < end && parmap->finish == -1) {
   //XBT_CRITICAL("Worker %d : %p -> %p (%d)", worker_id, start, end, data_size);
 
   while ( start < end && parmap->finish == -1) {


@@ -396,7 +381,6 @@ static void xbt_parmap_mc_work(xbt_parmap_t parmap, int worker_id)
     int res = parmap->snapshot_compare(*(void**)start, parmap->ref_snapshot);
     start = (char *)start + sizeof(start);
     if (!res){
     int res = parmap->snapshot_compare(*(void**)start, parmap->ref_snapshot);
     start = (char *)start + sizeof(start);
     if (!res){

-    

       parmap->finish = ((char*)start - (char*)parmap->mc_data) / sizeof(void*);
       //XBT_CRITICAL("Find good one %p (%p)", start, parmap->mc_data);
       break;
       parmap->finish = ((char*)start - (char*)parmap->mc_data) / sizeof(void*);
       //XBT_CRITICAL("Find good one %p (%p)", start, parmap->mc_data);
       break;


@@ -422,14 +406,12 @@ static void *xbt_parmap_mc_worker_main(void *arg)
   while (1) {
     parmap->worker_wait_f(parmap, ++round);
     if (parmap->status == XBT_PARMAP_WORK) {
   while (1) {
     parmap->worker_wait_f(parmap, ++round);
     if (parmap->status == XBT_PARMAP_WORK) {

-

       XBT_DEBUG("Worker %d got a job", data->worker_id);
 
       xbt_parmap_mc_work(parmap, data->worker_id);
       parmap->worker_signal_f(parmap);
 
       XBT_DEBUG("Worker %d has finished", data->worker_id);
       XBT_DEBUG("Worker %d got a job", data->worker_id);
 
       xbt_parmap_mc_work(parmap, data->worker_id);
       parmap->worker_signal_f(parmap);
 
       XBT_DEBUG("Worker %d has finished", data->worker_id);

-

     /* We are destroying the parmap */
     } else {
       xbt_free(data);
     /* We are destroying the parmap */
     } else {
       xbt_free(data);


@@ -594,7 +576,6 @@ static void xbt_parmap_futex_worker_wait(xbt_parmap_t parmap, unsigned round)
 }
 #endif
 
 }
 #endif
 

-#ifndef _MSC_VER

 /**
  * \brief Starts the parmap: waits for all workers to be ready and returns.
  *
 /**
  * \brief Starts the parmap: waits for all workers to be ready and returns.
  *


@@ -650,4 +631,3 @@ static void xbt_parmap_busy_worker_wait(xbt_parmap_t parmap, unsigned round)
     xbt_os_thread_yield();
   }
 }
     xbt_os_thread_yield();
   }
 }

-#endif /* ! _MSC_VER */

diff --git a/src/xbt/xbt_os_file.c b/src/xbt/xbt_os_file.c
index 4cc64d2..b1ca8b8 100644 (file)
--- a/src/xbt/xbt_os_file.c
+++ b/src/xbt/xbt_os_file.c
@@ -15,9 +15,7 @@
 #include <windows.h>
 #endif
 
 #include <windows.h>
 #endif
 

-#ifndef _MSC_VER

 #include "libgen.h" /* POSIX dirname */
 #include "libgen.h" /* POSIX dirname */

-#endif

 
 /** @brief Get a single line from the stream (reimplementation of the GNU getline)
  *
 
 /** @brief Get a single line from the stream (reimplementation of the GNU getline)
  *


@@ -71,34 +69,19 @@ ssize_t xbt_getline(char **buf, size_t *n, FILE *stream)
  * The argument is never modified, and the returned value must be freed after use.
  */
 char *xbt_dirname(const char *path) {
  * The argument is never modified, and the returned value must be freed after use.
  */
 char *xbt_dirname(const char *path) {

-#ifdef _MSC_VER
-    char drive[_MAX_DRIVE];
-    char dir[_MAX_DIR];
-    errno_t err;
-    err = _splitpath_s(path, drive, _MAX_DRIVE, dir, _MAX_DIR, NULL,0, NULL,0);
-    return bprintf("%s%s",drive,dir);
-#else
-    char *tmp = xbt_strdup(path);
-    char *res = xbt_strdup(dirname(tmp));
-    free(tmp);
-    return res;
-#endif
+  char *tmp = xbt_strdup(path);
+  char *res = xbt_strdup(dirname(tmp));
+  free(tmp);
+  return res;

 }
 }

+

 /** @brief Returns the file component of a path (reimplementation of POSIX basename)
  *
  * The argument is never modified, and the returned value must be freed after use.
  */
 char *xbt_basename(const char *path) {
 /** @brief Returns the file component of a path (reimplementation of POSIX basename)
  *
  * The argument is never modified, and the returned value must be freed after use.
  */
 char *xbt_basename(const char *path) {

-#ifdef _MSC_VER
-    char file[1024];
-    char ext[1024];
-    errno_t err;
-    err = _splitpath_s(path, NULL,0, NULL,0, file,1024, ext,1024);
-    return bprintf("%s.%s",file,ext);
-#else
-    char *tmp = xbt_strdup(path);
-    char *res = xbt_strdup(basename(tmp));
-    free(tmp);
-    return res;
-#endif
+  char *tmp = xbt_strdup(path);
+  char *res = xbt_strdup(basename(tmp));
+  free(tmp);
+  return res;

 }
 }

diff --git a/tools/cmake/test_prog/prog_stackgrowth.c b/tools/cmake/test_prog/prog_stackgrowth.c
index d75dde5..8545ed3 100644 (file)
--- a/tools/cmake/test_prog/prog_stackgrowth.c
+++ b/tools/cmake/test_prog/prog_stackgrowth.c
@@ -11,7 +11,7 @@ static int iterate = 10;
 static int growsdown(int *x)
 {
   int y = (x > &y);
 static int growsdown(int *x)
 {
   int y = (x > &y);

-   
+

   if (--iterate > 0)
     y = growsdown(&y);
 
   if (--iterate > 0)
     y = growsdown(&y);
 

diff --git a/tools/cmake/test_prog/prog_thread_storage.c b/tools/cmake/test_prog/prog_thread_storage.c
index edcab03..f83977e 100644 (file)
--- a/tools/cmake/test_prog/prog_thread_storage.c
+++ b/tools/cmake/test_prog/prog_thread_storage.c
@@ -8,13 +8,12 @@
 
 #ifdef _MSC_VER
 __declspec(thread)
 
 #ifdef _MSC_VER
 __declspec(thread)

-#else 
+#else

 __thread 
 #endif
 int thread_specific_variable = 0;
 
 int main(void) {
 __thread 
 #endif
 int thread_specific_variable = 0;
 
 int main(void) {

-

   thread_specific_variable++;
   printf("%d\n", thread_specific_variable);
   return 0;
   thread_specific_variable++;
   printf("%d\n", thread_specific_variable);
   return 0;