A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cosmetics
[simgrid.git]
/
src
/
portable.h
diff --git
a/src/portable.h
b/src/portable.h
index
8db6630
..
3676725
100644
(file)
--- a/
src/portable.h
+++ b/
src/portable.h
@@
-34,6
+34,7
@@
# include <netinet/tcp.h> /* TCP_NODELAY */
# include <netdb.h> /* getprotobyname() */
# include <arpa/inet.h> /* inet_ntoa() */
# include <netinet/tcp.h> /* TCP_NODELAY */
# include <netdb.h> /* getprotobyname() */
# include <arpa/inet.h> /* inet_ntoa() */
+# include <sys/types.h> /* sometimes required for fd_set */
# endif
#ifdef HAVE_WINSOCK2_H
# endif
#ifdef HAVE_WINSOCK2_H
@@
-65,8
+66,8
@@
# undef sock_errno
# undef sock_errstr
# undef sock_errno
# undef sock_errstr
-# define sock_errno WSAGetLastError()
-# define sock_errstr
gras_wsa_err2string(WSAGetLastError()
)
+# define sock_errno
WSAGetLastError()
+# define sock_errstr
(err) gras_wsa_err2string(err
)
const char *gras_wsa_err2string(int errcode);
const char *gras_wsa_err2string(int errcode);
@@
-76,8
+77,8
@@
const char *gras_wsa_err2string(int errcode);
#else
# define tcp_read( s, buf, len) read( s, buf, len )
# define tcp_write( s, buf, len) write( s, buf, len )
#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
)
+# define sock_errno
errno
+# define sock_errstr
(err) strerror(err
)
# ifdef SHUT_RDWR
# define tcp_close( s ) (shutdown( s, SHUT_RDWR ), close( s ))
# ifdef SHUT_RDWR
# define tcp_close( s ) (shutdown( s, SHUT_RDWR ), close( s ))
@@
-133,6
+134,13
@@
const char *gras_wsa_err2string(int errcode);
# include "xbt/context_win32.h" /* Manual reimplementation for prehistoric platforms */
#endif
# include "xbt/context_win32.h" /* Manual reimplementation for prehistoric platforms */
#endif
+/****
+ **** Signals
+ ****/
+#ifdef HAVE_SIGNAL_H
+# include <signal.h>
+#endif
+
/****
**** string handling (parts from http://www.ijs.si/software/snprintf/)
****/
/****
**** string handling (parts from http://www.ijs.si/software/snprintf/)
****/
@@
-177,4
+185,10
@@
extern int vasnprintf(char **ptr, size_t str_m, const char *fmt, va_list ap);
# include <execinfo.h>
#endif
# include <execinfo.h>
#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 /* GRAS_PORTABLE_H */