---------------------
PatchSet 2106 
Date: 2001/04/27 08:30:39
Author: akroonmaa
Branch: cpuProfiling
Tag: (none) 
Log:
add probes to disk.c

Members: 
	configure.in:1.19.10.2->1.19.10.3 
	src/disk.c:1.5.24.2->1.5.24.3 

Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/configure.in,v
retrieving revision 1.19.10.2
retrieving revision 1.19.10.3
diff -u -r1.19.10.2 -r1.19.10.3
--- squid/configure.in	18 Apr 2001 18:12:59 -0000	1.19.10.2
+++ squid/configure.in	27 Apr 2001 08:30:39 -0000	1.19.10.3
@@ -3,13 +3,13 @@
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.19.10.2 2001/04/18 18:12:59 akroonmaa Exp $
+dnl  $Id: configure.in,v 1.19.10.3 2001/04/27 08:30:39 akroonmaa Exp $
 dnl
 dnl
 dnl
 AC_INIT(src/main.c)
 AC_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.19.10.2 $)dnl
+AC_REVISION($Revision: 1.19.10.3 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AC_CONFIG_AUX_DIR(cfgaux)
 
@@ -904,7 +904,6 @@
   fi
 ])
 
-<<<<<<< configure.in
 dnl Enable USE_XPROF_STATS
 AC_ARG_ENABLE(cpu-profiling,
 [  --enable-cpu-profiling
@@ -924,7 +923,6 @@
   fi
 ])
 
-=======
 dnl Enable X-Accelerator-Vary for Vary support within an accelerator setup
 AC_ARG_ENABLE(x_accelerator_vary,
 [  --enable-x-accelerator-vary	Enable support for the X-Accelerator-Vary
@@ -938,7 +936,6 @@
   fi
 ])
 
->>>>>>> 1.20
 # Force some compilers to use ANSI features
 #
 case "$host" in
Index: squid/src/disk.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/disk.c,v
retrieving revision 1.5.24.2
retrieving revision 1.5.24.3
diff -u -r1.5.24.2 -r1.5.24.3
--- squid/src/disk.c	18 Apr 2001 18:13:00 -0000	1.5.24.2
+++ squid/src/disk.c	27 Apr 2001 08:30:39 -0000	1.5.24.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: disk.c,v 1.5.24.2 2001/04/18 18:13:00 akroonmaa Exp $
+ * $Id: disk.c,v 1.5.24.3 2001/04/27 08:30:39 akroonmaa Exp $
  *
  * DEBUG: section 6     Disk I/O Routines
  * AUTHOR: Harvest Derived
@@ -60,6 +60,7 @@
 file_open(const char *path, int mode)
 {
     int fd;
+    PROF(PR_start, "file_open");
     if (mode & O_WRONLY)
 	mode |= O_APPEND;
     mode |= SQUID_NONBLOCK;
@@ -75,6 +76,7 @@
 	commSetCloseOnExec(fd);
 	fd_open(fd, FD_FILE, path);
     }
+    PROF(PR_stop, "file_open");
     return fd;
 }
 
@@ -85,6 +87,7 @@
 {
     fde *F = &fd_table[fd];
     PF *read_callback;
+    PROF(PR_start, "file_close");
     assert(fd >= 0);
     assert(F->flags.open);
     if ((read_callback = F->read_handler)) {
@@ -102,6 +105,7 @@
 #else
 	F->flags.close_request = 1;
 	debug(6, 2) ("file_close: FD %d, delaying close\n", fd);
+	PROF(PR_stop, "file_close");
 	return;
 #endif
     }
@@ -119,6 +123,7 @@
 	("file_close: FD %d, really closing\n", fd);
     fd_close(fd);
     statCounter.syscalls.disk.closes++;
+    PROF(PR_stop, "file_close");
 }
 
 /*
@@ -304,6 +309,7 @@
 {
     dwrite_q *wq = NULL;
     fde *F = &fd_table[fd];
+    PROF(PR_start, "file_write");
     assert(fd >= 0);
     assert(F->flags.open);
     /* if we got here. Caller is eligible to write. */
@@ -328,6 +334,7 @@
 	cbdataLock(F->disk.wrt_handle_data);
 	diskHandleWrite(fd, NULL);
     }
+    PROF(PR_stop, "file_write");
 }
 
 /*
@@ -398,6 +405,7 @@
 file_read(int fd, char *buf, int req_len, off_t offset, DRCB * handler, void *client_data)
 {
     dread_ctrl *ctrl_dat;
+    PROF(PR_start, "file_read");
     assert(fd >= 0);
     ctrl_dat = memAllocate(MEM_DREAD_CTRL);
     ctrl_dat->fd = fd;
@@ -409,4 +417,5 @@
     ctrl_dat->client_data = client_data;
     cbdataLock(client_data);
     diskHandleRead(fd, ctrl_dat);
+    PROF(PR_stop, "file_read");
 }