casa-mp-base

diff -Nru postgresql-8.2.5/src/backend/Makefile postgresql-8.2.5-osxdtrace/src/backend/Makefile

--- postgresql-8.2.5/src/backend/Makefile   2006-10-08 18:15:33.000000000 +0100

+++ postgresql-8.2.5-osxdtrace/src/backend/Makefile 2007-10-26 08:02:09.000000000 +0100

@@ -19,10 +19,6 @@

 SUBSYSOBJS := $(DIRS:%=%/SUBSYS.o)

-ifeq ($(enable_dtrace), yes)

-LOCALOBJS += utils/probes.o

-endif

-

 OBJS = $(SUBSYSOBJS) $(LOCALOBJS) $(top_builddir)/src/port/libpgport_srv.a

 # We put libpgport into OBJS, so remove it from LIBS; also add libldap

@@ -139,8 +135,8 @@

        $(LN_S) ../../../$(subdir)/utils/fmgroids.h .

-utils/probes.o: utils/probes.d $(SUBSYSOBJS)

-   $(DTRACE) $(DTRACEFLAGS) -G -s $^ -o $@

+utils/probes.h: utils/probes.d $(SUBSYSOBJS)

+   $(DTRACE) $(DTRACEFLAGS) -h -s $^ -o $@

 ##########################################################################

diff -Nru postgresql-8.2.5/src/backend/access/transam/xact.c postgresql-8.2.5-osxdtrace/src/backend/access/transam/xact.c

--- postgresql-8.2.5/src/backend/access/transam/xact.c  2007-05-30 22:01:45.000000000 +0100

+++ postgresql-8.2.5-osxdtrace/src/backend/access/transam/xact.c    2007-10-26 08:00:18.000000000 +0100

@@ -43,6 +43,7 @@

 #include "utils/memutils.h"

 #include "utils/relcache.h"

 #include "utils/guc.h"

+#include "utils/probes.h"

 /*

@@ -1408,8 +1409,9 @@

    XactLockTableInsert(s->transactionId);

-   PG_TRACE1(transaction__start, s->transactionId);

-

+   if (POSTGRESQL_TRANSACTION_START_ENABLED())

+       POSTGRESQL_TRANSACTION_START(s->transactionId);

+   

    /*

     * set transaction_timestamp() (a/k/a now()).  We want this to be the same

     * as the first command's statement_timestamp(), so don't do a fresh

@@ -1562,7 +1564,8 @@

        LWLockRelease(ProcArrayLock);

    }

-   PG_TRACE1(transaction__commit, s->transactionId);

+   if (POSTGRESQL_TRANSACTION_COMMIT_ENABLED())

+       POSTGRESQL_TRANSACTION_COMMIT(s->transactionId);

    /*

     * This is all post-commit cleanup.  Note that if an error is raised here,

@@ -1964,7 +1967,8 @@

        LWLockRelease(ProcArrayLock);

    }

-   PG_TRACE1(transaction__abort, s->transactionId);