Commit 88b17d9c authored by Marc G. Fournier's avatar Marc G. Fournier

From: Massimo Dal Zotto <dz@cs.unitn.it>

> ps-status.patch
>
>       macros for ps status, used by postgres.c and utility.c.
>       Unfortunately ps status is system dependent and the current
>       code doesn't work on linux. The use of macros confines system
>       dependency to into one file (ps-status.h). Users of other
>       operating systems should check this code and submit new macros.
parent ab00a220
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.16 1998/06/04 17:26:47 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.17 1998/08/25 21:24:07 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -35,14 +35,13 @@ ...@@ -35,14 +35,13 @@
#include "executor/execdesc.h" #include "executor/execdesc.h"
#include "executor/executor.h" #include "executor/executor.h"
#include "tcop/pquery.h" #include "tcop/pquery.h"
#include "utils/ps_status.h"
#include "commands/command.h" #include "commands/command.h"
static char *CreateOperationTag(int operationType); static char *CreateOperationTag(int operationType);
static void ProcessQueryDesc(QueryDesc *queryDesc); static void ProcessQueryDesc(QueryDesc *queryDesc);
extern const char **ps_status; /* from postgres.c */
/* ---------------------------------------------------------------- /* ----------------------------------------------------------------
* CreateQueryDesc * CreateQueryDesc
...@@ -228,7 +227,7 @@ ProcessQueryDesc(QueryDesc *queryDesc) ...@@ -228,7 +227,7 @@ ProcessQueryDesc(QueryDesc *queryDesc)
plan = queryDesc->plantree; plan = queryDesc->plantree;
operation = queryDesc->operation; operation = queryDesc->operation;
*ps_status = tag = CreateOperationTag(operation); PS_SET_STATUS( tag = CreateOperationTag(operation) );
dest = queryDesc->dest; dest = queryDesc->dest;
/* ---------------- /* ----------------
......
This diff is collapsed.
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.24 1998/07/09 03:28:51 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.25 1998/08/25 21:24:10 scrappy Exp $
* *
* NOTES * NOTES
* Globals used all over the place should be declared here and not * Globals used all over the place should be declared here and not
...@@ -43,7 +43,7 @@ bool Quiet = false; ...@@ -43,7 +43,7 @@ bool Quiet = false;
bool QueryCancel = false; bool QueryCancel = false;
int MyProcPid; int MyProcPid;
struct Port *MyProcPort;
long MyCancelKey; long MyCancelKey;
char *DataDir; char *DataDir;
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: miscadmin.h,v 1.31 1998/08/24 01:14:07 momjian Exp $ * $Id: miscadmin.h,v 1.32 1998/08/25 21:24:12 scrappy Exp $
* *
* NOTES * NOTES
* some of the information in this file will be moved to * some of the information in this file will be moved to
...@@ -41,7 +41,7 @@ extern bool QueryCancel; ...@@ -41,7 +41,7 @@ extern bool QueryCancel;
extern char *DataDir; extern char *DataDir;
extern int MyProcPid; extern int MyProcPid;
extern struct Port *MyProcPort;
extern long MyCancelKey; extern long MyCancelKey;
extern char OutputFileName[]; extern char OutputFileName[];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment