? src/include/probes_null.h
Index: src/Makefile
===================================================================
RCS file: /projects/cvsroot/pgsql/src/Makefile,v
retrieving revision 1.42
diff -r1.42 Makefile
16a17,19
> ifeq ($(enable_dtrace), yes)
> 	$(DTRACE) -h -s $(top_builddir)/src/backend/utils/probes.d -o $(top_builddir)/src/include/probes.h
> endif
Index: src/backend/Makefile
===================================================================
RCS file: /projects/cvsroot/pgsql/src/backend/Makefile,v
retrieving revision 1.125
diff -r1.125 Makefile
22a23
> ifeq ($(PORTNAME), solaris)
25a27
> endif
143a146
> ifeq ($(PORTNAME), solaris)
145a149
> endif
Index: src/backend/access/transam/xact.c
===================================================================
RCS file: /projects/cvsroot/pgsql/src/backend/access/transam/xact.c,v
retrieving revision 1.257
diff -r1.257 xact.c
1482c1482
< 	PG_TRACE1(transaction__start, vxid.localTransactionId);
---
> 	DATABASE_TRANSACTION_START(vxid.localTransactionId);
1607c1607
< 	PG_TRACE1(transaction__commit, MyProc->lxid);
---
> 	DATABASE_TRANSACTION_COMMIT(MyProc->lxid);
1993c1993
< 	PG_TRACE1(transaction__abort, MyProc->lxid);
---
> 	DATABASE_TRANSACTION_ABORT(MyProc->lxid);
Index: src/backend/storage/lmgr/lock.c
===================================================================
RCS file: /projects/cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v
retrieving revision 1.181
diff -r1.181 lock.c
790c790
< 		PG_TRACE2(lock__startwait, locktag->locktag_field2, lockmode);
---
> 		POSTGRESQL_LOCK_STARTWAIT(locktag->locktag_field2, lockmode);
794c794
< 		PG_TRACE2(lock__endwait, locktag->locktag_field2, lockmode);
---
> 		POSTGRESQL_LOCK_ENDWAIT(locktag->locktag_field2, lockmode);
Index: src/backend/storage/lmgr/lwlock.c
===================================================================
RCS file: /projects/cvsroot/pgsql/src/backend/storage/lmgr/lwlock.c,v
retrieving revision 1.50
diff -r1.50 lwlock.c
450c450
< 		PG_TRACE2(lwlock__startwait, lockid, mode);
---
> 		POSTGRESQL_LWLOCK_STARTWAIT(lockid, mode);
461c461
< 		PG_TRACE2(lwlock__endwait, lockid, mode);
---
> 		POSTGRESQL_LWLOCK_ENDWAIT(lockid, mode);
472c472
< 	PG_TRACE2(lwlock__acquire, lockid, mode);
---
> 	POSTGRESQL_LWLOCK_ACQUIRE(lockid, mode);
543c543
< 		PG_TRACE2(lwlock__condacquire__fail, lockid, mode);
---
> 		POSTGRESQL_LWLOCK_CONDACQUIRE_FAIL(lockid, mode);
549c549
< 		PG_TRACE2(lwlock__condacquire, lockid, mode);
---
> 		POSTGRESQL_LWLOCK_CONDACQUIRE(lockid, mode);
634c634
< 	PG_TRACE1(lwlock__release, lockid);
---
> 	POSTGRESQL_LWLOCK_RELEASE(lockid);
Index: src/backend/utils/probes.d
===================================================================
RCS file: /projects/cvsroot/pgsql/src/backend/utils/probes.d,v
retrieving revision 1.2
diff -r1.2 probes.d
10c10
< provider postgresql {
---
> provider database {
14a15,19
> 
> };
> 
> provider postgresql {
> 
Index: src/include/c.h
===================================================================
RCS file: /projects/cvsroot/pgsql/src/include/c.h,v
retrieving revision 1.222
diff -r1.222 c.h
60c60,64
< #include "pg_trace.h"
---
> #ifdef ENABLE_DTRACE
> #include "probes.h"
> #else
> #include "probes_null.h"
> #endif