X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b52350bf53c07bb9b589c7f03324033d16dcd604..3f485ca36d11ca7dda9a469b81265705f0e7749b:/src/portable.h

diff --git a/src/portable.h b/src/portable.h
index 15fc63dcab..486687118a 100644
--- a/src/portable.h
+++ b/src/portable.h
@@ -1,113 +1,80 @@
-/* $Id$ */
+/* portable -- header loading to write portable code within SimGrid         */
 
-/* portable -- header loading to write portable code                         */
-/* loads much more stuff than sysdep.h since the latter is in public interface*/
-
-/* Copyright (c) 2004 Martin Quinson. All rights reserved.                   */
+/* Copyright (c) 2004, 2016. 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. */
-
-#ifndef GRAS_PORTABLE_H
-#define GRAS_PORTABLE_H
-
-#include "gras_config.h"
-
-#include <errno.h>
-#include <sys/time.h> /* struct timeval */
-#include <sys/types.h>
-
-/****
- **** Networking 
- ****/
-
-
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#  include <netinet/in.h>   /* sometimes required for #include <arpa/inet.h> */
-#  include <netinet/tcp.h>  /* TCP_NODELAY */
-#  include <netdb.h>        /* getprotobyname() */
-#  include <arpa/inet.h>    /* inet_ntoa() */
-# endif
-
-#ifdef HAVE_WINSOCK2_H
-#  include <winsock2.h>
-#  include <ws2tcpip.h>  /* socklen_t, but doubtful */
-#  ifndef HAVE_WINSOCK_H
-#    define HAVE_WINSOCK_H
-#  endif
-#elif HAVE_WINSOCK_H
-#  include <winsock.h>
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
+#ifndef SIMGRID_PORTABLE_H
+#define SIMGRID_PORTABLE_H
+
+#include "simgrid_config.h"       /* what was compiled in? */
+#include "src/internal_config.h"  /* some information about the environment */
+
+#include "xbt/base.h"
+#include "xbt/misc.h"
+#ifdef _WIN32
+# include <windows.h>
 #endif
 
-#ifdef HAVE_WINSOCK_H
-#       define tcp_read( s, buf, len )  recv( s, buf, len, 0 )
-#       define tcp_write( s, buf, len ) send( s, buf, len, 0 )
-#       define ioctl( s, c, a )         ioctlsocket( (s), (c), (a) )
-#       define ioctl_t                          u_long
-#       define AC_SOCKET_INVALID        ((unsigned int) ~0)
-
-#       ifdef SD_BOTH
-#               define tcp_close( s )   (shutdown( s, SD_BOTH ), closesocket( s ))
-#       else
-#               define tcp_close( s )           closesocket( s )
-#       endif
-
-#       define EWOULDBLOCK WSAEWOULDBLOCK
-#       define EINPROGRESS WSAEINPROGRESS
-#       define ETIMEDOUT   WSAETIMEDOUT
-
-#       undef  sock_errno
-#       undef  sock_errstr
-#       define sock_errno      WSAGetLastError()
-#       define sock_errstr     gras_wsa_err2string(WSAGetLastError())
-
-const char *gras_wsa_err2string(int errcode);
-
-#       define S_IRGRP 0
-#       define S_IWGRP 0
-
-#else
-#       define tcp_read( s, buf, len)   read( s, buf, len )
-#       define tcp_write( s, buf, len)  write( s, buf, len )
-#       define sock_errno      errno
-#       define sock_errstr     strerror(errno)
-
-#       ifdef SHUT_RDWR
-#               define tcp_close( s )   (shutdown( s, SHUT_RDWR ), close( s ))
-#       else
-#               define tcp_close( s )   close( s )
-#       endif
-#endif /* windows or unix ? */
-
-/****
- **** File handling
- ****/
+#include <stdarg.h>
+#include <stdio.h>
+
+#ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_SYSCTL_H
+# include <sys/sysctl.h>
+#endif
+
+/* File handling */
 
 #include <fcntl.h>
 
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
+#ifdef _WIN32
+  #ifndef EWOULDBLOCK
+  #define EWOULDBLOCK WSAEWOULDBLOCK
+  #endif
+
+  #ifndef EINPROGRESS
+  #define EINPROGRESS WSAEINPROGRESS
+  #endif
+
+  #ifndef ETIMEDOUT
+  #define ETIMEDOUT   WSAETIMEDOUT
+  #endif
+
+  #ifdef S_IRGRP
+    #undef S_IRGRP
+  #endif
+  #define S_IRGRP 0
+
+  #ifdef S_IWGRP
+    #undef S_IWGRP
+  #endif
+  #define S_IWGRP 0
 #endif
 
-/****
- **** Time handling
- ****/
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
+#ifndef O_BINARY
+#  define O_BINARY 0
 #endif
 
-#ifdef _WIN32
-#define sleep _sleep /* else defined in stdlib.h */
+/* Time handling */
+#include <sys/time.h>
+#include <time.h>
+
+/* Signals */
+#ifdef HAVE_SIGNAL_H
+# include <signal.h>
 #endif
 
+/* What we need to extract the backtrace in exception handling code */
+#ifdef HAVE_EXECINFO_H
+#  include <execinfo.h>
+#endif
 
-#endif /* GRAS_PORTABLE_H */
+#endif                          /* SIMGRID_PORTABLE_H */