Skip to content

P
Postgres FD Implementation
Commit 201aa35d authored by Tom Lane's avatar Tom Lane
Browse files
Options

gcc did not like new pg_stat macros, for good and sufficient reason. 

Add 'do { ... } while (0)' decoration to eliminate compiler warnings.
parent b6f75fe7
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 43 deletions
src/include/pgstat.h
View file @ 201aa35d
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* *
* Copyright (c) 2001, PostgreSQL Global Development Group * Copyright (c) 2001, PostgreSQL Global Development Group
* *
* $Id: pgstat.h,v 1.2 2001/06/29 16:29:37 wieck Exp $ * $Id: pgstat.h,v 1.3 2001/06/29 23:03:02 tgl Exp $
* ---------- * ----------
*/ */
#ifndef PGSTAT_H #ifndef PGSTAT_H
...@@ -349,61 +349,83 @@ extern void pgstat_initstats(PgStat_Info *stats, Relation rel); ...@@ -349,61 +349,83 @@ extern void pgstat_initstats(PgStat_Info *stats, Relation rel);
#define pgstat_reset_heap_scan(s) \ #define pgstat_reset_heap_scan(s) \
if ((s)->tabentry != NULL) \ do { \
(s)->heap_scan_counted = FALSE if ((s)->tabentry != NULL) \
(s)->heap_scan_counted = FALSE; \
} while (0)
#define pgstat_count_heap_scan(s) \ #define pgstat_count_heap_scan(s) \
if ((s)->tabentry != NULL && !(s)->heap_scan_counted) { \ do { \
((PgStat_TableEntry *)((s)->tabentry))->t_numscans++; \ if ((s)->tabentry != NULL && !(s)->heap_scan_counted) { \
(s)->heap_scan_counted = TRUE; \ ((PgStat_TableEntry *)((s)->tabentry))->t_numscans++; \
} (s)->heap_scan_counted = TRUE; \
} \
} while (0)
#define pgstat_count_heap_getnext(s) \ #define pgstat_count_heap_getnext(s) \
if ((s)->tabentry != NULL) \ do { \
((PgStat_TableEntry *)((s)->tabentry))->t_tuples_returned++ if ((s)->tabentry != NULL) \
((PgStat_TableEntry *)((s)->tabentry))->t_tuples_returned++; \
} while (0)
#define pgstat_count_heap_fetch(s) \ #define pgstat_count_heap_fetch(s) \
if ((s)->tabentry != NULL) \ do { \
((PgStat_TableEntry *)((s)->tabentry))->t_tuples_fetched++ if ((s)->tabentry != NULL) \
((PgStat_TableEntry *)((s)->tabentry))->t_tuples_fetched++; \
} while (0)
#define pgstat_count_heap_insert(s) \ #define pgstat_count_heap_insert(s) \
if ((s)->tabentry != NULL) \ do { \
((PgStat_TableEntry *)((s)->tabentry))->t_tuples_inserted++ if ((s)->tabentry != NULL) \
((PgStat_TableEntry *)((s)->tabentry))->t_tuples_inserted++; \
} while (0)
#define pgstat_count_heap_update(s) \ #define pgstat_count_heap_update(s) \
if ((s)->tabentry != NULL) \ do { \
((PgStat_TableEntry *)((s)->tabentry))->t_tuples_updated++ if ((s)->tabentry != NULL) \
((PgStat_TableEntry *)((s)->tabentry))->t_tuples_updated++; \
} while (0)
#define pgstat_count_heap_delete(s) \ #define pgstat_count_heap_delete(s) \
if ((s)->tabentry != NULL) \ do { \
((PgStat_TableEntry *)((s)->tabentry))->t_tuples_deleted++ if ((s)->tabentry != NULL) \
((PgStat_TableEntry *)((s)->tabentry))->t_tuples_deleted++; \
} while (0)
#define pgstat_reset_index_scan(s) \ #define pgstat_reset_index_scan(s) \
if ((s)->tabentry != NULL) \ do { \
(s)->index_scan_counted = FALSE if ((s)->tabentry != NULL) \
(s)->index_scan_counted = FALSE; \
} while (0)
#define pgstat_count_index_scan(s) \ #define pgstat_count_index_scan(s) \
if ((s)->tabentry != NULL && !(s)->index_scan_counted) { \ do { \
((PgStat_TableEntry *)((s)->tabentry))->t_numscans++; \ if ((s)->tabentry != NULL && !(s)->index_scan_counted) { \
(s)->index_scan_counted = TRUE; \ ((PgStat_TableEntry *)((s)->tabentry))->t_numscans++; \
} (s)->index_scan_counted = TRUE; \
} \
} while (0)
#define pgstat_count_index_getnext(s) \ #define pgstat_count_index_getnext(s) \
if ((s)->tabentry != NULL) \ do { \
((PgStat_TableEntry *)((s)->tabentry))->t_tuples_returned++ if ((s)->tabentry != NULL) \
((PgStat_TableEntry *)((s)->tabentry))->t_tuples_returned++; \
} while (0)
#define pgstat_count_buffer_read(s,r) \ #define pgstat_count_buffer_read(s,r) \
if ((s)->tabentry != NULL) \ do { \
((PgStat_TableEntry *)((s)->tabentry))->t_blocks_fetched++; \ if ((s)->tabentry != NULL) \
else { \ ((PgStat_TableEntry *)((s)->tabentry))->t_blocks_fetched++; \
if (!(s)->no_stats) { \ else { \
pgstat_initstats((s), (r)); \ if (!(s)->no_stats) { \
if ((s)->tabentry != NULL) \ pgstat_initstats((s), (r)); \
((PgStat_TableEntry *)((s)->tabentry))->t_blocks_fetched++; \ if ((s)->tabentry != NULL) \
((PgStat_TableEntry *)((s)->tabentry))->t_blocks_fetched++; \
} \
} \ } \
} } while (0)
#define pgstat_count_buffer_hit(s,r) \ #define pgstat_count_buffer_hit(s,r) \
if ((s)->tabentry != NULL) \ do { \
((PgStat_TableEntry *)((s)->tabentry))->t_blocks_hit++; \ if ((s)->tabentry != NULL) \
else { \ ((PgStat_TableEntry *)((s)->tabentry))->t_blocks_hit++; \
if (!(s)->no_stats) { \ else { \
pgstat_initstats((s), (r)); \ if (!(s)->no_stats) { \
if ((s)->tabentry != NULL) \ pgstat_initstats((s), (r)); \
((PgStat_TableEntry *)((s)->tabentry))->t_blocks_hit++; \ if ((s)->tabentry != NULL) \
((PgStat_TableEntry *)((s)->tabentry))->t_blocks_hit++; \
} \
} \ } \
} } while (0)
extern void pgstat_count_xact_commit(void); extern void pgstat_count_xact_commit(void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment