66 * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
77 * Portions Copyright (c) 1994, Regents of the University of California
88 *
9- * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.52 2001/02/1308:44:09 vadim Exp $
9+ * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.53 2001/02/1320:40:25 vadim Exp $
1010 *
1111 *-------------------------------------------------------------------------
1212 */
@@ -612,6 +612,7 @@ begin:;
612612if (updrqst )
613613{
614614S_LOCK (& (XLogCtl -> info_lck ));
615+ LgwrResult = XLogCtl -> LgwrResult ;
615616if (XLByteLT (XLogCtl -> LgwrRqst .Write ,LgwrRqst .Write ))
616617XLogCtl -> LgwrRqst .Write = LgwrRqst .Write ;
617618S_UNLOCK (& (XLogCtl -> info_lck ));
@@ -760,6 +761,10 @@ XLogFlush(XLogRecPtr record)
760761
761762}
762763
764+ /*
765+ * We use this routine when Insert->curridx block is full and the next XLOG
766+ * buffer looks as unwritten to OS' cache. insert_lck is assumed here.
767+ */
763768static void
764769GetFreeXLBuffer ()
765770{
@@ -768,12 +773,24 @@ GetFreeXLBuffer()
768773uint16 curridx = NextBufIdx (Insert -> curridx );
769774unsigned spins = 0 ;
770775
776+ /* Use Insert->LgwrResult copy if it's more fresh */
777+ if (XLByteLT (LgwrResult .Write ,Insert -> LgwrResult .Write ))
778+ {
779+ LgwrResult = Insert -> LgwrResult ;
780+ if (XLByteLE (XLogCtl -> xlblocks [curridx ],LgwrResult .Write ))
781+ {
782+ InitXLBuffer (curridx );
783+ return ;
784+ }
785+ }
786+
771787LgwrRqst .Write = XLogCtl -> xlblocks [Insert -> curridx ];
772788for (;;)
773789{
774790if (!TAS (& (XLogCtl -> info_lck )))
775791{
776792LgwrResult = XLogCtl -> LgwrResult ;
793+ /* LgwrRqst.Write GE XLogCtl->LgwrRqst.Write */
777794XLogCtl -> LgwrRqst .Write = LgwrRqst .Write ;
778795S_UNLOCK (& (XLogCtl -> info_lck ));
779796if (XLByteLE (XLogCtl -> xlblocks [curridx ],LgwrResult .Write ))