diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/bootstrap/bootstrap.h | 15 | ||||
| -rw-r--r-- | src/include/storage/proc.h | 8 | ||||
| -rw-r--r-- | src/include/tcop/tcopprot.h | 5 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h index 25772ce606..bbde68ea1b 100644 --- a/src/include/bootstrap/bootstrap.h +++ b/src/include/bootstrap/bootstrap.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/bootstrap/bootstrap.h,v 1.45 2007/01/05 22:19:51 momjian Exp $ + * $PostgreSQL: pgsql/src/include/bootstrap/bootstrap.h,v 1.46 2007/03/07 13:35:03 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -32,7 +32,7 @@ typedef struct hashnode extern Relation boot_reldesc; extern Form_pg_attribute attrtypes[MAXATTR]; extern int numattr; -extern int BootstrapMain(int argc, char *argv[]); +extern void AuxiliaryProcessMain(int argc, char *argv[]); extern void index_register(Oid heap, Oid ind, IndexInfo *indexInfo); @@ -64,9 +64,12 @@ extern int boot_yyparse(void); extern int boot_yylex(void); extern void boot_yyerror(const char *str); -#define BS_XLOG_NOP 0 -#define BS_XLOG_BOOTSTRAP 1 -#define BS_XLOG_STARTUP 2 -#define BS_XLOG_BGWRITER 3 +typedef enum +{ + CheckerProcess, + BootstrapProcess, + StartupProcess, + BgWriterProcess +} AuxProcType; #endif /* BOOTSTRAP_H */ diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index eeae751d82..2b20eda828 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/proc.h,v 1.95 2007/03/03 18:46:40 momjian Exp $ + * $PostgreSQL: pgsql/src/include/storage/proc.h,v 1.96 2007/03/07 13:35:03 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -118,10 +118,10 @@ typedef struct PROC_HDR } PROC_HDR; /* - * We set aside some extra PGPROC structures for "dummy" processes, + * We set aside some extra PGPROC structures for auxiliary processes, * ie things that aren't full-fledged backends but need shmem access. */ -#define NUM_DUMMY_PROCS 3 +#define NUM_AUXILIARY_PROCS 3 /* configurable options */ @@ -140,7 +140,7 @@ extern Size ProcGlobalShmemSize(void); extern void InitProcGlobal(void); extern void InitProcess(void); extern void InitProcessPhase2(void); -extern void InitDummyProcess(void); +extern void InitAuxiliaryProcess(void); extern bool HaveNFreeProcs(int n); extern void ProcReleaseLocks(bool isCommit); diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h index 2a55125576..098cb1da1e 100644 --- a/src/include/tcop/tcopprot.h +++ b/src/include/tcop/tcopprot.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/tcop/tcopprot.h,v 1.87 2007/02/20 17:32:17 tgl Exp $ + * $PostgreSQL: pgsql/src/include/tcop/tcopprot.h,v 1.88 2007/03/07 13:35:03 alvherre Exp $ * * OLD COMMENTS * This file was created so that other c files could get the two @@ -44,8 +44,6 @@ typedef enum extern LogStmtLevel log_statement; -#ifndef BOOTSTRAP_INCLUDE - extern List *pg_parse_and_rewrite(const char *query_string, Oid *paramTypes, int numParams); extern List *pg_parse_query(const char *query_string); @@ -56,7 +54,6 @@ extern List *pg_plan_queries(List *querytrees, ParamListInfo boundParams, bool needSnapshot); extern bool assign_max_stack_depth(int newval, bool doit, GucSource source); -#endif /* BOOTSTRAP_INCLUDE */ extern void die(SIGNAL_ARGS); extern void quickdie(SIGNAL_ARGS); |