[Spread-cvs] commit: r480 - in libspreadutil/trunk: . include src
jonathan at spread.org
jonathan at spread.org
Sun Mar 4 14:30:49 EST 2012
Author: jonathan
Date: 2012-03-04 14:30:49 -0500 (Sun, 04 Mar 2012)
New Revision: 480
Added:
libspreadutil/trunk/include/alarm.h
libspreadutil/trunk/include/alarm_types.h
libspreadutil/trunk/include/data_link.h
libspreadutil/trunk/include/scatter.h
Removed:
libspreadutil/trunk/src/alarm.h
libspreadutil/trunk/src/alarm_types.h
libspreadutil/trunk/src/data_link.h
libspreadutil/trunk/src/scatter.h
Modified:
libspreadutil/trunk/Makefile.in
libspreadutil/trunk/include/Makefile.in
libspreadutil/trunk/include/system_defs.h
libspreadutil/trunk/include/system_defs_autoconf.h
libspreadutil/trunk/src/Makefile.in
Log:
Fix compile problems. Move more headers to include
Modified: libspreadutil/trunk/Makefile.in
===================================================================
--- libspreadutil/trunk/Makefile.in 2012-03-04 19:28:53 UTC (rev 479)
+++ libspreadutil/trunk/Makefile.in 2012-03-04 19:30:49 UTC (rev 480)
@@ -1,5 +1,5 @@
-SUBDIRS=src include
-INSTALLSUBDIRS=src include docs
+SUBDIRS=include src
+INSTALLSUBDIRS=include src docs
BINSUBDIRS=src
all: $(SUBDIRS)
Modified: libspreadutil/trunk/include/Makefile.in
===================================================================
--- libspreadutil/trunk/include/Makefile.in 2012-03-04 19:28:53 UTC (rev 479)
+++ libspreadutil/trunk/include/Makefile.in 2012-03-04 19:30:49 UTC (rev 480)
@@ -60,16 +60,16 @@
ENT=@ENT@
EXEEXT=@EXEEXT@
-TARGETS=headers
+TARGETS=system.h
HEADER_FILES=sp_events.h system_defs.h system_defs_autoconf.h system_defs_windows.h spu_compatibility.h
all: $(TARGETS)
-headers:
+system.h: ../src/config.h
$(buildtoolsdir)/gen_system_include.sh ../src/config.h > system.h
-install-headers: headers
+install-headers: system.h
$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(includedir)
for incfile in $(HEADER_FILES); \
do \
Copied: libspreadutil/trunk/include/alarm.h (from rev 469, libspreadutil/trunk/src/alarm.h)
===================================================================
--- libspreadutil/trunk/include/alarm.h (rev 0)
+++ libspreadutil/trunk/include/alarm.h 2012-03-04 19:30:49 UTC (rev 480)
@@ -0,0 +1,117 @@
+/*
+ * 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 <info at spreadconcepts.com>
+ *
+ * All Rights Reserved.
+ *
+ * Major Contributor(s):
+ * ---------------
+ * Ryan Caudy rcaudy at gmail.com - contributions to process groups.
+ * Claudiu Danilov claudiu at acm.org - scalable wide area support.
+ * Cristina Nita-Rotaru crisn at cs.purdue.edu - group communication security.
+ * Theo Schlossnagle jesus at omniti.com - Perl, autoconf, old skiplist.
+ * Dan Schoenblum dansch at cnds.jhu.edu - Java interface.
+ *
+ */
+
+
+#ifndef INC_ALARM
+#define INC_ALARM
+
+#include <stdio.h>
+#include "arch.h"
+
+/* Type for Alarm realtime handler functions */
+typedef int (alarm_realtime_handler)( int16, int32, char *, size_t, char *, size_t);
+
+
+/* This includes the custom types for each project */
+#include "alarm_types.h"
+
+/* These are always defined for any project using Alarm */
+#define ALL 0xffffffff
+#define NONE 0x00000000
+
+/* Priority levels */
+#define SPLOG_DEBUG 0x0001 /* Program information that is only useful for debugging.
+ Will normally be turned off in operation. */
+#define SPLOG_INFO 0x0002 /* Program reports information that may be useful for
+ performance tuning, analysis, or operational checks. */
+#define SPLOG_WARNING 0x0003 /* Program encountered a situation that is not erroneous,
+ but is uncommon and may indicate an error. */
+#define SPLOG_ERROR 0x0004 /* Program encountered an error that can be recovered from. */
+#define SPLOG_CRITICAL 0x0005 /* Program will not exit, but has only temporarily recovered
+ and without help may soon fail. */
+#define SPLOG_FATAL 0x0006 /* Program will exit() or abort(). */
+
+#define SPLOG_PRINT 0x0007 /* Program should always print this information */
+
+#define SPLOG_PRIORITY_FIELDS 0x000f
+
+/* Feature Flags for Priority field */
+#define SPLOG_NODATE 0x0010 /* Program should omit the datestamp at the beginning of the message. */
+#define SPLOG_REALTIME 0x0020 /* This message should be disseminated through the realtime handler if possible.
+ This is used for alerts you want sent now and not just logged (they are also logged). */
+#define SPLOG_PRIORITY_FLAGS 0x00f0
+
+#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(const char *format);
+void Alarm_enable_timestamp_high_res(const char *format);
+void Alarm_disable_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_realtime_print_handler( alarm_realtime_handler *output_message_function );
+
+void Alarm_set_interactive(void);
+int Alarm_get_interactive(void);
+
+#define IPF "%d.%d.%d.%d"
+
+#define IP1(address) ( (int) ( ( (address) >> 24 ) & 0xFF ) )
+#define IP2(address) ( (int) ( ( (address) >> 16 ) & 0xFF ) )
+#define IP3(address) ( (int) ( ( (address) >> 8 ) & 0xFF ) )
+#define IP4(address) ( (int) ( ( (address) >> 0 ) & 0xFF ) )
+
+#define IP(address) IP1(address), IP2(address), IP3(address), IP4(address)
+
+#define IP1_NET(address) ( (int) ( (unsigned char*) &(address) )[0] )
+#define IP2_NET(address) ( (int) ( (unsigned char*) &(address) )[1] )
+#define IP3_NET(address) ( (int) ( (unsigned char*) &(address) )[2] )
+#define IP4_NET(address) ( (int) ( (unsigned char*) &(address) )[3] )
+
+#define IP_NET(address) IP1_NET(address), IP2_NET(address), IP3_NET(address), IP4_NET(address)
+
+#endif /* INC_ALARM */
Copied: libspreadutil/trunk/include/alarm_types.h (from rev 469, libspreadutil/trunk/src/alarm_types.h)
===================================================================
--- libspreadutil/trunk/include/alarm_types.h (rev 0)
+++ libspreadutil/trunk/include/alarm_types.h 2012-03-04 19:30:49 UTC (rev 480)
@@ -0,0 +1,84 @@
+/*
+ * 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-2006 Spread Concepts LLC <info at spreadconcepts.com>
+ *
+ * All Rights Reserved.
+ *
+ * Major Contributor(s):
+ * ---------------
+ * Ryan Caudy rcaudy at gmail.com - contributions to process groups.
+ * Cristina Nita-Rotaru crisn at cs.purdue.edu - group communication security.
+ * Theo Schlossnagle jesus at omniti.com - Perl, autoconf, old skiplist.
+ * Dan Schoenblum dansch at cnds.jhu.edu - Java interface.
+ *
+ *
+ * This file is also licensed by Spread Concepts LLC under the Spines
+ * Open-Source License, version 1.0. You may obtain a copy of the
+ * Spines Open-Source License, version 1.0 at:
+ *
+ * http://www.spines.org/LICENSE.txt
+ *
+ * or in the file ``LICENSE.txt'' found in this distribution.
+ *
+ */
+
+
+#ifndef INC_ALARM_TYPES
+#define INC_ALARM_TYPES
+
+#include "arch.h"
+
+/* List of type values that are valid for this project.
+ * This list can be customized for each user of Alarm library.
+ * The defines must be consistent amoung all code that will be compiled together,
+ * but can be different for different executables
+ */
+#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 Clash with an OpenSSL definition
+#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
+
+#endif /* INC_ALARM_TYPES */
Copied: libspreadutil/trunk/include/data_link.h (from rev 469, libspreadutil/trunk/src/data_link.h)
===================================================================
--- libspreadutil/trunk/include/data_link.h (rev 0)
+++ libspreadutil/trunk/include/data_link.h 2012-03-04 19:30:49 UTC (rev 480)
@@ -0,0 +1,58 @@
+/*
+ * 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 <info at spreadconcepts.com>
+ *
+ * All Rights Reserved.
+ *
+ * Major Contributor(s):
+ * ---------------
+ * Ryan Caudy rcaudy at gmail.com - contributions to process groups.
+ * Claudiu Danilov claudiu at acm.org - scalable wide area support.
+ * Cristina Nita-Rotaru crisn at cs.purdue.edu - group communication security.
+ * Theo Schlossnagle jesus at omniti.com - Perl, autoconf, old skiplist.
+ * Dan Schoenblum dansch at cnds.jhu.edu - Java interface.
+ *
+ */
+
+
+#ifndef INC_DATA_LINK
+#define INC_DATA_LINK
+
+#include "system.h"
+#include "scatter.h"
+
+#define MAX_PACKET_SIZE 1472 /*1472 = 1536-64 (of udp)*/
+
+#define SEND_CHANNEL 0x00000001
+#define RECV_CHANNEL 0x00000002
+#define NO_LOOP 0x00000004
+#define REUSE_ADDR 0x00000008
+
+#define IS_MCAST_ADDR(addr) ( ( (addr) & 0xF0000000 ) == 0xE0000000 )
+#define IS_MCAST_ADDR_NET(addr) ( ( (unsigned char*) &(addr) )[0] == 0xE0 )
+
+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 */
Copied: libspreadutil/trunk/include/scatter.h (from rev 467, libspreadutil/trunk/src/scatter.h)
===================================================================
--- libspreadutil/trunk/include/scatter.h (rev 0)
+++ libspreadutil/trunk/include/scatter.h 2012-03-04 19:30:49 UTC (rev 480)
@@ -0,0 +1,59 @@
+/*
+ * 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 <info at spreadconcepts.com>
+ *
+ * All Rights Reserved.
+ *
+ * Major Contributor(s):
+ * ---------------
+ * Ryan Caudy rcaudy at gmail.com - contributions to process groups.
+ * Claudiu Danilov claudiu at acm.org - scalable wide area support.
+ * Cristina Nita-Rotaru crisn at cs.purdue.edu - group communication security.
+ * Theo Schlossnagle jesus at omniti.com - Perl, autoconf, old skiplist.
+ * Dan Schoenblum dansch at cnds.jhu.edu - Java interface.
+ *
+ */
+
+
+#ifndef INC_SCATTER
+#define INC_SCATTER
+
+#include "system.h"
+#define MAX_SCATTER_ELEMENTS 100
+
+/* scat_element is EXACTLY as defined in iovec */
+
+typedef struct dummy_scat_element{
+ char *buf;
+ size_t len;
+} scat_element;
+
+typedef struct dummy_scatter {
+ size_t num_elements;
+ scat_element elements[ARCH_SCATTER_SIZE];
+} sys_scatter;
+
+typedef struct dummy_big_scatter {
+ size_t num_elements;
+ scat_element elements[MAX_SCATTER_ELEMENTS];
+} scatter;
+
+#endif /* INC_SCATTER */
Modified: libspreadutil/trunk/include/system_defs.h
===================================================================
--- libspreadutil/trunk/include/system_defs.h 2012-03-04 19:28:53 UTC (rev 479)
+++ libspreadutil/trunk/include/system_defs.h 2012-03-04 19:30:49 UTC (rev 480)
@@ -11,7 +11,7 @@
/* For Windows systems, use specified types and definitions */
#include "system_defs_windows.h"
-#endif /* ARCH_PC_WIN95 */
+#endif /* SPU_ARCH_PC_WIN95 */
#endif /* SYSTEM_DEFS_H */
Modified: libspreadutil/trunk/include/system_defs_autoconf.h
===================================================================
--- libspreadutil/trunk/include/system_defs_autoconf.h 2012-03-04 19:28:53 UTC (rev 479)
+++ libspreadutil/trunk/include/system_defs_autoconf.h 2012-03-04 19:30:49 UTC (rev 480)
@@ -18,10 +18,11 @@
#ifdef SPU_HAVE_SYS_BITYPES_H
# include <sys/bitypes.h>
#endif
+
#ifdef SPU_HAVE_LIMITS_H
# include <limits.h>
+#endif
-
#ifndef SPU_HAVE_U_INT
typedef unsigned int u_int;
#endif
@@ -122,4 +123,6 @@
#define SPU_ARCH_SCATTER_SIZE 1024
#endif
+
+
#endif /* SYSTEM_DEFS_AUTOCONF_H */
Modified: libspreadutil/trunk/src/Makefile.in
===================================================================
--- libspreadutil/trunk/src/Makefile.in 2012-03-04 19:28:53 UTC (rev 479)
+++ libspreadutil/trunk/src/Makefile.in 2012-03-04 19:30:49 UTC (rev 480)
@@ -27,7 +27,7 @@
LIBCOMPATVERSION=0.0
LIBVERSION=0
-PATHS=-I. -I$(top_srcdir)/src
+PATHS=-I. -I$(top_srcdir)/src -I../include -I$(top_srcdir)/include
CC=@CC@
LD=@LD@
@@ -79,7 +79,7 @@
$(RANLIB) $@
libspread-util.dylib: $(LIB_SHOBJS)
- $(SHLD) -o libspread-util.$(LIBFULLVERSION).dylib $(LIBSP_SHOBJS) $(SHLDFLAGS) $(SHLIBS) $(SHLDNAME)libspread-util.$(LIBVERSION).dylib -current_version $(LIBFULLVERSION) -compatibility_version $(LIBCOMPATVERSION)
+ $(SHLD) -o libspread-util.$(LIBFULLVERSION).dylib $(LIB_SHOBJS) $(SHLDFLAGS) $(SHLIBS) $(SHLDNAME)libspread-util.$(LIBVERSION).dylib -current_version $(LIBFULLVERSION) -compatibility_version $(LIBCOMPATVERSION)
$(SOFTLINK) -f libspread-util.$(LIBFULLVERSION).dylib $@
install-libspread-util.dylib: libspread-util.dylib
@@ -123,14 +123,11 @@
install-files:
$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(libdir)
- $(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(includedir)
$(INSTALL) -m 644 libspread-util.a $(DESTDIR)$(libdir)/libspread-util.a
- $(INSTALL) -m 644 $(top_srcdir)/include/sp_events.h $(DESTDIR)$(includedir)/sp_events.h
uninstall:
-rm -f $(DESTDIR)$(libdir)/libspread-util.a
-rm -f $(DESTDIR)$(libdir)/@LIBSPSO@
- -rm -f $(DESTDIR)$(includedir)/sp_events.h
uninstallall: uninstall
-rmdir $(DESTDIR)$(libdir)
Deleted: libspreadutil/trunk/src/alarm.h
===================================================================
--- libspreadutil/trunk/src/alarm.h 2012-03-04 19:28:53 UTC (rev 479)
+++ libspreadutil/trunk/src/alarm.h 2012-03-04 19:30:49 UTC (rev 480)
@@ -1,117 +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 <info at spreadconcepts.com>
- *
- * All Rights Reserved.
- *
- * Major Contributor(s):
- * ---------------
- * Ryan Caudy rcaudy at gmail.com - contributions to process groups.
- * Claudiu Danilov claudiu at acm.org - scalable wide area support.
- * Cristina Nita-Rotaru crisn at cs.purdue.edu - group communication security.
- * Theo Schlossnagle jesus at omniti.com - Perl, autoconf, old skiplist.
- * Dan Schoenblum dansch at cnds.jhu.edu - Java interface.
- *
- */
-
-
-#ifndef INC_ALARM
-#define INC_ALARM
-
-#include <stdio.h>
-#include "arch.h"
-
-/* Type for Alarm realtime handler functions */
-typedef int (alarm_realtime_handler)( int16, int32, char *, size_t, char *, size_t);
-
-
-/* This includes the custom types for each project */
-#include "alarm_types.h"
-
-/* These are always defined for any project using Alarm */
-#define ALL 0xffffffff
-#define NONE 0x00000000
-
-/* Priority levels */
-#define SPLOG_DEBUG 0x0001 /* Program information that is only useful for debugging.
- Will normally be turned off in operation. */
-#define SPLOG_INFO 0x0002 /* Program reports information that may be useful for
- performance tuning, analysis, or operational checks. */
-#define SPLOG_WARNING 0x0003 /* Program encountered a situation that is not erroneous,
- but is uncommon and may indicate an error. */
-#define SPLOG_ERROR 0x0004 /* Program encountered an error that can be recovered from. */
-#define SPLOG_CRITICAL 0x0005 /* Program will not exit, but has only temporarily recovered
- and without help may soon fail. */
-#define SPLOG_FATAL 0x0006 /* Program will exit() or abort(). */
-
-#define SPLOG_PRINT 0x0007 /* Program should always print this information */
-
-#define SPLOG_PRIORITY_FIELDS 0x000f
-
-/* Feature Flags for Priority field */
-#define SPLOG_NODATE 0x0010 /* Program should omit the datestamp at the beginning of the message. */
-#define SPLOG_REALTIME 0x0020 /* This message should be disseminated through the realtime handler if possible.
- This is used for alerts you want sent now and not just logged (they are also logged). */
-#define SPLOG_PRIORITY_FLAGS 0x00f0
-
-#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(const char *format);
-void Alarm_enable_timestamp_high_res(const char *format);
-void Alarm_disable_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_realtime_print_handler( alarm_realtime_handler *output_message_function );
-
-void Alarm_set_interactive(void);
-int Alarm_get_interactive(void);
-
-#define IPF "%d.%d.%d.%d"
-
-#define IP1(address) ( (int) ( ( (address) >> 24 ) & 0xFF ) )
-#define IP2(address) ( (int) ( ( (address) >> 16 ) & 0xFF ) )
-#define IP3(address) ( (int) ( ( (address) >> 8 ) & 0xFF ) )
-#define IP4(address) ( (int) ( ( (address) >> 0 ) & 0xFF ) )
-
-#define IP(address) IP1(address), IP2(address), IP3(address), IP4(address)
-
-#define IP1_NET(address) ( (int) ( (unsigned char*) &(address) )[0] )
-#define IP2_NET(address) ( (int) ( (unsigned char*) &(address) )[1] )
-#define IP3_NET(address) ( (int) ( (unsigned char*) &(address) )[2] )
-#define IP4_NET(address) ( (int) ( (unsigned char*) &(address) )[3] )
-
-#define IP_NET(address) IP1_NET(address), IP2_NET(address), IP3_NET(address), IP4_NET(address)
-
-#endif /* INC_ALARM */
Deleted: libspreadutil/trunk/src/alarm_types.h
===================================================================
--- libspreadutil/trunk/src/alarm_types.h 2012-03-04 19:28:53 UTC (rev 479)
+++ libspreadutil/trunk/src/alarm_types.h 2012-03-04 19:30:49 UTC (rev 480)
@@ -1,84 +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-2006 Spread Concepts LLC <info at spreadconcepts.com>
- *
- * All Rights Reserved.
- *
- * Major Contributor(s):
- * ---------------
- * Ryan Caudy rcaudy at gmail.com - contributions to process groups.
- * Cristina Nita-Rotaru crisn at cs.purdue.edu - group communication security.
- * Theo Schlossnagle jesus at omniti.com - Perl, autoconf, old skiplist.
- * Dan Schoenblum dansch at cnds.jhu.edu - Java interface.
- *
- *
- * This file is also licensed by Spread Concepts LLC under the Spines
- * Open-Source License, version 1.0. You may obtain a copy of the
- * Spines Open-Source License, version 1.0 at:
- *
- * http://www.spines.org/LICENSE.txt
- *
- * or in the file ``LICENSE.txt'' found in this distribution.
- *
- */
-
-
-#ifndef INC_ALARM_TYPES
-#define INC_ALARM_TYPES
-
-#include "arch.h"
-
-/* List of type values that are valid for this project.
- * This list can be customized for each user of Alarm library.
- * The defines must be consistent amoung all code that will be compiled together,
- * but can be different for different executables
- */
-#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 Clash with an OpenSSL definition
-#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
-
-#endif /* INC_ALARM_TYPES */
Deleted: libspreadutil/trunk/src/data_link.h
===================================================================
--- libspreadutil/trunk/src/data_link.h 2012-03-04 19:28:53 UTC (rev 479)
+++ libspreadutil/trunk/src/data_link.h 2012-03-04 19:30:49 UTC (rev 480)
@@ -1,58 +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 <info at spreadconcepts.com>
- *
- * All Rights Reserved.
- *
- * Major Contributor(s):
- * ---------------
- * Ryan Caudy rcaudy at gmail.com - contributions to process groups.
- * Claudiu Danilov claudiu at acm.org - scalable wide area support.
- * Cristina Nita-Rotaru crisn at cs.purdue.edu - group communication security.
- * Theo Schlossnagle jesus at omniti.com - Perl, autoconf, old skiplist.
- * Dan Schoenblum dansch at cnds.jhu.edu - 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 NO_LOOP 0x00000004
-#define REUSE_ADDR 0x00000008
-
-#define IS_MCAST_ADDR(addr) ( ( (addr) & 0xF0000000 ) == 0xE0000000 )
-#define IS_MCAST_ADDR_NET(addr) ( ( (unsigned char*) &(addr) )[0] == 0xE0 )
-
-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/src/scatter.h
===================================================================
--- libspreadutil/trunk/src/scatter.h 2012-03-04 19:28:53 UTC (rev 479)
+++ libspreadutil/trunk/src/scatter.h 2012-03-04 19:30:49 UTC (rev 480)
@@ -1,59 +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 <info at spreadconcepts.com>
- *
- * All Rights Reserved.
- *
- * Major Contributor(s):
- * ---------------
- * Ryan Caudy rcaudy at gmail.com - contributions to process groups.
- * Claudiu Danilov claudiu at acm.org - scalable wide area support.
- * Cristina Nita-Rotaru crisn at cs.purdue.edu - group communication security.
- * Theo Schlossnagle jesus at omniti.com - Perl, autoconf, old skiplist.
- * Dan Schoenblum dansch at cnds.jhu.edu - Java interface.
- *
- */
-
-
-#ifndef INC_SCATTER
-#define INC_SCATTER
-
-#include "arch.h"
-#define MAX_SCATTER_ELEMENTS 100
-
-/* scat_element is EXACTLY as defined in iovec */
-
-typedef struct dummy_scat_element{
- char *buf;
- size_t len;
-} scat_element;
-
-typedef struct dummy_scatter {
- size_t num_elements;
- scat_element elements[ARCH_SCATTER_SIZE];
-} sys_scatter;
-
-typedef struct dummy_big_scatter {
- size_t num_elements;
- scat_element elements[MAX_SCATTER_ELEMENTS];
-} scatter;
-
-#endif /* INC_SCATTER */
More information about the Spread-cvs
mailing list