X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8509761d0d99449b084eb82d8e482e60b702a792..041f6cf28a3d83ee106f4ac7c80fa65809f50a31:/src/portable.h diff --git a/src/portable.h b/src/portable.h index 2afe77c683..ef7b71524d 100644 --- a/src/portable.h +++ b/src/portable.h @@ -1,19 +1,27 @@ -/* $Id$ */ - /* 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, 2005, 2006, 2007, 2008, 2009, 2010. 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" +#ifndef SIMGRID_PORTABLE_H +#define SIMGRID_PORTABLE_H + +#include "internal_config.h" +#include "xbt/misc.h" +/* + * win32 or win64 (__XBT_WIN32 is defined for win32 and win64 applications, __TOS_WIN__ is defined by xlC). +*/ +#ifdef _XBT_WIN32 +# include "win32/config.h" +# include +#endif #include +#include #ifdef HAVE_ERRNO_H # include @@ -23,69 +31,12 @@ # include #endif -/**** - **** Networking - ****/ - - -#ifdef HAVE_SYS_SOCKET_H -# include -# include /* sometimes required for #include */ -# include /* TCP_NODELAY */ -# include /* getprotobyname() */ -# include /* inet_ntoa() */ -# include /* sometimes required for fd_set */ -# endif - -#ifdef HAVE_WINSOCK2_H -# include -# include /* socklen_t, but doubtful */ -# ifndef HAVE_WINSOCK_H -# define HAVE_WINSOCK_H -# endif -#elif HAVE_WINSOCK_H -# include +#ifdef HAVE_SYS_PARAM_H +# include +#endif +#ifdef HAVE_SYS_SYSCTL_H +# include #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 @@ -116,22 +67,11 @@ const char *gras_wsa_err2string(int errcode); # endif #endif -#ifdef _WIN32 -#define sleep _sleep /* else defined in stdlib.h */ -#endif - /**** - **** Contexts + **** Signals ****/ - -#ifdef USE_UCONTEXT -# ifndef S_SPLINT_S /* This header drives splint into the wall */ -# include -# endif -#endif - -#ifdef _WIN32 -# include "xbt/context_win32.h" /* Manual reimplementation for prehistoric platforms */ +#ifdef HAVE_SIGNAL_H +# include #endif /**** @@ -139,26 +79,34 @@ const char *gras_wsa_err2string(int errcode); ****/ /* prototype of C99 functions */ -#ifdef HAVE_SNPRINTF +#if defined(HAVE_SNPRINTF) #include #else -extern int snprintf(char *, size_t, const char *, /*args*/ ...); -extern int vsnprintf(char *, size_t, const char *, va_list); +XBT_PUBLIC(int) snprintf(char *, size_t, const char *, /*args */ ...); +XBT_PUBLIC(int) vsnprintf(char *, size_t, const char *, va_list); #endif + /* use internal functions when OS provided ones are borken */ #if defined(HAVE_SNPRINTF) && defined(PREFER_PORTABLE_SNPRINTF) -extern int portable_snprintf(char *str, size_t str_m, const char *fmt, /*args*/ ...); -extern int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap); +extern int portable_snprintf(char *str, size_t str_m, const char *fmt, + /*args */ ...); +extern int portable_vsnprintf(char *str, size_t str_m, const char *fmt, + va_list ap); #define snprintf portable_snprintf #define vsnprintf portable_vsnprintf #endif /* prototype of GNU functions */ -extern int asprintf (char **ptr, const char *fmt, /*args*/ ...); -extern int vasprintf (char **ptr, const char *fmt, va_list ap); -extern int asnprintf (char **ptr, size_t str_m, const char *fmt, /*args*/ ...); -extern int vasnprintf(char **ptr, size_t str_m, const char *fmt, va_list ap); +#if (defined(__GNUC__) && !defined(__cplusplus)) +extern int asprintf(char **ptr, const char *fmt, /*args */ ...); +extern int vasprintf(char **ptr, const char *fmt, va_list ap); +#endif + +extern int asnprintf(char **ptr, size_t str_m, const char *fmt, /*args */ + ...); +extern int vasnprintf(char **ptr, size_t str_m, const char *fmt, + va_list ap); /* * That's needed to protect solaris's printf from ever seing NULL associated to a %s format @@ -178,10 +126,4 @@ extern int vasnprintf(char **ptr, size_t str_m, const char *fmt, va_list ap); # include #endif -/* - * Some debugging functions. Can't we find a better place for this?? - */ -void hexa_print(const char*name, unsigned char *data, int size); -const char *hexa_str(unsigned char *data, int size); - -#endif /* GRAS_PORTABLE_H */ +#endif /* SIMGRID_PORTABLE_H */