Attachment 56192 Details for Bug 68111 – AgentController patch for Darwin (PPC, untested on x86)

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] AgentController patch for Darwin (PPC, untested on x86)

ac-darwin-200612262240.diff (text/plain), 10.67 KB, created by Pierre Queinnec

on 2006-12-26 16:50:47 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Pierre Queinnec

Created: 2006-12-26 16:50:47 EST

Size: 10.67 KB

patch

obsolete

>diff -Naur ./collectors/native/java_profiler/StatelessHeapSnapshotManager_C.cpp /Users/queinnec/tmp/diffy/collection/collectors/native/java_profiler/StatelessHeapSnapshotManager_C.cpp
>--- ./collectors/native/java_profiler/StatelessHeapSnapshotManager_C.cpp	2006-05-12 00:20:00.000000000 +0200
>+++ /Users/queinnec/tmp/diffy/collection/collectors/native/java_profiler/StatelessHeapSnapshotManager_C.cpp	2006-12-26 19:33:07.000000000 +0100
>@@ -278,7 +278,7 @@
>     traceWriteInt32LittleEndian(77);
> #elif defined(__OS400__)
>     traceWriteInt32LittleEndian(88);
>-#elif defined(__linux__) && defined(__powerpc64__) || defined(_WIN64) /*ts. bug 120479*/
>+#elif defined(__linux__) && defined(__powerpc64__) || defined(_WIN64) || defined(__APPLE__) /*ts. bug 120479*/
>     /* traceWriteInt32LittleEndian(99); */
> #else
> #error "unknown platform"
>diff -Naur ./collectors/native/java_profiler/hash.c /Users/queinnec/tmp/diffy/collection/collectors/native/java_profiler/hash.c
>--- ./collectors/native/java_profiler/hash.c	2006-05-16 20:50:16.000000000 +0200
>+++ /Users/queinnec/tmp/diffy/collection/collectors/native/java_profiler/hash.c	2006-12-26 19:33:06.000000000 +0100
>@@ -17,6 +17,8 @@
>   /* no malloc.h needed */
> #elif MVS
>   /* no malloc.h needed */
>+#elif __APPLE__
>+  /* no malloc.h needed */
> #else
>   #include <malloc.h>
> #endif
>diff -Naur ./collectors/native/java_profiler/performance.h /Users/queinnec/tmp/diffy/collection/collectors/native/java_profiler/performance.h
>--- ./collectors/native/java_profiler/performance.h	2006-05-17 00:09:53.000000000 +0200
>+++ /Users/queinnec/tmp/diffy/collection/collectors/native/java_profiler/performance.h	2006-12-26 19:33:06.000000000 +0100
>@@ -30,6 +30,8 @@
> #elif __linux__
>  #include <stdint.h>
>  #define _inline inline
>+#elif __APPLE__
>+ #define _inline inline
> #elif _SOLARIS
>  #define _inline
> #elif _AIX
>diff -Naur ./framework/HCLauncher/launcher_md.c /Users/queinnec/tmp/diffy/collection/framework/HCLauncher/launcher_md.c
>--- ./framework/HCLauncher/launcher_md.c	2005-07-18 20:30:44.000000000 +0200
>+++ /Users/queinnec/tmp/diffy/collection/framework/HCLauncher/launcher_md.c	2006-12-26 19:33:04.000000000 +0100
>@@ -14,6 +14,12 @@
> #endif
> #include "launcher_common.h"
> 
>+#ifdef __APPLE__
>+  #ifdef HAVE_CRT_EXTERNS_H
>+    #include <crt-externs.h>
>+  #endif
>+#endif
>+
> #ifdef _DEBUG
> extern FILE *trcFile;
> #endif
>@@ -414,6 +420,8 @@
> 
> #ifdef _WIN32
> 	return GetEnvironmentStrings(); /* Return a string of environment variables */
>+#elif __APPLE__
>+	return _NSGetEnviron();
> #else
> 
> 	#ifdef _DEBUG
>diff -Naur ./framework/RACommon/RAComm.c /Users/queinnec/tmp/diffy/collection/framework/RACommon/RAComm.c
>--- ./framework/RACommon/RAComm.c	2006-07-06 19:30:41.000000000 +0200
>+++ /Users/queinnec/tmp/diffy/collection/framework/RACommon/RAComm.c	2006-12-26 19:33:05.000000000 +0100
>@@ -78,6 +78,9 @@
> #elif _SOLARIS
>  #define _inline
>  #define _NO_ATOMIC_CAS 1
>+#elif __APPLE__
>+ #define _inline
>+ #define _NO_ATOMIC_CAS 1
> #elif _HPUX
>  #include <unistd.h>
>  #define _inline
>diff -Naur ./framework/RACommon/RATypes.h /Users/queinnec/tmp/diffy/collection/framework/RACommon/RATypes.h
>--- ./framework/RACommon/RATypes.h	2006-04-24 15:29:35.000000000 +0200
>+++ /Users/queinnec/tmp/diffy/collection/framework/RACommon/RATypes.h	2006-12-26 19:33:05.000000000 +0100
>@@ -40,6 +40,11 @@
> 	#include <unistd.h>
> #endif
> 
>+#ifdef __APPLE__
>+	#include <stdlib.h>
>+	#include <stdbool.h>
>+#endif
>+
> #if defined(_WIN32)
> 	#define FILE_PATH_SEPARATOR ';'
> 	#define FILE_PATH_SEPARATOR_STR ";"
>diff -Naur ./framework/RASharedMemory/osslatch.h /Users/queinnec/tmp/diffy/collection/framework/RASharedMemory/osslatch.h
>--- ./framework/RASharedMemory/osslatch.h	2006-03-17 13:18:38.000000000 +0100
>+++ /Users/queinnec/tmp/diffy/collection/framework/RASharedMemory/osslatch.h	2006-12-26 19:33:06.000000000 +0100
>@@ -109,6 +109,10 @@
> /* The lock word size in abilock_t is the same for both 32- and 64-bit */
> #include <abi_mutex.h>
> typedef volatile abilock_t OSSLock ;
>+#elif defined __APPLE__
>+#include <libkern/OSAtomic.h>
>+#include <pthread.h>
>+typedef OSSpinLock OSSLock ;
> #else
> typedef volatile int OSSLock ;
> #endif
>@@ -345,6 +349,16 @@
> 
> 
> /******************************************************************************/
>+#elif defined __APPLE__
>+
>+#define oss_lockaddr(pLatch)  (&((pLatch)->lock))
>+#define oss_trylock(pLatch)   (OSS_LATCH_UNLOCK==(OSSpinLockTry(oss_lockaddr(pLatch))))
>+#define oss_checklock(pLatch) (OSS_LATCH_UNLOCK==(*oss_lockaddr(pLatch)))
>+#define oss_unlock(pLatch)    ((void)OSSpinLockUnlock(oss_lockaddr(pLatch)))
>+#define oss_initlock(pLatch)  ((void)(oss_unlock((pLatch))))
>+
>+
>+/******************************************************************************/
> #elif defined SQL_OS400       /*@d170450ssu*/
> 
> /*
>diff -Naur ./hcbnd.mak /Users/queinnec/tmp/diffy/collection/hcbnd.mak
>--- ./hcbnd.mak	2005-02-04 16:51:37.000000000 +0100
>+++ /Users/queinnec/tmp/diffy/collection/hcbnd.mak	2006-12-26 19:33:07.000000000 +0100
>@@ -19,7 +19,7 @@
> all: libhcbnd.$(EXT_LIB) 
> 
> libhcbnd.$(DYNAMIC_EXT_LIB): $(HCBND_OBJ)
>-	$(LINK) $(HCBND_FLAGS) $(HCBND_OBJ) -o packaging/lib/$@
>+	$(LINK) -Wl,-single_module $(HCBND_FLAGS) $(HCBND_OBJ) -o packaging/lib/$@
> 
> libhcbnd.$(STATIC_EXT_LIB): $(HCBND_OBJ)
> 	$(CXX_AR) packaging/lib/$@ $?
>diff -Naur ./hcthread.mak /Users/queinnec/tmp/diffy/collection/hcthread.mak
>--- ./hcthread.mak	2005-02-04 16:51:37.000000000 +0100
>+++ /Users/queinnec/tmp/diffy/collection/hcthread.mak	2006-12-26 19:33:07.000000000 +0100
>@@ -17,7 +17,7 @@
> all: libhcthread.$(EXT_LIB)
> 
> libhcthread.$(DYNAMIC_EXT_LIB): $(HCTHREAD_OBJ)
>-	$(LINK) $(HCTHREAD_FLAGS) $(HCTHREAD_OBJ) -o packaging/lib/$@
>+	$(LINK) -Wl,-single_module $(HCTHREAD_FLAGS) $(HCTHREAD_OBJ) -o packaging/lib/$@
> 
> libhcthread.$(STATIC_EXT_LIB): $(HCTHREAD_OBJ)
> 	$(CXX_AR) packaging/lib/$@ $?
>diff -Naur ./include.common /Users/queinnec/tmp/diffy/collection/include.common
>--- ./include.common	2006-04-24 15:29:34.000000000 +0200
>+++ /Users/queinnec/tmp/diffy/collection/include.common	2006-12-26 19:33:07.000000000 +0100
>@@ -46,6 +46,14 @@
> 	DYNAMIC_EXT_LIB = so
> 	STATIC_EXT_LIB = a
> endif
>+ifeq ($(UNAME), Darwin)
>+     	# TODO later test for x86
>+	BUILD_PLATFORM = darwin_ppc
>+	JDK_PLATFORM = darwin
>+	DYNAMIC_EXT_LIB = dylib
>+	STATIC_EXT_LIB = a
>+	XML_PARSER_TYPE = java
>+endif
> ifeq ($(UNAME), OS/390)
> 	BUILD_PLATFORM = os390
> 	JDK_PLATFORM = os390
>@@ -89,7 +97,7 @@
> DEP_INCLUDES_JAVA = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(JDK_PLATFORM)
> DEP_INCLUDES_XERCESC = -I$(XERCESC_HOME)/include
> 
>-DEP_LINKFLAGS_CBE = -L ../cbe/packaging -lcbe
>+DEP_LINKFLAGS_CBE = -L../cbe/packaging -lcbe
> DEP_LINKFLAGS_XERCESC = -L$(XERCESC_HOME)/lib -lxerces-c
> 
> #
>diff -Naur ./include.darwin_ppc /Users/queinnec/tmp/diffy/collection/include.darwin_ppc
>--- ./include.darwin_ppc	1970-01-01 01:00:00.000000000 +0100
>+++ /Users/queinnec/tmp/diffy/collection/include.darwin_ppc	2006-12-26 19:33:07.000000000 +0100
>@@ -0,0 +1,79 @@
>+#
>+# Global include for Darwin/PowerPC
>+#
>+CC = gcc 
>+#CXX = $(CC)
>+CXX = g++ 
>+LINK = gcc
>+#LINKCPP = $(LINK)
>+LINKCPP = g++
>+SHLIB_FLAG = -dynamiclib
>+CXX_AR=$(AR) cr
>+STLIB_FLAG =  -Xlinker -Bstatic 
>+
>+#
>+# Suppress association of suffix .c with suffix .y by stating new order of evaluation of suffixes
>+#
>+.SUFFIXES:
>+.SUFFIXES: .h .hpp .cpp .c .o
>+
>+#
>+# Make
>+#
>+MAKE = make
>+
>+#
>+# C flags
>+#
>+CFLAGS =
>+CFLAGSEXE = $(CFLAGS)
>+
>+#
>+# C++ flags
>+#
>+CXXFLAGS = $(CFLAGS)
>+
>+#
>+# Includes
>+#
>+INCLUDES = $(DEP_INCLUDES_CBE) $(DEP_INCLUDES_JAVA) $(DEP_INCLUDES_XERCESC) $(SRC_INCLUDES)
>+
>+#
>+# Linkedit flags
>+#
>+LINKFLAGS = -L$(SRC_IDIR)/packaging/lib 
>+DLLLINKFLAGS = $(SHLIB_FLAG) $(LINKFLAGS)
>+EXELINKFLAGS = $(LINKFLAGS)
>+
>+#
>+# Defines
>+# Built-in defines: __APPLE__
>+#
>+DEFINES = -DSQLUNIX -DENW -DREENTRANT -D_REENTRANT
>+
>+#
>+# Link flags
>+#
>+HCBND_FLAGS = $(DLLLINKFLAGS) -lhcclco -lhccls
>+HCCLCO_FLAGS = $(DLLLINKFLAGS) -liconv -Wl,-single_module
>+HCCLDT_FLAGS = $(DLLLINKFLAGS) -lhcclco -lhccls -lhcclsm
>+HCCLS_FLAGS = $(DLLLINKFLAGS) -lhcclco
>+HCCLSERC_FLAGS = $(DLLLINKFLAGS) $(DEP_LINKFLAGS_CBE) $(DEP_LINKFLAGS_XERCESC) -lhcclco -lhcclsert -lhccls
>+HCCLSERT_FLAGS = $(DLLLINKFLAGS) -lhcclco -lhccls -lhcclsm
>+HCCLSM_FLAGS = $(DLLLINKFLAGS) -lhcclco -lhccls
>+HCJBND_FLAGS = $(DLLLINKFLAGS) -lhcbnd -lhcclco -lhccldt -lhccls -lhcclsm
>+HCLAUNCH_FLAGS = $(DLLLINKFLAGS) -liconv -Wl,-single_module
>+PIAGENT_LIBS = -lhcbnd -lhcclco -lhccldt -lhccls -lhcclsm 
>+PIAGENT_FLAGS =  $(DLLLINKFLAGS) -Wl,-single_module
>+ifdef STATIC_LINKING
>+    PIAGENT_STATIC_FLAGS =  $(STLIB_FLAG)  
>+    PIAGENT_STATIC_STDLIB = -nostdlib  -lstdc++ -lgcc -lgcc_eh 
>+    RASERVER_STATIC_FLAGS = $(STLIB_FLAG)
>+    RASERVER_STATIC_LIBS =  -lhcclco -lhcclserc -lhcclsert -lhccls -lhcclsm
>+    RASERVER_STATIC_STDLIB = -nostdlib -lstdc++ -lgcc -lgcc_eh
>+endif
>+# FIXME the next line uses '-m'; actually the inlines should not be there at all
>+RASERVER_FLAGS = -m $(CFLAGSEXE) $(EXELINKFLAGS) -undefined dynamic_lookup $(DEP_LINKFLAGS_CBE) $(DEP_LINKFLAGS_XERCESC) -lhcclco -lhcclserc -lhcclsert -lhccls -lhcclsm
>+HCTHREAD_FLAGS = $(DLLLINKFLAGS) -lhcbnd -lhcclco -lhccldt -lhccls -lhcclsm
>+TPTPSHM_FLAGS = $(DLLLINKFLAGS) -liconv
>+CHKPASS_FLAGS = 
>diff -Naur ./makefile /Users/queinnec/tmp/diffy/collection/makefile
>--- ./makefile	2006-07-11 20:43:38.000000000 +0200
>+++ /Users/queinnec/tmp/diffy/collection/makefile	2006-12-26 19:33:07.000000000 +0100
>@@ -39,6 +39,11 @@
> 	$(MAKE) -f tptpShm.mak
> 	zip libtptpShm.$(BUILD_PLATFORM).zip libtptpShm.so
> endif
>+ifeq ($(BUILD_PLATFORM), darwin_ppc)
>+	# $(MAKE) -f ChkPass.mak
>+	$(MAKE) -f tptpShm.mak
>+	zip libtptpShm.$(BUILD_PLATFORM).zip libtptpShm.dylib
>+endif
> ifeq ($(BUILD_PLATFORM), linux_ia32)
> 	$(MAKE) -f ChkPass.mak
> 	$(MAKE) -f tptpShm.mak
>@@ -129,6 +134,10 @@
> 	$(MAKE) -f ChkPass.mak clean
> 	$(MAKE) -f tptpShm.mak clean
> endif
>+ifeq ($(BUILD_PLATFORM), darwin_ppc)
>+	$(MAKE) -f ChkPass.mak clean
>+	$(MAKE) -f tptpShm.mak clean
>+endif
> ifeq ($(BUILD_PLATFORM), linux_ia32)
> 	$(MAKE) -f ChkPass.mak clean
> 	$(MAKE) -f tptpShm.mak clean
>diff -Naur ./piAgent.mak /Users/queinnec/tmp/diffy/collection/piAgent.mak
>--- ./piAgent.mak	2005-02-04 16:51:37.000000000 +0100
>+++ /Users/queinnec/tmp/diffy/collection/piAgent.mak	2006-12-26 19:33:07.000000000 +0100
>@@ -36,8 +36,12 @@
> ifeq ($(BUILD_PLATFORM), os390)
> 	$(LINKCPP) $(PIAGENT_FLAGS) $(PIAGENT_OBJ) -o packaging/lib/$@ $(PIAGENT_STATIC_FLAGS) $(PIAGENT_LIBS) $(PIAGENT_STATIC_STDLIB)
> else
>+ifeq ($(BUILD_PLATFORM), darwin_ppc)
>+	$(LINKCPP) $(PIAGENT_FLAGS) $(PIAGENT_OBJ) -o packaging/lib/$@ $(PIAGENT_STATIC_FLAGS) $(PIAGENT_LIBS) $(PIAGENT_STATIC_STDLIB)
>+else
> 	$(LINK) $(PIAGENT_FLAGS) $(PIAGENT_OBJ) -o packaging/lib/$@ $(PIAGENT_STATIC_FLAGS) $(PIAGENT_LIBS) $(PIAGENT_STATIC_STDLIB)
> endif
>+endif
> 
> ifeq ($(BUILD_PLATFORM), hpux)
> $(SRC_IDIR)/collectors/native/java_profiler/performance.o: $(SRC_IDIR)/collectors/native/java_profiler/performance.c

Actions: View | Diff

Attachments on bug 68111: 55369 | 56192 | 87834 | 97731 | 117488 | 117489 | 136113 | 136140