diff options
Diffstat (limited to 'src/backend/commands')
| -rw-r--r-- | src/backend/commands/sequence.c | 10 | ||||
| -rw-r--r-- | src/backend/commands/vacuum.c | 18 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c index 64fc0102a87..f6e63283121 100644 --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/sequence.c,v 1.47 2000/12/28 13:00:17 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/sequence.c,v 1.48 2001/01/12 21:53:56 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -301,7 +301,7 @@ nextval(PG_FUNCTION_ARGS) elm->last = result; /* last returned number */ elm->cached = last; /* last fetched number */ - START_CRIT_CODE; + START_CRIT_SECTION(); if (logit) { xl_seq_rec xlrec; @@ -338,7 +338,7 @@ nextval(PG_FUNCTION_ARGS) seq->is_called = 't'; Assert(log >= 0); seq->log_cnt = log; /* how much is logged */ - END_CRIT_CODE; + END_CRIT_SECTION(); LockBuffer(buf, BUFFER_LOCK_UNLOCK); @@ -398,7 +398,7 @@ do_setval(char *seqname, int32 next, bool iscalled) elm->last = next; /* last returned number */ elm->cached = next; /* last cached number (forget cached values) */ - START_CRIT_CODE; + START_CRIT_SECTION(); { xl_seq_rec xlrec; XLogRecPtr recptr; @@ -429,7 +429,7 @@ do_setval(char *seqname, int32 next, bool iscalled) seq->last_value = next; /* last fetched number */ seq->is_called = iscalled ? 't' : 'f'; seq->log_cnt = (iscalled) ? 0 : 1; - END_CRIT_CODE; + END_CRIT_SECTION(); LockBuffer(buf, BUFFER_LOCK_UNLOCK); diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index 738d9e72838..76425652b97 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.181 2000/12/30 15:19:55 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.182 2001/01/12 21:53:56 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1427,7 +1427,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel, Cpage = BufferGetPage(Cbuf); /* NO ELOG(ERROR) TILL CHANGES ARE LOGGED */ - START_CRIT_CODE; + START_CRIT_SECTION(); Citemid = PageGetItemId(Cpage, ItemPointerGetOffsetNumber(&(tuple.t_self))); @@ -1512,7 +1512,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel, PageSetLSN(ToPage, recptr); PageSetSUI(ToPage, ThisStartUpID); } - END_CRIT_CODE; + END_CRIT_SECTION(); if (((int) destvacpage->blkno) > last_move_dest_block) last_move_dest_block = destvacpage->blkno; @@ -1637,7 +1637,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel, newtup.t_data->t_infomask |= HEAP_MOVED_IN; /* NO ELOG(ERROR) TILL CHANGES ARE LOGGED */ - START_CRIT_CODE; + START_CRIT_SECTION(); /* add tuple to the page */ newoff = PageAddItem(ToPage, (Item) newtup.t_data, tuple_len, @@ -1675,7 +1675,7 @@ failed to add item with len = %lu to page %u (free space %lu, nusd %u, noff %u)" PageSetLSN(ToPage, recptr); PageSetSUI(ToPage, ThisStartUpID); } - END_CRIT_CODE; + END_CRIT_SECTION(); cur_page->offsets_used++; num_moved++; @@ -1905,7 +1905,7 @@ failed to add item with len = %lu to page %u (free space %lu, nusd %u, noff %u)" buf = ReadBuffer(onerel, vacpage->blkno); LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE); - START_CRIT_CODE; + START_CRIT_SECTION(); page = BufferGetPage(buf); num_tuples = 0; for (offnum = FirstOffsetNumber; @@ -1941,7 +1941,7 @@ failed to add item with len = %lu to page %u (free space %lu, nusd %u, noff %u)" PageSetLSN(page, recptr); PageSetSUI(page, ThisStartUpID); } - END_CRIT_CODE; + END_CRIT_SECTION(); LockBuffer(buf, BUFFER_LOCK_UNLOCK); WriteBuffer(buf); } @@ -2056,7 +2056,7 @@ vacuum_page(Relation onerel, Buffer buffer, VacPage vacpage) /* There shouldn't be any tuples moved onto the page yet! */ Assert(vacpage->offsets_used == 0); - START_CRIT_CODE; + START_CRIT_SECTION(); for (i = 0; i < vacpage->offsets_free; i++) { itemid = &(((PageHeader) page)->pd_linp[vacpage->offsets[i] - 1]); @@ -2070,7 +2070,7 @@ vacuum_page(Relation onerel, Buffer buffer, VacPage vacpage) PageSetLSN(page, recptr); PageSetSUI(page, ThisStartUpID); } - END_CRIT_CODE; + END_CRIT_SECTION(); } |