aboutsummaryrefslogtreecommitdiff
path: root/src/backend/storage/buffer
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2008-09-17 13:15:55 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2008-09-17 13:15:55 +0000
commit35c2a3c3cf8ef497b090c9dbfae1bf565c62b2a3 (patch)
treefa79e5ba6a59c64f31952ca0b445bed542c24585 /src/backend/storage/buffer
parent32f159cc55bacad6a4737d3584cb69698c33fc86 (diff)
downloadpostgresql-35c2a3c3cf8ef497b090c9dbfae1bf565c62b2a3.tar.gz
postgresql-35c2a3c3cf8ef497b090c9dbfae1bf565c62b2a3.zip
Allow ShowBufferUsage() to report the number of reads/writes that have
occurred to temporary files. This replaces the unused NDirectFileRead/NDirectFileWrite counters. Itagaki Takahiro
Diffstat (limited to 'src/backend/storage/buffer')
-rw-r--r--src/backend/storage/buffer/buf_init.c4
-rw-r--r--src/backend/storage/buffer/bufmgr.c14
2 files changed, 7 insertions, 11 deletions
diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c
index 7e92af04a16..93c47af5963 100644
--- a/src/backend/storage/buffer/buf_init.c
+++ b/src/backend/storage/buffer/buf_init.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/storage/buffer/buf_init.c,v 1.80 2008/01/01 19:45:51 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/storage/buffer/buf_init.c,v 1.81 2008/09/17 13:15:55 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -29,6 +29,8 @@ long int BufferHitCount;
long int LocalBufferHitCount;
long int BufferFlushCount;
long int LocalBufferFlushCount;
+long int BufFileReadCount;
+long int BufFileWriteCount;
/*
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index 281d23136dd..46b4e0afa4e 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.237 2008/08/11 11:05:11 heikki Exp $
+ * $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.238 2008/09/17 13:15:55 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -64,12 +64,6 @@ bool zero_damaged_pages = false;
int bgwriter_lru_maxpages = 100;
double bgwriter_lru_multiplier = 2.0;
-
-long NDirectFileRead; /* some I/O's are direct file access. bypass
- * bufmgr */
-long NDirectFileWrite; /* e.g., I/O in psort and hashjoin. */
-
-
/* local state for StartBufferIO and related functions */
static volatile BufferDesc *InProgressBuf = NULL;
static bool IsForInput;
@@ -1572,7 +1566,7 @@ ShowBufferUsage(void)
ReadLocalBufferCount - LocalBufferHitCount, LocalBufferFlushCount, localhitrate);
appendStringInfo(&str,
"!\tDirect blocks: %10ld read, %10ld written\n",
- NDirectFileRead, NDirectFileWrite);
+ BufFileReadCount, BufFileWriteCount);
return str.data;
}
@@ -1586,8 +1580,8 @@ ResetBufferUsage(void)
LocalBufferHitCount = 0;
ReadLocalBufferCount = 0;
LocalBufferFlushCount = 0;
- NDirectFileRead = 0;
- NDirectFileWrite = 0;
+ BufFileReadCount = 0;
+ BufFileWriteCount = 0;
}
/*