commit: r472 - libspreadutil/trunk/include
[email protected] Tue, 07 Feb 2012 23:35:18 -0500
| Newsgroups | gmane.network.spread.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: jonathan Date: 2012-02-07 23:35:18 -0500 (Tue, 07 Feb 2012) New Revision: 472 Removed: libspreadutil/trunk/include/alarm.h libspreadutil/trunk/include/arch.h libspreadutil/trunk/include/config.h libspreadutil/trunk/include/data_link.h libspreadutil/trunk/include/defines.h libspreadutil/trunk/include/memory.h libspreadutil/trunk/include/sp_events.h Log: Remove all headers from include as they need to be replace dwith correct versions from src Deleted: libspreadutil/trunk/include/alarm.h =================================================================== --- libspreadutil/trunk/include/alarm.h 2012-02-01 05:40:59 UTC (rev 471) +++ libspreadutil/trunk/include/alarm.h 2012-02-08 04:35:18 UTC (rev 472) @@ -1,121 +0,0 @@ -/* - * The Spread Toolkit. - * - * The contents of this file are subject to the Spread Open-Source - * License, Version 1.0 (the ``License''); you may not use - * this file except in compliance with the License. You may obtain a - * copy of the License at: - * - * http://www.spread.org/license/ - * - * or in the file ``license.txt'' found in this distribution. - * - * Software distributed under the License is distributed on an AS IS basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Creators of Spread are: - * Yair Amir, Michal Miskin-Amir, Jonathan Stanton, John Schultz. - * - * Copyright (C) 1993-2009 Spread Concepts LLC <[email protected]> - * - * All Rights Reserved. - * - * Major Contributor(s): - * --------------- - * Ryan Caudy [email protected] - contributions to process groups. - * Claudiu Danilov [email protected] - scalable wide area support. - * Cristina Nita-Rotaru [email protected] - group communication security. - * Theo Schlossnagle [email protected] - Perl, autoconf, old skiplist. - * Dan Schoenblum [email protected] - Java interface. - * - */ - - -#ifndef INC_ALARM -#define INC_ALARM - -#include <stdio.h> -#include "arch.h" - -#define DEBUG 0x00000001 -#define EXIT 0x00000002 -#define PRINT 0x00000004 -/* new type to replace general prints */ -#define SYSTEM 0x00000004 - -#define DATA_LINK 0x00000010 -#define NETWORK 0x00000020 -#define PROTOCOL 0x00000040 -#define SESSION 0x00000080 -#define CONF 0x00000100 -#define MEMB 0x00000200 -#define FLOW_CONTROL 0x00000400 -#define STATUS 0x00000800 -#define EVENTS 0x00001000 -#define GROUPS 0x00002000 - -#define HOP 0x00004000 -#define OBJ_HANDLER 0x00008000 -#define MEMORY 0x00010000 -#define ROUTE 0x00020000 -#define QOS 0x00040000 -#define RING 0x00080000 -#define TCP_HOP 0x00100000 - -#define SKIPLIST 0x00200000 -#define ACM 0x00400000 - -#define SECURITY 0x00800000 - -#define ALL 0xffffffff -#define NONE 0x00000000 - -/* Priority levels */ -#define SPLOG_DEBUG 1 /* Program information that is only useful for debugging. - Will normally be turned off in operation. */ -#define SPLOG_INFO 2 /* Program reports information that may be useful for - performance tuning, analysis, or operational checks. */ -#define SPLOG_WARNING 3 /* Program encountered a situation that is not erroneous, - but is uncommon and may indicate an error. */ -#define SPLOG_ERROR 4 /* Program encountered an error that can be recovered from. */ -#define SPLOG_CRITICAL 5 /* Program will not exit, but has only temporarily recovered - and without help may soon fail. */ -#define SPLOG_FATAL 6 /* Program will exit() or abort(). */ - -#define SPLOG_PRINT 7 /* Program should always print this information */ -#define SPLOG_PRINT_NODATE 8 /* Program should always print this information, but the datestamp should be omitted. */ - -#ifdef HAVE_GOOD_VARGS -void Alarmp( int16 priority, int32 type, char *message, ...); -void Alarm( int32 type, char *message, ...); - -#else -void Alarm(); -#endif - -void Alarm_set_output(char *filename); - -void Alarm_enable_timestamp(char *format); -void Alarm_disable_timestamp(void); - -void Alarm_enable_precise_timestamp(void); -void Alarm_disable_precise_timestamp(void); - -void Alarm_set_types(int32 mask); -void Alarm_clear_types(int32 mask); -int32 Alarm_get_types(void); - -void Alarm_set_priority(int16 priority); -int16 Alarm_get_priority(void); - -void Alarm_set_interactive(void); -int Alarm_get_interactive(void); - -#define IP1( address ) ( ( 0xFF000000 & (address) ) >> 24 ) -#define IP2( address ) ( ( 0x00FF0000 & (address) ) >> 16 ) -#define IP3( address ) ( ( 0x0000FF00 & (address) ) >> 8 ) -#define IP4( address ) ( ( 0x000000FF & (address) ) ) - -#endif /* INC_ALARM */ Deleted: libspreadutil/trunk/include/arch.h =================================================================== --- libspreadutil/trunk/include/arch.h 2012-02-01 05:40:59 UTC (rev 471) +++ libspreadutil/trunk/include/arch.h 2012-02-08 04:35:18 UTC (rev 472) @@ -1,253 +0,0 @@ -/* - * The Spread Toolkit. - * - * The contents of this file are subject to the Spread Open-Source - * License, Version 1.0 (the ``License''); you may not use - * this file except in compliance with the License. You may obtain a - * copy of the License at: - * - * http://www.spread.org/license/ - * - * or in the file ``license.txt'' found in this distribution. - * - * Software distributed under the License is distributed on an AS IS basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Creators of Spread are: - * Yair Amir, Michal Miskin-Amir, Jonathan Stanton, John Schultz. - * - * Copyright (C) 1993-2009 Spread Concepts LLC <[email protected]> - * - * All Rights Reserved. - * - * Major Contributor(s): - * --------------- - * Ryan Caudy [email protected] - contributions to process groups. - * Claudiu Danilov [email protected] - scalable wide area support. - * Cristina Nita-Rotaru [email protected] - group communication security. - * Theo Schlossnagle [email protected] - Perl, autoconf, old skiplist. - * Dan Schoenblum [email protected] - Java interface. - * - */ - -#ifndef INC_ARCH -#define INC_ARCH - -/* - * Each record in this file represents an architecture. - * Each record contains the following fields: - * - * #define INTSIZE{16,32,64} - * #define ARCH_SCATTER_{CONTROL,ACCRIGHTS,NONE} - * #define ARCH_ENDIAN{0x00000000,0x80000080} - * #define LOC_INLINE { __inline__ or blank } - * #define ARCH_SCATTER_SIZE { sys dependent variable } - * #define HAVE_GOOD_VARGS ( exists if true ) - * #define HAVE_LRAND48 ( exists if true ) - * #define HAVE_STDINT_H ( exists if true --currently glibc2.1 needs it ) - * typedef {sys dependent type} sockopt_len_t; - * #define ERR_TIMEDOUT EAGAIN - * #define sock_errno { errno or WSAGetLastError() for windows } - * #define sock_strerror { strerror or sock_strerror for windows } - * #define sock_set_errno { sock_unix_set_errno or WSASetLastError for windows } - */ - -#undef INTSIZE32 -#undef INTSIZE64 -#undef INTSIZE16 - - -#ifndef ARCH_PC_WIN95 -/* If we aren't using windows... we can use autoconf */ - -#include "config.h" - - -#ifdef WORDS_BIGENDIAN -#define ARCH_ENDIAN 0x00000000 -#else -#define ARCH_ENDIAN 0x80000080 -#endif - -#define LOC_INLINE __inline__ - -#ifndef __GNUC__ -#define __inline__ inline -#endif - -/* Need to add special cases, SUNOS gets 64, IRIX gets 512 */ -#ifdef MSG_MAXIOVLEN -#define ARCH_SCATTER_SIZE MSG_MAXIOVLEN -#else -#define ARCH_SCATTER_SIZE 1024 -#endif - -#define HAVE_GOOD_VARGS - -#ifndef ERR_TIMEDOUT -#define ERR_TIMEDOUT ETIMEDOUT -#endif - -#ifndef RAND_MAX -#define RAND_MAX 2147483647 -#endif - -#define sock_errno errno -#define sock_strerror strerror -#define sock_set_errno(a) (errno = (a)) - -#ifndef byte -#define byte u_int8_t -#endif - -#ifndef int16 -#define int16 int16_t -#endif - -#ifndef int16u -#define int16u u_int16_t -#endif - -#ifndef int32 -#define int32 int32_t -#endif - -#ifndef int32u -#define int32u u_int32_t -#endif - -#else -/* We are using windows... */ -#define INTSIZE32 -#define ARCH_SCATTER_NONE -#define ARCH_ENDIAN 0x80000080 -#define LOC_INLINE -typedef unsigned long sockopt_len_t; -typedef unsigned long socklen_t; -#define BADCLOCK -#define HAVE_GOOD_VARGS -/* Windows now has a strerror function and if we do not use it - * compile errors occur with shared DLL libraries. - */ -#define HAVE_STRERROR -/* This size is for packing several messages into one packet */ -#define ARCH_SCATTER_SIZE 64 -#define ERR_TIMEDOUT EAGAIN -#define sock_errno WSAGetLastError() -#define sock_set_errno WSASetLastError -#define MAXPATHLEN _MAX_PATH -#define snprintf _snprintf -#define alloca _alloca -/* Sockets are not file descriptors on windows so they need a special close function. */ -#define close closesocket -/* Windows defines a default size of 64. However, the size of fd_set array for select - * can be raised by defining a larger constant before including windows.h winsock.h - */ -#define FD_SETSIZE 1024 -/* System location of spread.conf file */ -#define SPREAD_ETCDIR "/etc" -/* Use winsock constants since we are dealing with sockets - * Note: If we ever need file IO with errno's we will have conflicts - * since the WSA version and the basic E versions may not have the same - * number. Right now we don't need the E versions for windows so we just - * use the WSA versions. - */ -#undef EINTR -#undef EAGAIN -#undef EWOULDBLOCK -#undef EINPROGRESS -#define EWOULDBLOCK WSAEWOULDBLOCK -#define EINTR WSAEINTR -#define EAGAIN WSAEWOULDBLOCK -#define EINPROGRESS WSAEINPROGRESS - -/* Windows does not define MAXHOSTNAMELEN, so we define it here to a reasonable host name limit */ -#define MAXHOSTNAMELEN 128 - -/* byte is already defined as a typedef to unsigned char on Windows XP (and probably earlier) so do not define - * #ifndef byte - * #define byte unsigned char - * #endif - */ - -#ifndef int16 -#define int16 short -char *soch_strerror(int err); /* forward declare this func from the arch.c file (win32 only) */ - -#endif - -#ifndef int16u -#define int16u unsigned short -#endif - -#ifndef int32 -#define int32 int -#endif - -#ifndef int32u -#define int32u unsigned int -#endif - -#ifndef UINT32_MAX -#define UINT32_MAX UINT_MAX -#endif -#ifndef INT32_MAX -#define INT32_MAX INT_MAX -#endif - -/* Declare functions from arch.c */ -char *sock_strerror(int err); - -#endif /* ARCH_PC_WIN95 */ - -/* Pick which rand version to use */ -#ifdef HAVE_LRAND48 -#define get_rand lrand48 -#else -#define get_rand rand -#endif - -/* Useful CPP macros to make strings from #defines */ -#define Q(x) # x -#define QQ(x) Q(x) - - -#define ENDIAN_TYPE 0x80000080 - -#define Get_endian( type ) ( (type) & ENDIAN_TYPE ) -#define Set_endian( type ) ( ( (type) & ~ENDIAN_TYPE )| ARCH_ENDIAN ) -#define Same_endian( type ) ( ( (type) & ENDIAN_TYPE ) == ARCH_ENDIAN ) -#define Clear_endian( type ) ( (type) & ~ENDIAN_TYPE ) - -#define Flip_int16( type ) ( ( ((type) >> 8) & 0x00ff) | ( ((type) << 8) & 0xff00) ) - -#define Flip_int32( type ) ( ( ((type) >>24) & 0x000000ff) | ( ((type) >> 8) & 0x0000ff00) | ( ((type) << 8) & 0x00ff0000) | ( ((type) <<24) & 0xff000000) ) - -#define channel int -#define mailbox int - -typedef struct dummy_membership_id { - int32 proc_id; - int32 time; -} membership_id; - -typedef struct dummy_group_id { - membership_id memb_id; - int32 index; -} group_id; - -/* - * General Useful Types - */ - -typedef short bool; -#ifndef TRUE -#define TRUE 1 -#endif -#ifndef FALSE -#define FALSE 0 -#endif - -#endif /* INC_ARCH */ Deleted: libspreadutil/trunk/include/config.h =================================================================== --- libspreadutil/trunk/include/config.h 2012-02-01 05:40:59 UTC (rev 471) +++ libspreadutil/trunk/include/config.h 2012-02-08 04:35:18 UTC (rev 472) @@ -1,316 +0,0 @@ -/* src/config.h. Generated from config.h.in by configure. */ -/* daemon/config.h.in. Generated from configure.in by autoheader. */ - -#ifndef _CONFIG_H -#define _CONFIG_H - - -/* Building on a Windows OS Platform */ -/* #undef ARCH_PC_WIN95 */ - -/* Platform supports sendmsg scatter/gather using accrights structure */ -/* #undef ARCH_SCATTER_ACCRIGHTS */ - -/* Platform supports sendmsg scatter/gather using control structure */ -#define ARCH_SCATTER_CONTROL 1 - -/* Platform does not support scatter/gather sendmsg */ -/* #undef ARCH_SCATTER_NONE */ - -/* Define if your snprintf is busted */ -/* #undef BROKEN_SNPRINTF */ - -/* Define to 1 if you have the <arpa/inet.h> header file. */ -#define HAVE_ARPA_INET_H 1 - -/* Define to 1 if you have the <assert.h> header file. */ -#define HAVE_ASSERT_H 1 - -/* Define to 1 if you have the `bcopy' function. */ -#define HAVE_BCOPY 1 - -/* clock_t type */ -#define HAVE_CLOCK_T 1 - -/* Define to 1 if you have the <errno.h> header file. */ -#define HAVE_ERRNO_H 1 - -/* Define to 1 if you have the `gettimeofday' function. */ -#define HAVE_GETTIMEOFDAY 1 - -/* Define to 1 if you have the <grp.h> header file. */ -#define HAVE_GRP_H 1 - -/* Define to 1 if you have the `inet_aton' function. */ -#define HAVE_INET_ATON 1 - -/* Define to 1 if you have the `inet_ntoa' function. */ -#define HAVE_INET_NTOA 1 - -/* Define to 1 if you have the `inet_ntop' function. */ -#define HAVE_INET_NTOP 1 - -/* int64_t type */ -#define HAVE_INT64_T 1 - -/* Define to 1 if you have the <inttypes.h> header file. */ -#define HAVE_INTTYPES_H 1 - -/* various intxx_t types */ -#define HAVE_INTXX_T 1 - -/* Define to 1 if you have the `m' library (-lm). */ -#define HAVE_LIBM 1 - -/* Define to 1 if you have the `nsl' library (-lnsl). */ -/* #undef HAVE_LIBNSL */ - -/* Define to 1 if you have the `posix4' library (-lposix4). */ -/* #undef HAVE_LIBPOSIX4 */ - -/* Define to 1 if you have the `pthread' library (-lpthread). */ -#define HAVE_LIBPTHREAD 1 - -/* Define to 1 if you have the `socket' library (-lsocket). */ -/* #undef HAVE_LIBSOCKET */ - -/* Define to 1 if you have the `thread' library (-lthread). */ -/* #undef HAVE_LIBTHREAD */ - -/* Define to 1 if you have the <limits.h> header file. */ -#define HAVE_LIMITS_H 1 - -/* Define to 1 if you have the `lrand48' function. */ -#define HAVE_LRAND48 1 - -/* Define to 1 if you have the `memmove' function. */ -#define HAVE_MEMMOVE 1 - -/* Define to 1 if you have the <memory.h> header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the <netdb.h> header file. */ -#define HAVE_NETDB_H 1 - -/* Define to 1 if you have the <netinet/in.h> header file. */ -#define HAVE_NETINET_IN_H 1 - -/* Define to 1 if you have the <netinet/tcp.h> header file. */ -#define HAVE_NETINET_TCP_H 1 - -/* pid_t type */ -#define HAVE_PID_T 1 - -/* Define to 1 if you have the <process.h> header file. */ -/* #undef HAVE_PROCESS_H */ - -/* Define to 1 if you have the `pthread_atfork' function. */ -#define HAVE_PTHREAD_ATFORK 1 - -/* Define to 1 if you have the <pthread.h> header file. */ -#define HAVE_PTHREAD_H 1 - -/* Define to 1 if you have the <pwd.h> header file. */ -#define HAVE_PWD_H 1 - -/* sa_family_t type */ -#define HAVE_SA_FAMILY_T 1 - -/* Define to 1 if you have the `setsid' function. */ -#define HAVE_SETSID 1 - -/* Define to 1 if you have the <signal.h> header file. */ -#define HAVE_SIGNAL_H 1 - -/* size_t type */ -#define HAVE_SIZE_T 1 - -/* Define to 1 if you have the `snprintf' function. */ -#define HAVE_SNPRINTF 1 - -/* socklen_t type */ -#define HAVE_SOCKLEN_T 1 - -/* struct sockopt_len_t */ -/* #undef HAVE_SOCKOPT_LEN_T */ - -/* signed size_t type */ -#define HAVE_SSIZE_T 1 - -/* struct sockaddr_storage has ss_family */ -#define HAVE_SS_FAMILY_IN_SS 1 - -/* Define to 1 if you have the <stdarg.h> header file. */ -#define HAVE_STDARG_H 1 - -/* Define to 1 if you have the <stdint.h> header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the <stdio.h> header file. */ -#define HAVE_STDIO_H 1 - -/* Define to 1 if you have the <stdlib.h> header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `strerror' function. */ -#define HAVE_STRERROR 1 - -/* Define to 1 if you have the `strftime' function. */ -#define HAVE_STRFTIME 1 - -/* Define to 1 if you have the <strings.h> header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the <string.h> header file. */ -#define HAVE_STRING_H 1 - -/* struct sockaddr type */ -#define HAVE_STRUCT_ADDRINFO 1 - -/* struct in6_addr type */ -#define HAVE_STRUCT_IN6_ADDR 1 - -/* struct sockaddr_in6 type */ -#define HAVE_STRUCT_SOCKADDR_IN6 1 - -/* struct sockaddr_storage type */ -#define HAVE_STRUCT_SOCKADDR_STORAGE 1 - -/* struct timeval */ -#define HAVE_STRUCT_TIMEVAL 1 - -/* struct timezone */ -#define HAVE_STRUCT_TIMEZONE 1 - -/* sockaddr_un type has sun_len field */ -/* #undef HAVE_SUN_LEN_IN_SOCKADDR_UN */ - -/* sys_errlist structure */ -#define HAVE_SYS_ERRLIST 1 - -/* Define to 1 if you have the <sys/filio.h> header file. */ -#define HAVE_SYS_FILIO_H 1 - -/* Define to 1 if you have the <sys/inttypes.h> header file. */ -/* #undef HAVE_SYS_INTTYPES_H */ - -/* Define to 1 if you have the <sys/ioctl.h> header file. */ -#define HAVE_SYS_IOCTL_H 1 - -/* sys_nerr function */ -#define HAVE_SYS_NERR 1 - -/* Define to 1 if you have the <sys/param.h> header file. */ -#define HAVE_SYS_PARAM_H 1 - -/* Define to 1 if you have the <sys/socket.h> header file. */ -#define HAVE_SYS_SOCKET_H 1 - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the <sys/timeb.h> header file. */ -#define HAVE_SYS_TIMEB_H 1 - -/* Define to 1 if you have the <sys/time.h> header file. */ -#define HAVE_SYS_TIME_H 1 - -/* Define to 1 if you have the <sys/types.h> header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the <sys/uio.h> header file. */ -#define HAVE_SYS_UIO_H 1 - -/* Define to 1 if you have the <sys/un.h> header file. */ -#define HAVE_SYS_UN_H 1 - -/* Define to 1 if you have the `time' function. */ -#define HAVE_TIME 1 - -/* Define to 1 if you have the <time.h> header file. */ -#define HAVE_TIME_H 1 - -/* various unsigned intxx_t types */ -/* #undef HAVE_UINTXX_T */ - -/* Define to 1 if you have the <unistd.h> header file. */ -#define HAVE_UNISTD_H 1 - -/* unsigned int type u_int */ -#define HAVE_U_INT 1 - -/* unsigned int64_t */ -#define HAVE_U_INT64_T 1 - -/* various unsigned intxx_t types */ -#define HAVE_U_INTXX_T 1 - -/* Define to 1 if you have the <windows.h> header file. */ -/* #undef HAVE_WINDOWS_H */ - -/* Define to 1 if you have the <winsock.h> header file. */ -/* #undef HAVE_WINSOCK_H */ - -/* Define if libc defines __progname */ -#define HAVE___PROGNAME 1 - -/* struct sockaddr_storage has __ss_family field */ -/* #undef HAVE___SS_FAMILY_IN_SS */ - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "Spread_Util" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Spread_Util 1.0.0" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "spread_util" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "1.0.0" - -/* The size of `char', as computed by sizeof. */ -#define SIZEOF_CHAR 1 - -/* The size of `int', as computed by sizeof. */ -#define SIZEOF_INT 4 - -/* The size of `long int', as computed by sizeof. */ -#define SIZEOF_LONG_INT 8 - -/* The size of `long long int', as computed by sizeof. */ -#define SIZEOF_LONG_LONG_INT 8 - -/* The size of `short int', as computed by sizeof. */ -#define SIZEOF_SHORT_INT 2 - -/* "Specify location of spread.conf and other configuration files" */ -/* #undef SPREAD_ETCDIR */ - -/* "Specify location of Unix Domain Socket for client-daemon communication on - local machine" */ -/* #undef SP_UNIX_SOCKET */ - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -/* #undef WORDS_BIGENDIAN */ - -/* Specify location of spread.pid */ -/* #undef _PATH_SPREAD_PIDDIR */ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -/* #undef inline */ -#endif - -#include "defines.h" - -#endif /* _CONFIG_H */ - Deleted: libspreadutil/trunk/include/data_link.h =================================================================== --- libspreadutil/trunk/include/data_link.h 2012-02-01 05:40:59 UTC (rev 471) +++ libspreadutil/trunk/include/data_link.h 2012-02-08 04:35:18 UTC (rev 472) @@ -1,55 +0,0 @@ -/* - * The Spread Toolkit. - * - * The contents of this file are subject to the Spread Open-Source - * License, Version 1.0 (the ``License''); you may not use - * this file except in compliance with the License. You may obtain a - * copy of the License at: - * - * http://www.spread.org/license/ - * - * or in the file ``license.txt'' found in this distribution. - * - * Software distributed under the License is distributed on an AS IS basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Creators of Spread are: - * Yair Amir, Michal Miskin-Amir, Jonathan Stanton, John Schultz. - * - * Copyright (C) 1993-2009 Spread Concepts LLC <[email protected]> - * - * All Rights Reserved. - * - * Major Contributor(s): - * --------------- - * Ryan Caudy [email protected] - contributions to process groups. - * Claudiu Danilov [email protected] - scalable wide area support. - * Cristina Nita-Rotaru [email protected] - group communication security. - * Theo Schlossnagle [email protected] - Perl, autoconf, old skiplist. - * Dan Schoenblum [email protected] - Java interface. - * - */ - - -#ifndef INC_DATA_LINK -#define INC_DATA_LINK - -#include "arch.h" -#include "scatter.h" - -#define MAX_PACKET_SIZE 1472 /*1472 = 1536-64 (of udp)*/ - -#define SEND_CHANNEL 0x00000001 -#define RECV_CHANNEL 0x00000002 -#define RESERVED 0x00000004 -#define REUSE_ADDR 0x00000008 - -channel DL_init_channel( int32 channel_type, int16 port, int32 mcast_address, int32 interface_address ); -void DL_close_channel(channel chan); -int DL_send( channel chan, int32 address, int16 port, sys_scatter *scat ); -int DL_recv( channel chan, sys_scatter *scat ); -int DL_recvfrom( channel chan, sys_scatter *scat, int *src_address, unsigned short *src_port ); - -#endif /* INC_DATA_LINK */ Deleted: libspreadutil/trunk/include/defines.h =================================================================== --- libspreadutil/trunk/include/defines.h 2012-02-01 05:40:59 UTC (rev 471) +++ libspreadutil/trunk/include/defines.h 2012-02-08 04:35:18 UTC (rev 472) @@ -1,296 +0,0 @@ -/* - * The Spread Toolkit. - * - * The contents of this file are subject to the Spread Open-Source - * License, Version 1.0 (the ``License''); you may not use - * this file except in compliance with the License. You may obtain a - * copy of the License at: - * - * http://www.spread.org/license/ - * - * or in the file ``license.txt'' found in this distribution. - * - * Software distributed under the License is distributed on an AS IS basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Creators of Spread are: - * Yair Amir, Michal Miskin-Amir, Jonathan Stanton, John Schultz. - * - * Copyright (C) 1993-2009 Spread Concepts LLC <[email protected]> - * - * All Rights Reserved. - * - * Major Contributor(s): - * --------------- - * Ryan Caudy [email protected] - contributions to process groups. - * Claudiu Danilov [email protected] - scalable wide area support. - * Cristina Nita-Rotaru [email protected] - group communication security. - * Theo Schlossnagle [email protected] - Perl, autoconf, old skiplist. - * Dan Schoenblum [email protected] - Java interface. - * - */ - - -#ifndef _DEFINES_H -#define _DEFINES_H - -#ifdef HAVE_STDLIB_H -#include <stdlib.h> -#endif -#include <sys/types.h> -#include <sys/socket.h> -#include <sys/param.h> -#include <netinet/in_systm.h> -#include <netinet/in.h> -#include <netinet/ip.h> -#ifdef HAVE_SYS_UN_H -# include <sys/un.h> -#endif -#ifdef HAVE_SYS_BITYPES_H -# include <sys/bitypes.h> -#endif -#ifdef HAVE_LIMITS_H -# include <limits.h> -#endif -#ifdef HAVE_ERRNO_H -# include <errno.h> -#endif -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif -#ifdef HAVE_SYS_CDEFS_H -# include <sys/cdefs.h> /* For __P() */ -#endif -#ifdef HAVE_SYS_SYSMACROS_H -# include <sys/sysmacros.h> /* For MIN, MAX, etc */ -#endif -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> /* For S_* constants and macros */ -#endif -#ifdef HAVE_NEXT -# include <libc.h> -#endif - -#include <unistd.h> -#include <termios.h> -#include <fcntl.h> - -#ifdef HAVE_SYS_FILIO_H -#include <sys/filio.h> -#endif - -#ifndef MAXPATHLEN -# ifdef PATH_MAX -# define MAXPATHLEN PATH_MAX -# else /* PATH_MAX */ -# define MAXPATHLEN 64 /* Should be safe */ -# endif /* PATH_MAX */ -#endif /* MAXPATHLEN */ - -#ifndef STDIN_FILENO -# define STDIN_FILENO 0 -#endif -#ifndef STDOUT_FILENO -# define STDOUT_FILENO 1 -#endif -#ifndef STDERR_FILENO -# define STDERR_FILENO 2 -#endif - -#ifndef O_NONBLOCK /* Non Blocking Open */ -# define O_NONBLOCK 00004 -#endif - -/* Types */ - -/* If sys/types.h does not supply intXX_t, supply them ourselves */ -/* (or die trying) */ - -#ifndef HAVE_SOCKOPT_LEN_T -# ifdef HAVE_SOCKLEN_T -typedef socklen_t sockopt_len_t; -# else -typedef int sockopt_len_t; -# endif -#endif - -#ifndef HAVE_U_INT -typedef unsigned int u_int; -#endif - -#ifndef HAVE_INTXX_T -# if (SIZEOF_CHAR == 1) -typedef char int8_t; -# else -# error "8 bit int type not found." -# endif -# if (SIZEOF_SHORT_INT == 2) -typedef short int int16_t; -# else -# ifdef _CRAY -typedef long int16_t; -# else -# error "16 bit int type not found." -# endif /* _CRAY */ -# endif -# if (SIZEOF_INT == 4) -typedef int int32_t; -# else -# ifdef _CRAY -typedef long int32_t; -# else -# error "32 bit int type not found." -# endif /* _CRAY */ -# endif -#endif - -/* If sys/types.h does not supply u_intXX_t, supply them ourselves */ -#ifndef HAVE_U_INTXX_T -# ifdef HAVE_UINTXX_T -typedef uint8_t u_int8_t; -typedef uint16_t u_int16_t; -typedef uint32_t u_int32_t; -# define HAVE_U_INTXX_T 1 -# else -# if (SIZEOF_CHAR == 1) -typedef unsigned char u_int8_t; -# else -# error "8 bit int type not found." -# endif -# if (SIZEOF_SHORT_INT == 2) -typedef unsigned short int u_int16_t; -# else -# ifdef _CRAY -typedef unsigned long u_int16_t; -# else -# error "16 bit int type not found." -# endif -# endif -# if (SIZEOF_INT == 4) -typedef unsigned int u_int32_t; -# else -# ifdef _CRAY -typedef unsigned long u_int32_t; -# else -# error "32 bit int type not found." -# endif -# endif -# endif -#endif - -/* 64-bit types */ -#ifndef HAVE_INT64_T -# if (SIZEOF_LONG_INT == 8) -typedef long int int64_t; -# define HAVE_INT64_T 1 -# else -# if (SIZEOF_LONG_LONG_INT == 8) -typedef long long int int64_t; -# define HAVE_INT64_T 1 -# define HAVE_LONG_LONG_INT -# endif -# endif -#endif -#ifndef HAVE_U_INT64_T -# if (SIZEOF_LONG_INT == 8) -typedef unsigned long int u_int64_t; -# define HAVE_U_INT64_T 1 -# else -# if (SIZEOF_LONG_LONG_INT == 8) -typedef unsigned long long int u_int64_t; -# define HAVE_U_INT64_T 1 -# endif -# endif -#endif - -#ifndef HAVE_SOCKLEN_T -typedef unsigned int socklen_t; -# define HAVE_SOCKLEN_T -#endif /* HAVE_SOCKLEN_T */ - -#ifndef HAVE_SIZE_T -typedef unsigned int size_t; -# define HAVE_SIZE_T -#endif /* HAVE_SIZE_T */ - -#ifndef HAVE_SSIZE_T -typedef int ssize_t; -# define HAVE_SSIZE_T -#endif /* HAVE_SSIZE_T */ - -#ifndef HAVE_CLOCK_T -typedef long clock_t; -# define HAVE_CLOCK_T -#endif /* HAVE_CLOCK_T */ - -#ifndef HAVE_SA_FAMILY_T -typedef int sa_family_t; -# define HAVE_SA_FAMILY_T -#endif /* HAVE_SA_FAMILY_T */ - -#ifndef HAVE_PID_T -typedef int pid_t; -# define HAVE_PID_T -#endif /* HAVE_PID_T */ - -#if !defined(HAVE_SS_FAMILY_IN_SS) && defined(HAVE___SS_FAMILY_IN_SS) -# define ss_family __ss_family -#endif /* !defined(HAVE_SS_FAMILY_IN_SS) && defined(HAVE_SA_FAMILY_IN_SS) */ - -#ifndef HAVE_SYS_UN_H -struct sockaddr_un { - short sun_family; /* AF_UNIX */ - char sun_path[108]; /* path name (gag) */ -}; -#endif /* HAVE_SYS_UN_H */ - -/* Macros */ - -#ifndef MAX -# define MAX(a,b) (((a)>(b))?(a):(b)) -# define MIN(a,b) (((a)<(b))?(a):(b)) -#endif - -#ifndef roundup -# define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) -#endif - -#ifndef timersub -#define timersub(a, b, result) \ - do { \ - (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \ - (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \ - if ((result)->tv_usec < 0) { \ - --(result)->tv_sec; \ - (result)->tv_usec += 1000000; \ - } \ - } while (0) -#endif - -#ifndef __P -# define __P(x) x -#endif - -#if !defined(__GNUC__) || (__GNUC__ < 2) -# define __attribute__(x) -#endif /* !defined(__GNUC__) || (__GNUC__ < 2) */ - -#ifndef SUN_LEN -#define SUN_LEN(su) \ - (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path)) -#endif /* SUN_LEN */ - -#if !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY) -# define memmove(s1, s2, n) bcopy((s2), (s1), (n)) -#endif /* !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY) */ - -/* which type of time to use? (api.c) */ -#ifdef HAVE_SYS_TIME_H -# define USE_TIMEVAL -#endif - -/** end of login recorder definitions */ - -#endif /* _DEFINES_H */ Deleted: libspreadutil/trunk/include/memory.h =================================================================== --- libspreadutil/trunk/include/memory.h 2012-02-01 05:40:59 UTC (rev 471) +++ libspreadutil/trunk/include/memory.h 2012-02-08 04:35:18 UTC (rev 472) @@ -1,130 +0,0 @@ -/* - * The Spread Toolkit. - * - * The contents of this file are subject to the Spread Open-Source - * License, Version 1.0 (the ``License''); you may not use - * this file except in compliance with the License. You may obtain a - * copy of the License at: - * - * http://www.spread.org/license/ - * - * or in the file ``license.txt'' found in this distribution. - * - * Software distributed under the License is distributed on an AS IS basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Creators of Spread are: - * Yair Amir, Michal Miskin-Amir, Jonathan Stanton, John Schultz. - * - * Copyright (C) 1993-2009 Spread Concepts LLC <[email protected]> - * - * All Rights Reserved. - * - * Major Contributor(s): - * --------------- - * Ryan Caudy [email protected] - contributions to process groups. - * Claudiu Danilov [email protected] - scalable wide area support. - * Cristina Nita-Rotaru [email protected] - group communication security. - * Theo Schlossnagle [email protected] - Perl, autoconf, old skiplist. - * Dan Schoenblum [email protected] - Java interface. - * - */ - - -#ifndef MEMORY_H -#define MEMORY_H - -#include "arch.h" - -/******************************************************************************* - * Special Object type used for - * NON-OBJECT Oriented allocates (traditional Malloc/free with arbitrary sizes) - * 0 is never a valid object type for any real object; 1 is also reserved - *******************************************************************************/ -#define BLOCK_OBJECT 0 - - -/************************************ - * Function Declarations - ************************************/ - -/* Input: valid object type, size of object, threshold/watermark value for this object, - * number of initial objects to create - * Output: error code - * Effects: registers type, sets watermark for type,creates initial memory buffers and updates global vars - * Should ONLY be called once per execution of the program, but must be called before any other - * memory management function is used on that object - */ -int Mem_init_object(int32u obj_type, int32u size, unsigned int threshold, unsigned int initial); - -/* This calls Mem_init_object and if any error results it EXIT's with a printed error */ -void Mem_init_object_abort( int32u obj_type, int32u size, unsigned int threshold, unsigned int initial ); - -/* This initializes the status reporting of the memory module and should be called from - * status.c after the Group, Recod, and RefRecord objects are mem_init'ed. - * After this is called each object created by Mem_init_object() will automatically - * be added to the status reporting. - * This function is needed to avoid a double-dependency loop where memory needs status working when - * it starts, but status requires memory working for it to work. - */ -void Mem_init_status(); -/* Input: a valid type of object - * Output: a pointer to memory which will hold an object - * Effects: will only allocate an object from system if none exist in pool - */ -void * new(int32u obj_type); - - -/* Input: a valid pointer to an object or block created by new or mem_alloc - * Output: none - * Effects: destroys the object and frees memory associated with it if necessary - */ -void dispose(void *object); - -/*************************************************************************** - * These two functions are ONLY needed for dynamically sized allocations - * like traditional malloc/free --NOT for object based allocations - ***************************************************************************/ - -/* Input: a size of memory block desired - * Output: a pointer to memory which will hold the block - * Effects: - */ -void * Mem_alloc( unsigned int length); - - -/* Input: a valid pointer to an object created with memalloc_object - * Output: a pointer to an object which is an identical copy of the object input - * Effects: same as memalloc_object - */ -void * Mem_copy(const void *object); - -/************************ - * Query Functions - ************************/ - -int Mem_valid_objtype(int32u objtype); - -/* Input: A valid pointer to an object/block created with new or mem_alloc - * Output: the obj_type of this block of memory - */ -int32u Mem_Obj_Type(const void *object); - -extern LOC_INLINE unsigned int Mem_total_bytes(void); -extern LOC_INLINE unsigned int Mem_total_max_bytes(void); -extern LOC_INLINE unsigned int Mem_total_inuse(void); -extern LOC_INLINE unsigned int Mem_total_max_inuse(void); -extern LOC_INLINE unsigned int Mem_total_obj(void); -extern LOC_INLINE unsigned int Mem_total_max_obj(void); -extern LOC_INLINE unsigned int Mem_bytes(int32u objtype); -extern LOC_INLINE unsigned int Mem_max_bytes(int32u objtype); -extern LOC_INLINE unsigned int Mem_obj_in_pool(int32u objtype); -extern LOC_INLINE unsigned int Mem_obj_in_app(int32u objtype); -extern LOC_INLINE unsigned int Mem_max_in_app(int32u objtype); -extern LOC_INLINE unsigned int Mem_obj_total(int32u objtype); -extern LOC_INLINE unsigned int Mem_max_obj(int32u objtype); - -#endif /* MEMORY_H */ - Deleted: libspreadutil/trunk/include/sp_events.h =================================================================== --- libspreadutil/trunk/include/sp_events.h 2012-02-01 05:40:59 UTC (rev 471) +++ libspreadutil/trunk/include/sp_events.h 2012-02-08 04:35:18 UTC (rev 472) @@ -1,98 +0,0 @@ -/* - * The Spread Toolkit. - * - * The contents of this file are subject to the Spread Open-Source - * License, Version 1.0 (the ``License''); you may not use - * this file except in compliance with the License. You may obtain a - * copy of the License at: - * - * http://www.spread.org/license/ - * - * or in the file ``license.txt'' found in this distribution. - * - * Software distributed under the License is distributed on an AS IS basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Creators of Spread are: - * Yair Amir, Michal Miskin-Amir, Jonathan Stanton, John Schultz. - * - * Copyright (C) 1993-2009 Spread Concepts LLC <[email protected]> - * - * All Rights Reserved. - * - * Major Contributor(s): - * --------------- - * Ryan Caudy [email protected] - contributions to process groups. - * Claudiu Danilov [email protected] - scalable wide area support. - * Cristina Nita-Rotaru [email protected] - group communication security. - * Theo Schlossnagle [email protected] - Perl, autoconf, old skiplist. - * Dan Schoenblum [email protected] - Java interface. - * - */ - - - -#ifndef INC_SP_EVENTS -#define INC_SP_EVENTS - -/* Raise this number AND RECOMPILE events.c to handle more active FD's. - * This number limits the number of connections that - * can be handled. - */ -#define MAX_FD_EVENTS 2000 - -#define NUM_PRIORITY 3 - -#define LOW_PRIORITY 0 -#define MEDIUM_PRIORITY 1 -#define HIGH_PRIORITY 2 - -#define NUM_FDTYPES 3 - -#define READ_FD 0 -#define WRITE_FD 1 -#define EXCEPT_FD 2 - - -typedef struct dummy_time { - long sec; - long usec; -} sp_time; - -#ifndef NULL -#define NULL (void *)0 -#endif - -/* Event routines */ - -int E_init(void); -sp_time E_get_time(void); -sp_time E_sub_time( sp_time t, sp_time delta_t ); -sp_time E_add_time( sp_time t, sp_time delta_t ); -/* if t1 > t2 then returns 1; - if t1 < t2 then returns -1; - if t1 == t2 then returns 0; */ -int E_compare_time( sp_time t1, sp_time t2 ); -int E_queue( void (* func)( int code, void *data ), int code, void *data, - sp_time delta_time ); -/* Note: This does not dispose/free the data pointed at by the void - *data pointer */ -int E_dequeue( void (* func)( int code, void *data ), int code, - void *data ); -void E_delay( sp_time t ); - -int E_attach_fd( int fd, int fd_type, - void (* func)( int fd, int code, void *data), int code, - void *data, int priority ); -int E_detach_fd( int fd, int fd_type ); -int E_set_active_threshold( int priority ); -int E_activate_fd( int fd, int fd_type ); -int E_deactivate_fd( int fd, int fd_type ); -int E_num_active( int priority ); - -void E_handle_events(void); -void E_exit_events(void); - -#endif /* INC_SP_EVENTS */