Change memory-space accounting mechanism in tuplesort.c and tuplestore.c

[postgresql] / src / backend / utils / init / globals.c

diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
index ba109f35008d4005eea2c4773693b487f43052b8..51a729c49c6920e7cd513802fa0b7b14f5bbcea7 100644 (file)
--- a/src/backend/utils/init/globals.c
+++ b/src/backend/utils/init/globals.c
@@ -1,13 +1,14 @@
 /*-------------------------------------------------------------------------
  *
- * globals.c--
+ * globals.c
  *       global variable declarations
  *
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.16 1997/11/15 20:57:27 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.66 2002/08/12 00:36:11 tgl Exp $
  *
  * NOTES
  *       Globals used all over the place should be declared here and not
@@ -15,59 +16,49 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/file.h>
-#include <sys/types.h>
-#include <math.h>
-#include <unistd.h>
-
 #include "postgres.h"
-#include "miscadmin.h"                 /* where the declarations go */
 
-#include <storage/backendid.h>
-#include "access/heapam.h"
-#include "utils/tqual.h"
-#include "storage/sinval.h"
-#include "storage/sinvaladt.h"
-#include "storage/lmgr.h"
-#include "utils/elog.h"
+#include "libpq/pqcomm.h"
+#include "miscadmin.h"
+#include "storage/backendid.h"
+
+
+ProtocolVersion FrontendProtocol = PG_PROTOCOL_LATEST;
 
-#include "catalog/catname.h"
+bool           Noversion = false;
 
-int                    Portfd = -1;
-int                    Noversion = 0;
-int                    Quiet = 1;
+volatile bool InterruptPending = false;
+volatile bool QueryCancelPending = false;
+volatile bool ProcDiePending = false;
+volatile bool ImmediateInterruptOK = false;
+volatile uint32 InterruptHoldoffCount = 0;
+volatile uint32 CritSectionCount = 0;
 
-int                    MasterPid;
-char      *DataDir;
+int                    MyProcPid;
+struct Port *MyProcPort;
+long           MyCancelKey;
 
+char      *DataDir = NULL;
  /*
   * The PGDATA directory user says to use, or defaults to via environment
   * variable.  NULL if no option given and no environment variable set
   */
-Relation       reldesc;                        /* current relation descriptor */
 
-char           OutputFileName[MAXPGPATH] = "";
+char           OutputFileName[MAXPGPATH];
+
+char           pg_pathname[MAXPGPATH];         /* full path to postgres
+                                                                                * executable */
 
 BackendId      MyBackendId;
-BackendTag     MyBackendTag;
 
-char      *UserName = NULL;
 char      *DatabaseName = NULL;
 char      *DatabasePath = NULL;
 
-bool           MyDatabaseIdIsInitialized = false;
 Oid                    MyDatabaseId = InvalidOid;
-bool           TransactionInitWasProcessed = false;
 
 bool           IsUnderPostmaster = false;
-bool           IsPostmaster = false;
-
-short          DebugLvl = 0;
 
-int                    DateStyle = USE_POSTGRES_DATES;
+int                    DateStyle = USE_ISO_DATES;
 bool           EuroDates = false;
 bool           HasCTZSet = false;
 bool           CDayLight = false;
@@ -78,38 +69,8 @@ char         DateFormat[20] = "%d-%m-%Y";            /* mjl: sizes! or better
                                                                                                 * malloc? XXX */
 char           FloatFormat[20] = "%f";
 
-int                    fsyncOff = 0;
-int                    SortMem = 512;
-
-char      *IndexedCatalogNames[] = {
-       AttributeRelationName,
-       ProcedureRelationName,
-       TypeRelationName,
-       RelationRelationName,
-       0
-};
-
-
-/* ----------------
- * we just do a linear search now so there's no requirement that the list
- * be ordered. The list is so small it shouldn't make much difference.
- * make sure the list is null-terminated
- *                             - jolly 8/19/95
- *
- * OLD COMMENT
- *             WARNING  WARNING  WARNING  WARNING      WARNING  WARNING
- *
- *             keep SharedSystemRelationNames[] in SORTED order!  A binary search
- *             is done on it in catalog.c!
- *
- *             XXX this is a serious hack which should be fixed -cim 1/26/90
- * ----------------
- */
-char      *SharedSystemRelationNames[] = {
-       DatabaseRelationName,
-       GroupRelationName,
-       LogRelationName,
-       UserRelationName,
-       VariableRelationName,
-       0
-};
+bool           enableFsync = true;
+bool           allowSystemTableMods = false;
+int                    SortMem = 1024;
+int                    VacuumMem = 8192;
+int                    NBuffers = DEF_NBUFFERS;