#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.28 1996/07/11 17:42:34 wessels Exp $
+# $Id: Makefile.in,v 1.29 1996/07/15 23:48:27 wessels Exp $
#
# Uncomment and customize the following to suit your needs:
#
HOST_OPT = # -DCACHEMGR_HOSTNAME="getfullhostname()"
-DEFINES = $(HOST_OPT)
+AIO_OPT = # -DUSE_ASYNC_IO=1
+AIO_LIB = # -labi
+DEFINES = $(HOST_OPT) $(AIO_OPT)
prefix = @prefix@
exec_prefix = @exec_prefix@
CRYPT_LIB = @CRYPT_LIB@
AC_CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@
-XTRA_LIBS = @XTRA_LIBS@
+XTRA_LIBS = @XTRA_LIBS@ $(AIO_LIB)
XTRA_OBJS = @XTRA_OBJS@
MV = @MV@
RM = @RM@
/*
- * $Id: disk.cc,v 1.17 1996/07/09 23:01:16 wessels Exp $
+ * $Id: disk.cc,v 1.18 1996/07/15 23:48:32 wessels Exp $
*
* DEBUG: section 6 Disk I/O Routines
* AUTHOR: Harvest Derived
/* got to start write routine for this fd */
#if USE_ASYNC_IO
return aioFileQueueWrite(fd,
- file_aio_write_complete,
+ aioFileWriteComplete,
&file_table[fd]);
#else
comm_set_select_handler(fd,
ctrl_dat->client_data = client_data;
#if USE_ASYNC_IO
- return aioFileQueueRead(fd, file_aio_read_complete, ctrl_dat);
+ return aioFileQueueRead(fd, aioFileReadComplete, ctrl_dat);
#else
comm_set_select_handler(fd,
COMM_SELECT_READ,
/*
- * $Id: main.cc,v 1.50 1996/07/14 05:35:54 wessels Exp $
+ * $Id: main.cc,v 1.51 1996/07/15 23:48:34 wessels Exp $
*
* DEBUG: section 1 Startup and Main Loop
* AUTHOR: Harvest Derived
squid_signal(SIGPIPE, SIG_IGN, SA_RESTART);
squid_signal(SIGCHLD, sig_child, SA_NODEFER | SA_RESTART);
#if USE_ASYNC_IO
+ if (first_time)
+ aio_init();
squid_signal(SIGIO, aioSigHandler, SA_RESTART);
#endif
debug(1, 1, "With %d file descriptors available\n", FD_SETSIZE);
if (first_time) {
+ stmemInit(); /* stmem must go before at least redirect */
disk_init(); /* disk_init must go before ipcache_init() */
writePidFile(); /* write PID file */
}
urlInitialize();
stat_init(&CacheInfo, getAccessLogFile());
storeInit();
- stmemInit();
if (getEffectiveUser()) {
/* we were probably started as root, so cd to a swap
/*
- * $Id: squid.h,v 1.26 1996/07/11 17:42:53 wessels Exp $
+ * $Id: squid.h,v 1.27 1996/07/15 23:48:36 wessels Exp $
*
* AUTHOR: Duane Wessels
*
#include "acl.h"
#include "util.h"
#include "background.h"
+#include "async_io.h"
#include "redirect.h"
#if !HAVE_TEMPNAM
+
/*
- * $Id: tools.cc,v 1.43 1996/07/09 03:41:45 wessels Exp $
+ * $Id: tools.cc,v 1.44 1996/07/15 23:48:38 wessels Exp $
*
* DEBUG: section 21 Misc Functions
* AUTHOR: Harvest Derived
time_t getCurrentTime()
{
-#if defined(_SQUID_MOTOROLA_)
+#if GETTIMEOFDAY_NO_TZP
gettimeofday(¤t_time);
#else
gettimeofday(¤t_time, NULL);