harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r397227 - in /incubator/harmony/enhanced/classlib/trunk/native-src: linux.IA32/thread/ shared/include/ shared/launcher/ shared/port/ win.IA32/thread/
Date Wed, 26 Apr 2006 16:02:09 GMT
Author: tellison
Date: Wed Apr 26 09:02:05 2006
New Revision: 397227

URL: http://svn.apache.org/viewcvs?rev=397227&view=rev
Log:
Apply patch HARMONY-415 (Unused and inaccurate #defines of HYSIZEOF_*)

Modified:
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/thrtypes.h
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hypool.h
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hyport.h
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hythread.h
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hyvmls.h
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/zipsup.h
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/launcher/libhlp.h
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/port/portpriv.h
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/thrtypes.h

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/thrtypes.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/thrtypes.h?rev=397227&r1=397226&r2=397227&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/thrtypes.h (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/thrtypes.h Wed
Apr 26 09:02:05 2006
@@ -40,7 +40,6 @@
     UDATA *tos;
     void *jumpBuffer;
   } HyThread;
-#define HYSIZEOF_HyThread 576
   typedef struct HyThreadMonitor
   {
     UDATA count;
@@ -61,7 +60,6 @@
     struct HyThread *blocking;
     MUTEX mutex;
   } HyThreadMonitor;
-#define HYSIZEOF_HyThreadMonitor sizeof(HyThreadMonitor)
   typedef struct HyThreadMonitorPool
   {
     struct HyThreadMonitorPool *next;
@@ -69,14 +67,12 @@
     struct HyThreadMonitor entries[64];
   } HyThreadMonitorPool;
 #define MONITOR_POOL_SIZE  64
-#define HYSIZEOF_HyThreadMonitorPool 4360
   typedef struct HyThreadGlobal
   {
     struct HyThreadGlobal *next;
     char *name;
     UDATA data;
   } HyThreadGlobal;
-#define HYSIZEOF_HyThreadGlobal 12
   typedef struct HyThreadLibrary
   {
     UDATA spinlock;
@@ -103,12 +99,10 @@
 #define HYTHREAD_LIB_FLAG_JLM_ENABLED_ALL  0x1C000
 #define HYTHREAD_LIB_FLAG_JLM_HAS_BEEN_ENABLED  0x20000
 #define HYTHREAD_LIB_FLAG_JLMTS_ENABLED  0x8000
-#define HYSIZEOF_HyThreadLibrary 580
   typedef struct HySemaphore
   {
     OSSEMAPHORE sem;
   } HySemaphore;
-#define HYSIZEOF_HySemaphore 4
 #define STACK_DEFAULT_SIZE  0x8000
 #define FREE_TAG ((UDATA)-1)
   typedef struct HyThreadMonitorPool *hythread_monitor_pool_t;

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hypool.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hypool.h?rev=397227&r1=397226&r2=397227&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hypool.h (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hypool.h Wed Apr 26
09:02:05 2006
@@ -52,7 +52,6 @@
 #define POOL_ALWAYS_KEEP_SORTED  4
 #define POOL_NEVER_FREE_PUDDLES  2
 #define POOL_SORTED              1
-#define HYSIZEOF_HyPool          44
 
 typedef struct HyPoolState
   {
@@ -62,7 +61,6 @@
     UDATA **nextFree;
   } HyPoolState;
 
-#define HYSIZEOF_HyPoolState 16
 #define pool_state HyPoolState
 
 /* HySourcePool*/

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hyport.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hyport.h?rev=397227&r1=397226&r2=397227&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hyport.h (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hyport.h Wed Apr 26
09:02:05 2006
@@ -234,7 +234,6 @@
   U_32 padding;
   U_64 capabilities;
 } HyPortLibraryVersion;
-#define HYSIZEOF_HyPortLibraryVersion 16
 typedef struct HyPortVmemIdentifier
 {
   void *address;
@@ -243,7 +242,6 @@
   UDATA pageSize;
   UDATA mode;
 } HyPortVmemIdentifier;
-#define HYSIZEOF_HyPortVmemIdentifier 20
 typedef struct HyPortShmemStatistic
 {
   UDATA shmid;
@@ -256,7 +254,6 @@
   I_64 dtime;
   I_64 chtime;
 } HyPortShmemStatistic;
-#define HYSIZEOF_HyPortShmemStatistic 48
 /** 
  * @struct HyPortLibrary 
  * The port library function table
@@ -1113,7 +1110,6 @@
 #define HYPORT_SIG_VALUE_FLOAT_64  6
 #define HYPORT_SIG_OPTIONS_JSIG_NO_CHAIN  1
 #define HYPORT_SIG_OPTIONS_REDUCED_SIGNALS  2
-#define HYSIZEOF_HyPortLibrary 928
 #define HYPORT_CAPABILITY_MASK ((U_64)(HYPORT_CAPABILITY_STANDARD | HYPORT_CAPABILITY_FILESYSTEM
| HYPORT_CAPABILITY_SOCKETS | HYPORT_CAPABILITY_LARGE_PAGE_SUPPORT))
 #define HYPORT_SET_VERSION(portLibraryVersion, capabilityMask) \
   (portLibraryVersion)->majorVersionNumber = HYPORT_MAJOR_VERSION_NUMBER; \

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hythread.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hythread.h?rev=397227&r1=397226&r2=397227&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hythread.h (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hythread.h Wed Apr
26 09:02:05 2006
@@ -96,7 +96,6 @@
     UDATA yield_count;
   } HyThreadMonitorTracing;
 
-#define HYSIZEOF_HyThreadMonitorTracing 24
   extern HY_CFUNC void VMCALL hythread_detach PROTOTYPE ((hythread_t thread));
   extern HY_CFUNC UDATA VMCALL
     hythread_lib_set_flags PROTOTYPE ((UDATA flags));

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hyvmls.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hyvmls.h?rev=397227&r1=397226&r2=397227&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hyvmls.h (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hyvmls.h Wed Apr 26
09:02:05 2006
@@ -44,7 +44,6 @@
     void *(JNICALL * HyVMLSSet) (JNIEnv * env, void **pKey, void *value);
   } HyVMLSFunctionTable;
 
-#define HYSIZEOF_HyVMLSFunctionTable 16
 
 #if defined(USING_VMI)
 #define HY_VMLS_FNTBL(env) (*VMI_GetVMIFromJNIEnv(env))->GetVMLSFunctions(VMI_GetVMIFromJNIEnv(env))

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/zipsup.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/zipsup.h?rev=397227&r1=397226&r2=397227&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/zipsup.h (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/zipsup.h Wed Apr 26
09:02:05 2006
@@ -66,7 +66,6 @@
     void *cachePoolEntry;
   } HyZipCache;
 
-#define HYSIZEOF_HyZipCache 32
 
   typedef struct HyZipCentralEnd
   {
@@ -81,7 +80,6 @@
     U_8 *comment;
   } HyZipCentralEnd;
 
-#define HYSIZEOF_HyZipCentralEnd 24
 
   typedef struct HyZipDataDescriptor
   {
@@ -90,7 +88,6 @@
     U_32 uncompressedSize;
   } HyZipDataDescriptor;
 
-#define HYSIZEOF_HyZipDataDescriptor 12
 
   typedef struct HyZipEntry
   {
@@ -118,7 +115,6 @@
     U_8 internalFilename[80];
   } HyZipEntry;
 
-#define HYSIZEOF_HyZipEntry 144
 
   typedef struct HyZipFile
   {
@@ -132,7 +128,6 @@
     char _hypadding0065[3];  /* 3 bytes of automatic padding */
   } HyZipFile;
 
-#define HYSIZEOF_HyZipFile 104
 /* HySourceZipSupport*/
   extern HY_CFUNC I_32 zip_getZipEntryData
     PROTOTYPE ((HyPortLibrary * portLib, HyZipFile * zipFile,

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/shared/launcher/libhlp.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/shared/launcher/libhlp.h?rev=397227&r1=397226&r2=397227&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/shared/launcher/libhlp.h (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/shared/launcher/libhlp.h Wed Apr
26 09:02:05 2006
@@ -28,7 +28,6 @@
     UDATA remaining;
     U_8 data[4];
   } HyStringBuffer;
-#define HYSIZEOF_HyStringBuffer 8
   struct haCmdlineOptions
   {
     int argc;

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/shared/port/portpriv.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/shared/port/portpriv.h?rev=397227&r1=397226&r2=397227&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/shared/port/portpriv.h (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/shared/port/portpriv.h Wed Apr 26
09:02:05 2006
@@ -54,7 +54,6 @@
   UDATA sig_flags;
   UDATA shmem_group_perm;
 } HyPortControlData;
-#define HYSIZEOF_HyPortControlData 8
 typedef struct HyNLSDataCache
 {
   char *baseCatalogPaths[4];
@@ -70,7 +69,6 @@
   struct HyNLSHashEntry *old_hashEntries;
 } HyNLSDataCache;
 #define HYNLS_NUM_HASH_BUCKETS  0x100
-#define HYSIZEOF_HyNLSDataCache 1104
 typedef struct HyNLSHashEntry
 {
   U_32 module_name;
@@ -78,7 +76,6 @@
   struct HyNLSHashEntry *next;
   char message[8];
 } HyNLSHashEntry;
-#define HYSIZEOF_HyNLSHashEntry 20
 typedef struct HyPortLibraryGlobalData
 {
   struct HyPortControlData control;
@@ -88,7 +85,6 @@
   void *buffer_list;
   struct HyPortPlatformGlobals platformGlobals;
 } HyPortLibraryGlobalData;
-#define HYSIZEOF_HyPortLibraryGlobalData sizeof(HyPortLibraryGlobalData)
 /* HySourceHyCPUControl*/
 struct HyPortLibrary;
 extern HY_CFUNC void VMCALL

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/thrtypes.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/thrtypes.h?rev=397227&r1=397226&r2=397227&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/thrtypes.h (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/thrtypes.h Wed Apr
26 09:02:05 2006
@@ -42,7 +42,6 @@
     UDATA *tos;
   } HyThread;
 
-#define HYSIZEOF_HyThread 572
 
   typedef struct HyThreadMonitor
   {
@@ -65,7 +64,6 @@
     MUTEX mutex;
   } HyThreadMonitor;
 
-#define HYSIZEOF_HyThreadMonitor sizeof(HyThreadMonitor)
 
   typedef struct HyThreadMonitorPool
   {
@@ -76,7 +74,6 @@
 
 #define MONITOR_POOL_SIZE  64
 
-#define HYSIZEOF_HyThreadMonitorPool 4360
 
   typedef struct HyThreadGlobal
   {
@@ -85,7 +82,6 @@
     UDATA data;
   } HyThreadGlobal;
 
-#define HYSIZEOF_HyThreadGlobal 12
 
   typedef struct HyThreadLibrary
   {
@@ -114,14 +110,12 @@
 #define HYTHREAD_LIB_FLAG_JLM_ENABLED_ALL  0x1C000
 #define HYTHREAD_LIB_FLAG_JLM_HAS_BEEN_ENABLED  0x20000
 #define HYTHREAD_LIB_FLAG_JLMTS_ENABLED  0x8000
-#define HYSIZEOF_HyThreadLibrary 580
 
   typedef struct HySemaphore
   {
     OSSEMAPHORE sem;
   } HySemaphore;
 
-#define HYSIZEOF_HySemaphore 4
 #define STACK_DEFAULT_SIZE  0x8000
 #define FREE_TAG ((UDATA)-1)
 



Mime
View raw message