Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Allow to cross compile simgrid.dll using the autotools suite
authormquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Tue, 27 Apr 2010 13:19:51 +0000 (13:19 +0000)
committermquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Tue, 27 Apr 2010 13:19:51 +0000 (13:19 +0000)
- update the autotools to add vivaldi network model
- do not export static methods
- don't use gras_wsa_err2txt since I cannot get it defined in the DLL
  (and is useless for simgrid.dll)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7651 48e7efb5-ca39-0410-a469-dd3cf9ba447f

src/Makefile.am
src/gras/Msg/gras_msg_listener.c
src/surf/surf_private.h

index 120033f..f30c30a 100644 (file)
@@ -190,7 +190,7 @@ SURF_SRC= \
   surf/random_mgr.c                                                          \
   surf/surf.c                                                                \
   surf/surfxml_parse.c                                                       \
   surf/random_mgr.c                                                          \
   surf/surf.c                                                                \
   surf/surfxml_parse.c                                                       \
-  surf/cpu.c   surf/network.c surf/network_constant.c surf/workstation.c     \
+  surf/cpu.c   surf/network.c surf/network_constant.c surf/network_vivaldi.c surf/workstation.c     \
   surf/surf_model_timer.c                                                    \
   surf/workstation_ptask_L07.c                                               \
   surf/cpu_ti.c                                               \
   surf/surf_model_timer.c                                                    \
   surf/workstation_ptask_L07.c                                               \
   surf/cpu_ti.c                                               \
@@ -372,10 +372,10 @@ simgrid_ruby_la_SOURCES = bindings/ruby/simgrid_ruby.c
 simgrid_ruby_la_LDFLAGS = $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm -module
 endif
 
 simgrid_ruby_la_LDFLAGS = $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm -module
 endif
 
-# Windows users (at least, MSVC ones) need a def file.
+# Windows users (at least, MSVC ones) need a def file. (and JNI dont like @ cruft added to symbols)
 if IS_WINDOWS
 libgras_la_LDFLAGS    += -Wl,--output-def,libgras.def
 if IS_WINDOWS
 libgras_la_LDFLAGS    += -Wl,--output-def,libgras.def
-libsimgrid_la_LDFLAGS += -Wl,--output-def,libsimgrid.def
+libsimgrid_la_LDFLAGS += -Wl,--output-def,libsimgrid.def -Wl,--kill-at
 libsmpi_la_LDFLAGS    += -Wl,--output-def,libsmpi.def
 endif
 
 libsmpi_la_LDFLAGS    += -Wl,--output-def,libsmpi.def
 endif
 
index cb38072..4bc0bf2 100644 (file)
@@ -58,8 +58,12 @@ static void listener_function(void *p)
         int sock;
         xbt_queue_shift_timed(me->socks_to_close, &sock, 0);
         if (tcp_close(sock) < 0) {
         int sock;
         xbt_queue_shift_timed(me->socks_to_close, &sock, 0);
         if (tcp_close(sock) < 0) {
+#ifdef _WIN32
+          WARN2("error while closing tcp socket %d: %d (%s)\n", sock, sock_errno);
+#else
           WARN3("error while closing tcp socket %d: %d (%s)\n",
                 sock, sock_errno, sock_errstr(sock_errno));
           WARN3("error while closing tcp socket %d: %d (%s)\n",
                 sock, sock_errno, sock_errstr(sock_errno));
+#endif
         }
       }
     }
         }
       }
     }
index 276cb4c..e1c110e 100644 (file)
@@ -114,7 +114,7 @@ XBT_PUBLIC(void) routing_model_create(size_t size_of_link,void *loopback);
 /*
  * Resource protected methods
  */
 /*
  * Resource protected methods
  */
-XBT_PUBLIC(xbt_dict_t) surf_resource_properties(const void *resource);
+xbt_dict_t surf_resource_properties(const void *resource);
 
 XBT_PUBLIC(void) surfxml_bufferstack_push(int new);
 XBT_PUBLIC(void) surfxml_bufferstack_pop(int new);
 
 XBT_PUBLIC(void) surfxml_bufferstack_push(int new);
 XBT_PUBLIC(void) surfxml_bufferstack_pop(int new);