X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b7ca16289c913278988d37c1e2e57bdc93eb16e4..e9f0018b823e34405847177b25a85d3facc30ae1:/src/portable.h diff --git a/src/portable.h b/src/portable.h index 4cded556b6..7ccd0a7d64 100644 --- a/src/portable.h +++ b/src/portable.h @@ -1,27 +1,24 @@ -/* $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-2010, 2012-2015. 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. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ -#ifndef GRAS_PORTABLE_H -#define GRAS_PORTABLE_H +#ifndef SIMGRID_PORTABLE_H +#define SIMGRID_PORTABLE_H -/* - * win32 or win64 (__WIN32 is defined for win32 and win64 applications, __TOS_WIN__ is defined by xlC). -*/ -#ifdef _WIN32 -# include "win32/config.h" -# include -#else -# include "gras_config.h" +#include "src/internal_config.h" +#include "xbt/base.h" +#include "xbt/misc.h" +#ifdef _XBT_WIN32 +# include #endif #include +#include #ifdef HAVE_ERRNO_H # include @@ -31,39 +28,42 @@ # include #endif +#ifdef HAVE_SYS_PARAM_H +# include +#endif +#ifdef HAVE_SYS_SYSCTL_H +# include +#endif + /**** - **** Networking + **** File handling ****/ +#include -#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 _XBT_WIN32 + #ifndef EWOULDBLOCK + #define EWOULDBLOCK WSAEWOULDBLOCK + #endif + #ifndef EINPROGRESS + #define EINPROGRESS WSAEINPROGRESS + #endif -#ifndef HAVE_WINSOCK_H -# 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(err) strerror(err) + #ifndef ETIMEDOUT + #define ETIMEDOUT WSAETIMEDOUT + #endif -# 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 ? */ + #ifdef S_IRGRP + #undef S_IRGRP + #endif + #define S_IRGRP 0 -/**** - **** File handling - ****/ - -#include + #ifdef S_IWGRP + #undef S_IWGRP + #endif + #define S_IWGRP 0 +#endif #ifdef HAVE_SYS_STAT_H # include @@ -77,32 +77,10 @@ **** Time handling ****/ -#ifdef TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H +#if HAVE_SYS_TIME_H # include -# else -# include -# endif -#endif - -#ifdef _WIN32 -#define sleep _sleep /* else defined in stdlib.h */ -#endif - -/**** - **** Contexts - ****/ - -#ifdef USE_UCONTEXT -# include -#endif - -#ifdef _WIN32 -# include "xbt/context_win32.h" /* Manual reimplementation for prehistoric platforms */ #endif +#include /**** **** Signals @@ -116,38 +94,35 @@ ****/ /* 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); +XBT_PRIVATE int portable_snprintf(char *str, size_t str_m, const char *fmt, + /*args */ ...); +XBT_PRIVATE 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); - -/* - * That's needed to protect solaris's printf from ever seing NULL associated to a %s format - * (without adding an extra check on working platforms :) - */ - -#ifdef PRINTF_NULL_WORKING -# define PRINTF_STR(a) (a) -#else -# define PRINTF_STR(a) (a)?:"(null)" +#if (defined(__GNUC__) && !defined(__cplusplus)) +XBT_PUBLIC(int) asprintf(char **ptr, const char *fmt, /*args */ ...); +XBT_PUBLIC(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); + /* * What we need to extract the backtrace in exception handling code */ @@ -155,10 +130,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, int downside); - -#endif /* GRAS_PORTABLE_H */ +#endif /* SIMGRID_PORTABLE_H */