[idms-dbma-devel]: COMMIT - r109 - in branches/nonblocking_io: . dbma include modules/auth modules/a
Status: Pre-Alpha
Brought to you by:
nkukard
Menu
▾
▴
[idms-dbma-devel]: COMMIT - r109 - in branches/nonblocking_io: . dbma include modules/auth modules/auth/pgsql modules/engines modules/engines/diskIO modules/engines/diskIO/c10klocaldisk modules/engines/networkIO modules/engines/networkIO/c10k modules/mpm modules/mpm/c10k
|
From: <sv...@li...> - 2005-09-22 05:41:42
|
Author: nkukard
Date: 2005-09-22 05:37:44 +0000 (Thu, 22 Sep 2005)
New Revision: 109
Added:
branches/nonblocking_io/include/diskio.h
branches/nonblocking_io/include/networkio.h
branches/nonblocking_io/modules/engines/networkIO/Makefile.am
branches/nonblocking_io/modules/engines/networkIO/Makefile.in
branches/nonblocking_io/modules/engines/networkIO/c10k/Makefile.am
branches/nonblocking_io/modules/engines/networkIO/c10k/Makefile.in
Removed:
branches/nonblocking_io/include/socklib.h
branches/nonblocking_io/modules/engines/diskIO/diskio.h
branches/nonblocking_io/modules/engines/networkIO/networkio.h
Modified:
branches/nonblocking_io/Makefile.am
branches/nonblocking_io/Makefile.in
branches/nonblocking_io/configure
branches/nonblocking_io/configure.ac
branches/nonblocking_io/dbma/dbmra.c
branches/nonblocking_io/include/modules.h
branches/nonblocking_io/include/mpm.h
branches/nonblocking_io/include/protocols.h
branches/nonblocking_io/modules/auth/auth.h
branches/nonblocking_io/modules/auth/pgsql/pgsql.c
branches/nonblocking_io/modules/engines/Makefile.am
branches/nonblocking_io/modules/engines/Makefile.in
branches/nonblocking_io/modules/engines/diskIO/c10klocaldisk/localdisk.c
branches/nonblocking_io/modules/engines/networkIO/c10k/c10k.c
branches/nonblocking_io/modules/engines/networkIO/networkio.c
branches/nonblocking_io/modules/mpm/c10k/c10k.c
branches/nonblocking_io/modules/mpm/mpm.c
Log:
* Intermediate changes
Modified: branches/nonblocking_io/Makefile.am
===================================================================
--- branches/nonblocking_io/Makefile.am 2005-09-20 11:35:08 UTC (rev 108)
+++ branches/nonblocking_io/Makefile.am 2005-09-22 05:37:44 UTC (rev 109)
@@ -1,2 +1,2 @@
SUBDIRS=modules lib dbma doc
-EXTRA_DIST= include/auth.h include/debug.h include/mailstore.h include/misc.h include/modules.h include/socklib.h
+#EXTRA_DIST= include/auth.h include/debug.h include/mailstore.h include/misc.h include/modules.h include/socklib.h
Modified: branches/nonblocking_io/Makefile.in
===================================================================
--- branches/nonblocking_io/Makefile.in 2005-09-20 11:35:08 UTC (rev 108)
+++ branches/nonblocking_io/Makefile.in 2005-09-22 05:37:44 UTC (rev 109)
@@ -184,7 +184,6 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
SUBDIRS = modules lib dbma doc
-EXTRA_DIST = include/auth.h include/debug.h include/mailstore.h include/misc.h include/modules.h include/socklib.h
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -385,7 +384,6 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/include
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -620,6 +618,7 @@
mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
tags tags-recursive uninstall uninstall-am uninstall-info-am
+#EXTRA_DIST= include/auth.h include/debug.h include/mailstore.h include/misc.h include/modules.h include/socklib.h
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: branches/nonblocking_io/configure
===================================================================
--- branches/nonblocking_io/configure 2005-09-20 11:35:08 UTC (rev 108)
+++ branches/nonblocking_io/configure 2005-09-22 05:37:44 UTC (rev 109)
@@ -22890,7 +22890,7 @@
exit 1
fi
- ac_config_files="$ac_config_files Makefile lib/Makefile dbma/Makefile doc/Makefile modules/Makefile modules/auth/Makefile modules/auth/pgsql/Makefile modules/protocols/Makefile modules/protocols/imap4/Makefile modules/protocols/pop3/Makefile modules/protocols/smtp/Makefile modules/storage/Makefile modules/storage/dbma/Makefile modules/engines/Makefile modules/engines/diskIO/Makefile modules/engines/diskIO/c10klocaldisk/Makefile modules/mpm/Makefile modules/mpm/c10k/Makefile"
+ ac_config_files="$ac_config_files Makefile lib/Makefile dbma/Makefile doc/Makefile modules/Makefile modules/auth/Makefile modules/auth/pgsql/Makefile modules/protocols/Makefile modules/protocols/imap4/Makefile modules/protocols/pop3/Makefile modules/protocols/smtp/Makefile modules/storage/Makefile modules/storage/dbma/Makefile modules/engines/Makefile modules/engines/diskIO/Makefile modules/engines/diskIO/c10klocaldisk/Makefile modules/engines/networkIO/Makefile modules/engines/networkIO/c10k/Makefile modules/mpm/Makefile modules/mpm/c10k/Makefile"
cat >confcache <<\_ACEOF
@@ -23465,6 +23465,8 @@
"modules/engines/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/engines/Makefile" ;;
"modules/engines/diskIO/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/engines/diskIO/Makefile" ;;
"modules/engines/diskIO/c10klocaldisk/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/engines/diskIO/c10klocaldisk/Makefile" ;;
+ "modules/engines/networkIO/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/engines/networkIO/Makefile" ;;
+ "modules/engines/networkIO/c10k/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/engines/networkIO/c10k/Makefile" ;;
"modules/mpm/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/mpm/Makefile" ;;
"modules/mpm/c10k/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/mpm/c10k/Makefile" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
Modified: branches/nonblocking_io/configure.ac
===================================================================
--- branches/nonblocking_io/configure.ac 2005-09-20 11:35:08 UTC (rev 108)
+++ branches/nonblocking_io/configure.ac 2005-09-22 05:37:44 UTC (rev 109)
@@ -98,6 +98,8 @@
modules/engines/Makefile
modules/engines/diskIO/Makefile
modules/engines/diskIO/c10klocaldisk/Makefile
+ modules/engines/networkIO/Makefile
+ modules/engines/networkIO/c10k/Makefile
modules/mpm/Makefile
modules/mpm/c10k/Makefile
])
Modified: branches/nonblocking_io/dbma/dbmra.c
===================================================================
--- branches/nonblocking_io/dbma/dbmra.c 2005-09-20 11:35:08 UTC (rev 108)
+++ branches/nonblocking_io/dbma/dbmra.c 2005-09-22 05:37:44 UTC (rev 109)
@@ -42,7 +42,6 @@
#include "misc.h"
#include "debug.h"
#include "mpm.h"
-#include "socklib.h"
// Application Configuration...
Added: branches/nonblocking_io/include/diskio.h
===================================================================
--- branches/nonblocking_io/include/diskio.h 2005-09-20 11:35:08 UTC (rev 108)
+++ branches/nonblocking_io/include/diskio.h 2005-09-22 05:37:44 UTC (rev 109)
@@ -0,0 +1,86 @@
+/*
+ * diskio.h - Disk IO Abstraction Layer Header File
+ * Copyright (C) 2002-2005, Linux Based Systems Design
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 05/05/2005 - Nigel Kukard <nk...@lb...>
+ * * Initial design
+ *
+*/
+
+
+#ifndef _DISKIO_H
+#define _DISKIO_H
+
+#include <sys/types.h>
+
+
+/*
+ * Res is passed back from the disk io engine, this is D_* style responses
+ * The system error code can be retrieved using dio_getErrno()
+ */
+#define DISKIO_CALLBACK_FUNC void (* callback) (struct dioFile_t *file, int res)
+
+
+/* File handle used by the disk IO stuff */
+struct dioFile_t
+{
+ /* User stuff */
+ void *context; // Extra data passed to callback function
+ /* Internal stuff */
+ DISKIO_CALLBACK_FUNC;
+ int err; // This will be set to errno if the system encountered an error
+ /* Module data */
+ void *cmdStruct;
+ void *moduleData;
+};
+
+
+/* Disk IO commands modules must implement */
+struct dioCmds_t
+{
+ int (* dio_open) (struct dioFile_t *file, char *filename, int flags);
+ int (* dio_read) (struct dioFile_t *file, void *buf, size_t count);
+ int (* dio_write) (struct dioFile_t *file, const void *buf, size_t count);
+ int (* dio_close) (struct dioFile_t *file);
+};
+
+
+
+/* Abstraction layer open function */
+int dio_open(void *context, char *filename, int flags, DISKIO_CALLBACK_FUNC);
+
+/* Abstraction layer read function */
+int dio_read(struct dioFile_t *file, void *buf, size_t count, DISKIO_CALLBACK_FUNC);
+
+/* Abstraction layer write function */
+int dio_write(struct dioFile_t *file, const void *buf, size_t count, DISKIO_CALLBACK_FUNC);
+
+/* Abstraction layer close function */
+int dio_close(struct dioFile_t *file, DISKIO_CALLBACK_FUNC);
+
+/* Set system response code */
+inline void dio_setErrno(struct dioFile_t *file, int err);
+
+ /* Get system response code, if one */
+inline int dio_getErrno(struct dioFile_t *file);
+
+/* Get private data */
+inline void *dio_getContext(struct dioFile_t *file);
+
+
+#endif
+
Modified: branches/nonblocking_io/include/modules.h
===================================================================
--- branches/nonblocking_io/include/modules.h 2005-09-20 11:35:08 UTC (rev 108)
+++ branches/nonblocking_io/include/modules.h 2005-09-22 05:37:44 UTC (rev 109)
@@ -30,7 +30,7 @@
#define _MODULES_H
#include <arpa/inet.h>
-#include "socklib.h"
+#include "networkio.h"
/* Module types */
@@ -52,20 +52,7 @@
void *moduleData;
};
-/* Data structure for queuing connection to handlers, this is used as a constant in the actual server's connection structure */
-struct sockData_t
-{
- // Socket server info
- char* ipAddress;
- unsigned short int listenPort;
- int maxConnections;
- // Socket communication info
- int boundFD;
- // Handler info
- struct protocol_cmds_t *protoCmds;
-};
-
/* Return list of auth modules loaded */
GList *get_auth_modules();
Modified: branches/nonblocking_io/include/mpm.h
===================================================================
--- branches/nonblocking_io/include/mpm.h 2005-09-20 11:35:08 UTC (rev 108)
+++ branches/nonblocking_io/include/mpm.h 2005-09-22 05:37:44 UTC (rev 109)
@@ -28,19 +28,71 @@
#include "protocols.h"
+/* Server side per protocol data */
+struct socket_data_t
+{
+ // Server socket information
+ char* listenAddr;
+ unsigned short int listenPort;
+ int maxConnections;
+ // Bound socket file descriptor
+ int boundFD;
+ // Protocol module info
+ struct protocol_module_t *handler;
+};
+
+
+
+// FIXME: MOVE THIS TO A NETWORK IO MODULE
+/* State of an io operation */
+struct iostate_t
+{
+ int ioType:3; /* Type of IO we doing */
+ int direction:2; /* either input or output */
+ char *buffer; /* buffer pointer in the case of sending, actual buffer in the case of receiving */
+ size_t bufsize; /* size of buffer, size to send or max size to get */
+ size_t bufpos; /* current position in buffer, internal usage */
+ size_t buflen; /* actual amount of io done */
+ int timeout;
+ long int curTimeout;
+ int err;
+ int state;
+};
+
+
+/* A client connection structure */
+struct client_connection_t
+{
+ int fd;
+ char *hostname; /* client's hostname, at this time, his IP */
+
+ const struct socket_data_t *socketData; /* server socket data and protocol handling data */
+
+ char *recvBuffer; /* FIXME: current command buffer */
+
+ void *data; /* used by protocol */
+
+ // FIXME: Internal info - MOVE THIS TO A NETWORK MODULE OR SOMETHING
+ struct iostate_t ioState;
+};
+
+
+
+
/* MPM command struct */
-struct mpm_cmds_t
+struct mpm_funcs_t
{
+ int (*linkProtocol) (struct protocol_module_t *module, char *bindTo, int maxConns);
int (*start) ();
- int (*linkProtocol) (struct protocol_module_t *module);
};
+
/* MPM module type */
struct mpm_module_t
{
char *name;
- void *cmdStruct;
+ void *funcs;
};
Added: branches/nonblocking_io/include/networkio.h
===================================================================
--- branches/nonblocking_io/include/networkio.h 2005-09-20 11:35:08 UTC (rev 108)
+++ branches/nonblocking_io/include/networkio.h 2005-09-22 05:37:44 UTC (rev 109)
@@ -0,0 +1,84 @@
+/*
+ * networkIO.h - Network IO abstraction layer
+ * Copyright (C) 2002-2005, Linux Based Systems Design
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ *
+ * 19/09/2005 - Nigel Kukard <nk...@lb...>
+ * * Initial design
+ *
+*/
+
+#ifndef _NETWORKIO_H
+#define _NETWORKIO_H
+
+#include <glib.h>
+#include "mpm.h"
+
+
+/* Socket options */
+#define SOCK_IO_BUF_LEN 4096
+#define EOL "\r\n"
+
+/* Connection status */
+#define SOCK_STATE_FATAL_ERR -5
+#define SOCK_STATE_TIMEOUT -4
+#define SOCK_STATE_INTERNAL_ERR -3 /* This will prevent loops with broken code */
+#define SOCK_STATE_BUFFER_OVERFLOW -2
+#define SOCK_STATE_ERROR -1
+#define SOCK_STATE_NONE 0
+#define SOCK_STATE_PENDING 1
+#define SOCK_STATE_DONE 2
+#define SOCK_STATE_IDLE 3
+
+/* IO types */
+#define SOCK_IO_TYPE_NONE 0
+#define SOCK_IO_TYPE_LINE 1
+#define SOCK_IO_TYPE_RAW 2
+
+/* IO direction */
+#define SOCK_DIR_IN 0
+#define SOCK_DIR_OUT 1
+
+
+
+/* Queue data to be sent to client */
+int queueToSend(struct client_connection_t *connection,char *buffer,size_t bufsize,int timeout);
+
+/* Queue data to be received */
+int queueToReceive(struct client_connection_t *connection,char *buffer,size_t bufsize,int timeout);
+
+/* Queue raw data to be received */
+int queueToReceiveRaw(struct client_connection_t *connection,char *buffer,size_t bufsize,int timeout);
+
+/* Return 1 if socket is not in STATE_ERROR */
+int isSockOK(struct client_connection_t *connection);
+
+/* Close client connection */
+void closeConnection(struct client_connection_t *connection);
+
+/* Return the io result */
+inline int getIOResult(struct client_connection_t *connection);
+
+/* Return the iostate bufpos, for whatever reason we need it */
+inline size_t getIOBufPos(struct client_connection_t *connection);
+
+/* Return the iostate buflen, for whatever reason we need it */
+inline size_t getIOBufLen(struct client_connection_t *connection);
+
+
+#endif
+
Modified: branches/nonblocking_io/include/protocols.h
===================================================================
--- branches/nonblocking_io/include/protocols.h 2005-09-20 11:35:08 UTC (rev 108)
+++ branches/nonblocking_io/include/protocols.h 2005-09-22 05:37:44 UTC (rev 109)
@@ -25,14 +25,12 @@
#ifndef _PROTOCOLS_H
#define _PROTOCOLS_H
-#include "socklib.h"
-
/* Protocol handling functions */
struct protocol_funcs_t
{
- int (*startup) (struct clientConnection_t *connection);
- int (*handler) (struct clientConnection_t *connection);
+ int (*startup) (void *connectionData); /* struct client_connection_t */
+ int (*handler) (void *connectionData);
};
@@ -46,8 +44,6 @@
-
-
#endif
// vim:ts=4
Deleted: branches/nonblocking_io/include/socklib.h
===================================================================
--- branches/nonblocking_io/include/socklib.h 2005-09-20 11:35:08 UTC (rev 108)
+++ branches/nonblocking_io/include/socklib.h 2005-09-22 05:37:44 UTC (rev 109)
@@ -1,114 +0,0 @@
-/*
- * socklib.h - Socket handling functions header file
- * Copyright (C) 2002-2004, Linux Based Systems Design
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- *
- * 23/05/2004 - Nigel Kukard <nk...@lb...>
- * * Reworked network connection handling
- *
- * 22/01/2002 - Nigel Kukard <nk...@lb...>
- * * Initial design
- *
-*/
-
-#ifndef _SOCKLIB_H
-#define _SOCKLIB_H
-
-#include <glib.h>
-#include <grp.h>
-#include <pwd.h>
-#include "mailstore.h"
-
-
-/* Socket options */
-//#define MAX_CONNECTIONS 512
-//#define IP_LEN 16
-#define SOCK_IO_BUF_LEN 4096
-#define EOL "\r\n"
-
-/* Connection status */
-#define SOCK_STATE_FATAL_ERR -5
-#define SOCK_STATE_TIMEOUT -4
-#define SOCK_STATE_INTERNAL_ERR -3 /* This will prevent loops with broken code */
-#define SOCK_STATE_BUFFER_OVERFLOW -2
-#define SOCK_STATE_ERROR -1
-#define SOCK_STATE_NONE 0
-#define SOCK_STATE_PENDING 1
-#define SOCK_STATE_DONE 2
-#define SOCK_STATE_IDLE 3
-
-/* IO types */
-#define SOCK_IO_TYPE_NONE 0
-#define SOCK_IO_TYPE_LINE 1
-#define SOCK_IO_TYPE_RAW 2
-
-/* IO direction */
-#define SOCK_DIR_IN 0
-#define SOCK_DIR_OUT 1
-
-/* State of an io operation */
-struct iostate_t
-{
- int ioType:3; /* Type of IO we doing */
- int direction:2; /* either input or output */
- char *buffer; /* buffer pointer in the case of sending, actual buffer in the case of receiving */
- size_t bufsize; /* size of buffer, size to send or max size to get */
- size_t bufpos; /* current position in buffer, internal usage */
- size_t buflen; /* actual amount of io done */
- int timeout;
- long int curTimeout;
- int err;
- int state;
-};
-
-
-/* A client connection structure */
-struct clientConnection_t
-{
- int fd;
- char *hostname;
- char *recvBuffer; /* current command buffer */
- void *data; /* used by protocol */
- const struct sockData_t *sockData;
- // Internal info
- struct iostate_t ioState;
- struct auth_info_t *authInfo;
- struct storageCmds_t *storageCmds; /* This is not socket related, but connection related */
-};
-
-
-/* Tell main loop we want to send data */
-int queueToSend(struct clientConnection_t *connection,char *buffer,size_t bufsize,int timeout);
-/* Tell main loop we want a line */
-int queueToReceive(struct clientConnection_t *connection,char *buffer,size_t bufsize,int timeout);
-/* Tell main loop we want some raw data */
-int queueToReceiveRaw(struct clientConnection_t *connection,char *buffer,size_t bufsize,int timeout);
-/* Return 1 if socket is not in STATE_ERROR */
-int isSockOK(struct clientConnection_t *connection);
-/* Close client connection */
-void closeConnection(struct clientConnection_t *connection);
-/* Return the io result */
-inline int getIOResult(struct clientConnection_t *connection);
-/* Return the iostate bufpos, for whatever reason we need it */
-inline size_t getIOBufPos(struct clientConnection_t *connection);
-/* Return the iostate buflen, for whatever reason we need it */
-inline size_t getIOBufLen(struct clientConnection_t *connection);
-/* Main server accept() loop */
-int serverInit(GList *serverList);
-
-
-#endif
Modified: branches/nonblocking_io/modules/auth/auth.h
===================================================================
--- branches/nonblocking_io/modules/auth/auth.h 2005-09-20 11:35:08 UTC (rev 108)
+++ branches/nonblocking_io/modules/auth/auth.h 2005-09-22 05:37:44 UTC (rev 109)
@@ -29,7 +29,7 @@
#define AUTH_H
#include <stdlib.h>
-#include "socklib.h"
+#include "networkio.h"
/* Authentication result codes */
Modified: branches/nonblocking_io/modules/auth/pgsql/pgsql.c
===================================================================
--- branches/nonblocking_io/modules/auth/pgsql/pgsql.c 2005-09-20 11:35:08 UTC (rev 108)
+++ branches/nonblocking_io/modules/auth/pgsql/pgsql.c 2005-09-22 05:37:44 UTC (rev 109)
@@ -33,7 +33,7 @@
#include "debug.h"
#include "../auth.h"
#include "modules.h"
-#include "socklib.h"
+#include "networkio.h"
/* Our own status codes */
Modified: branches/nonblocking_io/modules/engines/Makefile.am
===================================================================
--- branches/nonblocking_io/modules/engines/Makefile.am 2005-09-20 11:35:08 UTC (rev 108)
+++ branches/nonblocking_io/modules/engines/Makefile.am 2005-09-22 05:37:44 UTC (rev 109)
@@ -1,6 +1,6 @@
-SUBDIRS=diskIO
+SUBDIRS=diskIO networkIO
noinst_LTLIBRARIES=libengines.la
libengines_la_SOURCES=
-libengines_la_LIBADD=diskIO/libdiskio.la
+libengines_la_LIBADD=diskIO/libdiskio.la networkIO/libnetworkio.la
Modified: branches/nonblocking_io/modules/engines/Makefile.in
===================================================================
--- branches/nonblocking_io/modules/engines/Makefile.in 2005-09-20 11:35:08 UTC (rev 108)
+++ branches/nonblocking_io/modules/engines/Makefile.in 2005-09-22 05:37:44 UTC (rev 109)
@@ -49,7 +49,8 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
-libengines_la_DEPENDENCIES = diskIO/libdiskio.la
+libengines_la_DEPENDENCIES = diskIO/libdiskio.la \
+ networkIO/libnetworkio.la
am_libengines_la_OBJECTS =
libengines_la_OBJECTS = $(am_libengines_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -183,10 +184,10 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = diskIO
+SUBDIRS = diskIO networkIO
noinst_LTLIBRARIES = libengines.la
libengines_la_SOURCES =
-libengines_la_LIBADD = diskIO/libdiskio.la
+libengines_la_LIBADD = diskIO/libdiskio.la networkIO/libnetworkio.la
all: all-recursive
.SUFFIXES:
Modified: branches/nonblocking_io/modules/engines/diskIO/c10klocaldisk/localdisk.c
===================================================================
--- branches/nonblocking_io/modules/engines/diskIO/c10klocaldisk/localdisk.c 2005-09-20 11:35:08 UTC (rev 108)
+++ branches/nonblocking_io/modules/engines/diskIO/c10klocaldisk/localdisk.c 2005-09-22 05:37:44 UTC (rev 109)
@@ -27,7 +27,7 @@
#include <stdlib.h>
#include "debug.h"
#include "modules.h"
-#include "../diskio.h"
+#include "diskio.h"
/*
Deleted: branches/nonblocking_io/modules/engines/diskIO/diskio.h
===================================================================
--- branches/nonblocking_io/modules/engines/diskIO/diskio.h 2005-09-20 11:35:08 UTC (rev 108)
+++ branches/nonblocking_io/modules/engines/diskIO/diskio.h 2005-09-22 05:37:44 UTC (rev 109)
@@ -1,86 +0,0 @@
-/*
- * diskio.h - Disk IO Abstraction Layer Header File
- * Copyright (C) 2002-2005, Linux Based Systems Design
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * 05/05/2005 - Nigel Kukard <nk...@lb...>
- * * Initial design
- *
-*/
-
-
-#ifndef _DISKIO_H
-#define _DISKIO_H
-
-#include <sys/types.h>
-
-
-/*
- * Res is passed back from the disk io engine, this is D_* style responses
- * The system error code can be retrieved using dio_getErrno()
- */
-#define DISKIO_CALLBACK_FUNC void (* callback) (struct dioFile_t *file, int res)
-
-
-/* File handle used by the disk IO stuff */
-struct dioFile_t
-{
- /* User stuff */
- void *context; // Extra data passed to callback function
- /* Internal stuff */
- DISKIO_CALLBACK_FUNC;
- int err; // This will be set to errno if the system encountered an error
- /* Module data */
- void *cmdStruct;
- void *moduleData;
-};
-
-
-/* Disk IO commands modules must implement */
-struct dioCmds_t
-{
- int (* dio_open) (struct dioFile_t *file, char *filename, int flags);
- int (* dio_read) (struct dioFile_t *file, void *buf, size_t count);
- int (* dio_write) (struct dioFile_t *file, const void *buf, size_t count);
- int (* dio_close) (struct dioFile_t *file);
-};
-
-
-
-/* Abstraction layer open function */
-int dio_open(void *context, char *filename, int flags, DISKIO_CALLBACK_FUNC);
-
-/* Abstraction layer read function */
-int dio_read(struct dioFile_t *file, void *buf, size_t count, DISKIO_CALLBACK_FUNC);
-
-/* Abstraction layer write function */
-int dio_write(struct dioFile_t *file, const void *buf, size_t count, DISKIO_CALLBACK_FUNC);
-
-/* Abstraction layer close function */
-int dio_close(struct dioFile_t *file, DISKIO_CALLBACK_FUNC);
-
-/* Set system response code */
-inline void dio_setErrno(struct dioFile_t *file, int err);
-
- /* Get system response code, if one */
-inline int dio_getErrno(struct dioFile_t *file);
-
-/* Get private data */
-inline void *dio_getContext(struct dioFile_t *file);
-
-
-#endif
-
Added: branches/nonblocking_io/modules/engines/networkIO/Makefile.am
===================================================================
--- branches/nonblocking_io/modules/engines/networkIO/Makefile.am 2005-09-20 11:35:08 UTC (rev 108)
+++ branches/nonblocking_io/modules/engines/networkIO/Makefile.am 2005-09-22 05:37:44 UTC (rev 109)
@@ -0,0 +1,10 @@
+GLIB_LIBS=@GLIB_LIBS@
+GLIB_CFLAGS=@GLIB_CFLAGS@
+
+SUBDIRS=c10k
+
+noinst_LTLIBRARIES = libnetworkio.la
+libnetworkio_la_SOURCES = networkio.c
+libnetworkio_la_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(AM_CFLAGS)
+
+
Added: branches/nonblocking_io/modules/engines/networkIO/Makefile.in
===================================================================
--- branches/nonblocking_io/modules/engines/networkIO/Makefile.in 2005-09-20 11:35:08 UTC (rev 108)
+++ branches/nonblocking_io/modules/engines/networkIO/Makefile.in 2005-09-22 05:37:44 UTC (rev 109)
@@ -0,0 +1,555 @@
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+SOURCES = $(libnetworkio_la_SOURCES)
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = modules/engines/networkIO
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libnetworkio_la_LIBADD =
+am_libnetworkio_la_OBJECTS = libnetworkio_la-networkio.lo
+libnetworkio_la_OBJECTS = $(am_libnetworkio_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libnetworkio_la_SOURCES)
+DIST_SOURCES = $(libnetworkio_la_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-exec-recursive install-info-recursive \
+ install-recursive installcheck-recursive installdirs-recursive \
+ pdf-recursive ps-recursive uninstall-info-recursive \
+ uninstall-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+XML2_CONFIG = @XML2_CONFIG@
+XML_CPPFLAGS = @XML_CPPFLAGS@
+XML_LIBS = @XML_LIBS@
+YACC = @YACC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+moduledir = @moduledir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+SUBDIRS = c10k
+noinst_LTLIBRARIES = libnetworkio.la
+libnetworkio_la_SOURCES = networkio.c
+libnetworkio_la_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(AM_CFLAGS)
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/engines/networkIO/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu modules/engines/networkIO/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+libnetworkio.la: $(libnetworkio_la_OBJECTS) $(libnetworkio_la_DEPENDENCIES)
+ $(LINK) $(libnetworkio_la_LDFLAGS) $(libnetworkio_la_OBJECTS) $(libnetworkio_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetworkio_la-networkio.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+libnetworkio_la-networkio.lo: networkio.c
+@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnetworkio_la_CFLAGS) $(CFLAGS) -MT libnetworkio_la-networkio.lo -MD -MP -MF "$(DEPDIR)/libnetworkio_la-networkio.Tpo" -c -o libnetworkio_la-networkio.lo `test -f 'networkio.c' || echo '$(srcdir)/'`networkio.c; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnetworkio_la-networkio.Tpo" "$(DEPDIR)/libnetworkio_la-networkio.Plo"; else rm -f "$(DEPDIR)/libnetworkio_la-networkio.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='networkio.c' object='libnetworkio_la-networkio.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnetworkio_la_CFLAGS) $(CFLAGS) -c -o libnetworkio_la-networkio.lo `test -f 'networkio.c' || echo '$(srcdir)/'`networkio.c
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+ if test -d $$d/$$file; then \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(LTLIBRARIES)
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+distclean: distclean-recursive
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-libtool distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+ clean clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ clean-recursive ctags ctags-recursive distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-recursive distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic maintainer-clean-recursive \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Added: branches/nonblocking_io/modules/engines/networkIO/c10k/Makefile.am
===================================================================
--- branches/nonblocking_io/modules/engines/networkIO/c10k/Makefile.am 2005-09-20 11:35:08 UTC (rev 108)
+++ branches/nonblocking_io/modules/engines/networkIO/c10k/Makefile.am 2005-09-22 05:37:44 UTC (rev 109)
@@ -0,0 +1,8 @@
+GLIB_LIBS=@GLIB_LIBS@
+GLIB_CFLAGS=@GLIB_CFLAGS@
+
+module_LTLIBRARIES = networkio_c10k.la
+networkio_c10k_la_SOURCES = c10k.c
+networkio_c10k_la_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(AM_CFLAGS)
+networkio_c10k_la_LDFLAGS = $(GLIB_LIBS) -module -avoid-version
+
Added: branches/nonblocking_io/modules/engines/networkIO/c10k/Makefile.in
===================================================================
--- branches/nonblocking_io/modules/engines/networkIO/c10k/Makefile.in 2005-09-20 11:35:08 UTC (rev 108)
+++ branches/nonblocking_io/modules/engines/networkIO/c10k/Makefile.in 2005-09-22 05:37:44 UTC (rev 109)
@@ -0,0 +1,474 @@
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+SOURCES = $(networkio_c10k_la_SOURCES)
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = modules/engines/networkIO/c10k
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(moduledir)"
+moduleLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(module_LTLIBRARIES)
+networkio_c10k_la_LIBADD =
+am_networkio_c10k_la_OBJECTS = networkio_c10k_la-c10k.lo
+networkio_c10k_la_OBJECTS = $(am_networkio_c10k_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(networkio_c10k_la_SOURCES)
+DIST_SOURCES = $(networkio_c10k_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+XML2_CONFIG = @XML2_CONFIG@
+XML_CPPFLAGS = @XML_CPPFLAGS@
+XML_LIBS = @XML_LIBS@
+YACC = @YACC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+moduledir = @moduledir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+module_LTLIBRARIES = networkio_c10k.la
+networkio_c10k_la_SOURCES = c10k.c
+networkio_c10k_la_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(AM_CFLAGS)
+networkio_c10k_la_LDFLAGS = $(GLIB_LIBS) -module -avoid-version
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/engines/networkIO/c10k/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu modules/engines/networkIO/c10k/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-moduleLTLIBRARIES: $(module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)"
+ @list='$(module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \
+ else :; fi; \
+ done
+
+uninstall-moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @set -x; list='$(module_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \
+ done
+
+clean-moduleLTLIBRARIES:
+ -test -z "$(module_LTLIBRARIES)" || rm -f $(module_LTLIBRARIES)
+ @list='$(module_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+networkio_c10k.la: $(networkio_c10k_la_OBJECTS) $(networkio_c10k_la_DEPENDENCIES)
+ $(LINK) -rpath $(moduledir) $(networkio_c10k_la_LDFLAGS) $(networkio_c10k_la_OBJECTS) $(networkio_c10k_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/networkio_c10k_la-c10k.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+networkio_c10k_la-c10k.lo: c10k.c
+@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(networkio_c10k_la_CFLAGS) $(CFLAGS) -MT networkio_c10k_la-c10k.lo -MD -MP -MF "$(DEPDIR)/networkio_c10k_la-c10k.Tpo" -c -o networkio_c10k_la-c10k.lo `test -f 'c10k.c' || echo '$(srcdir)/'`c10k.c; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/networkio_c10k_la-c10k.Tpo" "$(DEPDIR)/networkio_c10k_la-c10k.Plo"; else rm -f "$(DEPDIR)/networkio_c10k_la-c10k.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='c10k.c' object='networkio_c10k_la-c10k.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(networkio_c10k_la_CFLAGS) $(CFLAGS) -c -o networkio_c10k_la-c10k.lo `test -f 'c10k.c' || echo '$(srcdir)/'`c10k.c
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(m...
[truncated message content] |
