summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
Diffstat (limited to 'src/include')
-rw-r--r--src/include/miscadmin.h4
-rw-r--r--src/include/storage/lock.h28
-rw-r--r--src/include/storage/proc.h22
-rw-r--r--src/include/storage/sinval.h6
-rw-r--r--src/include/storage/sinvaladt.h4
-rw-r--r--src/include/utils/datetime.h6
-rw-r--r--src/include/utils/exc.h4
7 files changed, 37 insertions, 37 deletions
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 2e5fc76bb7d..1310b9f2787 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -12,7 +12,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: miscadmin.h,v 1.104 2002/05/17 01:19:19 tgl Exp $
+ * $Id: miscadmin.h,v 1.105 2002/06/11 13:40:52 wieck Exp $
*
* NOTES
* some of the information in this file should be moved to
@@ -203,7 +203,7 @@ extern char *ExpandDatabasePath(const char *path);
extern void SetDatabaseName(const char *name);
extern void SetDatabasePath(const char *path);
-extern char *GetUserName(Oid userid);
+extern char *GetUserNameFromId(Oid userid);
extern Oid GetUserId(void);
extern void SetUserId(Oid userid);
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index 6b319b74e36..dc7e7b7577e 100644
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: lock.h,v 1.59 2001/11/05 17:46:35 momjian Exp $
+ * $Id: lock.h,v 1.60 2002/06/11 13:40:52 wieck Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,12 +22,12 @@
/* originally in procq.h */
typedef struct PROC_QUEUE
{
- SHM_QUEUE links; /* head of list of PROC objects */
+ SHM_QUEUE links; /* head of list of PGPROC objects */
int size; /* number of entries in list */
} PROC_QUEUE;
-/* struct PROC is declared in storage/proc.h, but must forward-reference it */
-typedef struct PROC PROC;
+/* struct PGPROC is declared in storage/proc.h, but must forward-reference it */
+typedef struct PGPROC PGPROC;
extern int max_locks_per_xact;
@@ -161,7 +161,7 @@ typedef struct LOCK
int grantMask; /* bitmask for lock types already granted */
int waitMask; /* bitmask for lock types awaited */
SHM_QUEUE lockHolders; /* list of HOLDER objects assoc. with lock */
- PROC_QUEUE waitProcs; /* list of PROC objects waiting on lock */
+ PROC_QUEUE waitProcs; /* list of PGPROC objects waiting on lock */
int requested[MAX_LOCKMODES]; /* counts of requested
* locks */
int nRequested; /* total of requested[] array */
@@ -181,8 +181,8 @@ typedef struct LOCK
* holder hashtable. A HOLDERTAG value uniquely identifies a lock holder.
*
* There are two possible kinds of holder tags: a transaction (identified
- * both by the PROC of the backend running it, and the xact's own ID) and
- * a session (identified by backend PROC, with xid = InvalidTransactionId).
+ * both by the PGPROC of the backend running it, and the xact's own ID) and
+ * a session (identified by backend PGPROC, with xid = InvalidTransactionId).
*
* Currently, session holders are used for user locks and for cross-xact
* locks obtained for VACUUM. We assume that a session lock never conflicts
@@ -195,15 +195,15 @@ typedef struct LOCK
* as soon as convenient.
*
* Each HOLDER object is linked into lists for both the associated LOCK object
- * and the owning PROC object. Note that the HOLDER is entered into these
+ * and the owning PGPROC object. Note that the HOLDER is entered into these
* lists as soon as it is created, even if no lock has yet been granted.
- * A PROC that is waiting for a lock to be granted will also be linked into
+ * A PGPROC that is waiting for a lock to be granted will also be linked into
* the lock's waitProcs queue.
*/
typedef struct HOLDERTAG
{
SHMEM_OFFSET lock; /* link to per-lockable-object information */
- SHMEM_OFFSET proc; /* link to PROC of owning backend */
+ SHMEM_OFFSET proc; /* link to PGPROC of owning backend */
TransactionId xid; /* xact ID, or InvalidTransactionId */
} HOLDERTAG;
@@ -235,16 +235,16 @@ extern bool LockAcquire(LOCKMETHOD lockmethod, LOCKTAG *locktag,
TransactionId xid, LOCKMODE lockmode, bool dontWait);
extern bool LockRelease(LOCKMETHOD lockmethod, LOCKTAG *locktag,
TransactionId xid, LOCKMODE lockmode);
-extern bool LockReleaseAll(LOCKMETHOD lockmethod, PROC *proc,
+extern bool LockReleaseAll(LOCKMETHOD lockmethod, PGPROC *proc,
bool allxids, TransactionId xid);
extern int LockCheckConflicts(LOCKMETHODTABLE *lockMethodTable,
LOCKMODE lockmode,
- LOCK *lock, HOLDER *holder, PROC *proc,
+ LOCK *lock, HOLDER *holder, PGPROC *proc,
int *myHolding);
extern void GrantLock(LOCK *lock, HOLDER *holder, LOCKMODE lockmode);
-extern void RemoveFromWaitQueue(PROC *proc);
+extern void RemoveFromWaitQueue(PGPROC *proc);
extern int LockShmemSize(int maxBackends);
-extern bool DeadLockCheck(PROC *proc);
+extern bool DeadLockCheck(PGPROC *proc);
extern void InitDeadLockChecking(void);
#ifdef LOCK_DEBUG
diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h
index e276fddf9cd..d1e915c1ca9 100644
--- a/src/include/storage/proc.h
+++ b/src/include/storage/proc.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: proc.h,v 1.55 2002/05/05 00:03:29 tgl Exp $
+ * $Id: proc.h,v 1.56 2002/06/11 13:40:52 wieck Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,14 +21,14 @@
/*
- * Each backend has a PROC struct in shared memory. There is also a list of
- * currently-unused PROC structs that will be reallocated to new backends.
+ * Each backend has a PGPROC struct in shared memory. There is also a list of
+ * currently-unused PGPROC structs that will be reallocated to new backends.
*
- * links: list link for any list the PROC is in. When waiting for a lock,
- * the PROC is linked into that lock's waitProcs queue. A recycled PROC
+ * links: list link for any list the PGPROC is in. When waiting for a lock,
+ * the PGPROC is linked into that lock's waitProcs queue. A recycled PGPROC
* is linked into ProcGlobal's freeProcs list.
*/
-struct PROC
+struct PGPROC
{
/* proc->links MUST BE FIRST IN STRUCT (see ProcSleep,ProcWakeup,etc) */
SHM_QUEUE links; /* list link if process is in a list */
@@ -56,7 +56,7 @@ struct PROC
/* Info about LWLock the process is currently waiting for, if any. */
bool lwWaiting; /* true if waiting for an LW lock */
bool lwExclusive; /* true if waiting for exclusive access */
- struct PROC *lwWaitLink; /* next waiter for same LW lock */
+ struct PGPROC *lwWaitLink; /* next waiter for same LW lock */
/* Info about lock the process is currently waiting for, if any. */
/* waitLock and waitHolder are NULL if not currently waiting. */
@@ -70,10 +70,10 @@ struct PROC
* or awaited by this backend */
};
-/* NOTE: "typedef struct PROC PROC" appears in storage/lock.h. */
+/* NOTE: "typedef struct PGPROC PGPROC" appears in storage/lock.h. */
-extern PROC *MyProc;
+extern PGPROC *MyProc;
/*
@@ -81,7 +81,7 @@ extern PROC *MyProc;
*/
typedef struct PROC_HDR
{
- /* Head of list of free PROC structures */
+ /* Head of list of free PGPROC structures */
SHMEM_OFFSET freeProcs;
} PROC_HDR;
@@ -102,7 +102,7 @@ extern void ProcReleaseLocks(bool isCommit);
extern void ProcQueueInit(PROC_QUEUE *queue);
extern int ProcSleep(LOCKMETHODTABLE *lockMethodTable, LOCKMODE lockmode,
LOCK *lock, HOLDER *holder);
-extern PROC *ProcWakeup(PROC *proc, int errType);
+extern PGPROC *ProcWakeup(PGPROC *proc, int errType);
extern void ProcLockWakeup(LOCKMETHODTABLE *lockMethodTable, LOCK *lock);
extern bool LockWaitCancel(void);
extern void HandleDeadLock(SIGNAL_ARGS);
diff --git a/src/include/storage/sinval.h b/src/include/storage/sinval.h
index e679910e253..e33be3a31c0 100644
--- a/src/include/storage/sinval.h
+++ b/src/include/storage/sinval.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: sinval.h,v 1.26 2002/03/03 17:47:56 tgl Exp $
+ * $Id: sinval.h,v 1.27 2002/06/11 13:40:52 wieck Exp $
*
*-------------------------------------------------------------------------
*/
@@ -86,7 +86,7 @@ extern bool TransactionIdIsInProgress(TransactionId xid);
extern TransactionId GetOldestXmin(bool allDbs);
extern int CountActiveBackends(void);
-/* Use "struct PROC", not PROC, to avoid including proc.h here */
-extern struct PROC *BackendIdGetProc(BackendId procId);
+/* Use "struct PGPROC", not PGPROC, to avoid including proc.h here */
+extern struct PGPROC *BackendIdGetProc(BackendId procId);
#endif /* SINVAL_H */
diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h
index 824e978e959..6b8ea7e55dc 100644
--- a/src/include/storage/sinvaladt.h
+++ b/src/include/storage/sinvaladt.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: sinvaladt.h,v 1.30 2001/11/05 17:46:35 momjian Exp $
+ * $Id: sinvaladt.h,v 1.31 2002/06/11 13:40:52 wieck Exp $
*
*-------------------------------------------------------------------------
*/
@@ -71,7 +71,7 @@ typedef struct ProcState
/* nextMsgNum is -1 in an inactive ProcState array entry. */
int nextMsgNum; /* next message number to read, or -1 */
bool resetState; /* true, if backend has to reset its state */
- SHMEM_OFFSET procStruct; /* location of backend's PROC struct */
+ SHMEM_OFFSET procStruct; /* location of backend's PGPROC struct */
} ProcState;
/* Shared cache invalidation memory segment */
diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h
index 46d8753ff43..f998f4517d5 100644
--- a/src/include/utils/datetime.h
+++ b/src/include/utils/datetime.h
@@ -9,7 +9,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: datetime.h,v 1.30 2002/05/17 01:19:19 tgl Exp $
+ * $Id: datetime.h,v 1.31 2002/06/11 13:40:52 wieck Exp $
*
*-------------------------------------------------------------------------
*/
@@ -95,7 +95,7 @@
#define TZ 5
#define DTZ 6
#define DTZMOD 7
-#define IGNORE 8
+#define IGNORE_DTF 8
#define AMPM 9
#define HOUR 10
#define MINUTE 11
@@ -260,7 +260,7 @@ extern int day_tab[2][13];
|| (((m) == UTIME_MAXMONTH) && ((d) <= UTIME_MAXDAY))))))
-extern void GetCurrentTime(struct tm * tm);
+extern void GetCurrentDateTime(struct tm * tm);
extern void GetCurrentTimeUsec(struct tm * tm, fsec_t *fsec);
extern void j2date(int jd, int *year, int *month, int *day);
extern int date2j(int year, int month, int day);
diff --git a/src/include/utils/exc.h b/src/include/utils/exc.h
index 72a09e48742..8b219b51fa8 100644
--- a/src/include/utils/exc.h
+++ b/src/include/utils/exc.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: exc.h,v 1.22 2001/11/05 17:46:36 momjian Exp $
+ * $Id: exc.h,v 1.23 2002/06/11 13:40:52 wieck Exp $
*
*-------------------------------------------------------------------------
*/
@@ -40,7 +40,7 @@ extern ExcFrame *ExcCurFrameP;
/* These are not used anywhere 1998/6/15 */
#define ExcBegin() \
do { \
- ExcFrame exception; \
+ ExcFrame exception; \
\
exception.link = ExcCurFrameP; \
if (sigsetjmp(exception.context, 1) == 0) \
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-23 22:13:05 +0000