harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r815646 - in /harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native: include/shared/hythread.h thread/shared/hythread.c thread/shared/rwmutex.c thread/unix/thrtypes.h thread/windows/thrtypes.h thrstub/shared/hythread.h
Date Wed, 16 Sep 2009 07:43:03 GMT
Author: hindessm
Date: Wed Sep 16 07:43:02 2009
New Revision: 815646

URL: http://svn.apache.org/viewvc?rev=815646&view=rev
Log:
Change hythread API to use 'const char*' for constant strings rather than
'char*'.  To avoid some recent gcc compiler warnings (treated as errors).
See http://markmail.org/message/xj76uxwu5h3ue2v3

Committing this directly rather than waiting for merge as working_vm has
been updated and the java6 branch will break if we don't get things back
in sync.

Modified:
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/include/shared/hythread.h
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/shared/hythread.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/shared/rwmutex.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/unix/thrtypes.h
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/windows/thrtypes.h
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thrstub/shared/hythread.h

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/include/shared/hythread.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/include/shared/hythread.h?rev=815646&r1=815645&r2=815646&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/include/shared/hythread.h
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/include/shared/hythread.h
Wed Sep 16 07:43:02 2009
@@ -90,7 +90,7 @@
 
   typedef struct HyThreadMonitorTracing
   {
-    char *monitor_name;
+    const char *monitor_name;
     UDATA enter_count;
     UDATA slow_count;
     UDATA recursive_count;
@@ -190,7 +190,7 @@
     hythread_monitor_init
     PROTOTYPE ((hythread_monitor_t * handle, UDATA flags));
   extern HY_CFUNC IDATA VMCALL hythread_sleep PROTOTYPE ((I_64 millis));
-  extern HY_CFUNC UDATA *VMCALL hythread_global PROTOTYPE ((char *name));
+  extern HY_CFUNC UDATA *VMCALL hythread_global PROTOTYPE ((const char *name));
   extern HY_CFUNC IDATA VMCALL
     hythread_tls_alloc_with_finalizer
     PROTOTYPE ((hythread_tls_key_t * handle,

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/shared/hythread.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/shared/hythread.c?rev=815646&r1=815645&r2=815646&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/shared/hythread.c
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/shared/hythread.c
Wed Sep 16 07:43:02 2009
@@ -2000,7 +2000,7 @@
  * 
  */
 UDATA *VMCALL
-hythread_global (char *name)
+hythread_global (const char *name)
 {
   HyThreadGlobal *global;
   hythread_library_t lib = GLOBAL_DATA (default_library);

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/shared/rwmutex.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/shared/rwmutex.c?rev=815646&r1=815645&r2=815646&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/shared/rwmutex.c
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/shared/rwmutex.c
Wed Sep 16 07:43:02 2009
@@ -49,7 +49,7 @@
                        const char *name)
 {
   RWMutex *mutex = (RWMutex *) malloc (sizeof (RWMutex));
-  hythread_monitor_init_with_name (&mutex->syncMon, 0, (char *) name);
+  hythread_monitor_init_with_name (&mutex->syncMon, 0, name);
   mutex->status = 0;
   mutex->writer = 0;
 

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/unix/thrtypes.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/unix/thrtypes.h?rev=815646&r1=815645&r2=815646&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/unix/thrtypes.h
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/unix/thrtypes.h
Wed Sep 16 07:43:02 2009
@@ -72,7 +72,7 @@
   typedef struct HyThreadGlobal
   {
     struct HyThreadGlobal *next;
-    char *name;
+    const char *name;
     UDATA data;
   } HyThreadGlobal;
   typedef struct HyThreadLibrary

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/windows/thrtypes.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/windows/thrtypes.h?rev=815646&r1=815645&r2=815646&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/windows/thrtypes.h
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/windows/thrtypes.h
Wed Sep 16 07:43:02 2009
@@ -80,7 +80,7 @@
   typedef struct HyThreadGlobal
   {
     struct HyThreadGlobal *next;
-    char *name;
+    const char *name;
     UDATA data;
   } HyThreadGlobal;
 

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thrstub/shared/hythread.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thrstub/shared/hythread.h?rev=815646&r1=815645&r2=815646&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thrstub/shared/hythread.h
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thrstub/shared/hythread.h
Wed Sep 16 07:43:02 2009
@@ -79,7 +79,7 @@
 
 typedef struct HyThreadMonitorTracing
 {
-	char *monitor_name;
+    const char *monitor_name;
     UDATA enter_count;
     UDATA slow_count;
     UDATA recursive_count;
@@ -111,12 +111,12 @@
   void  (PVMCALL thread_detach) (struct HyThreadLibrary * threadLibrary, hythread_t thread);
   void  (PVMCALL NORETURN thread_exit) (struct HyThreadLibrary * threadLibrary, hythread_monitor_t
monitor);
 
-  UDATA *(PVMCALL thread_global) (struct HyThreadLibrary * threadLibrary, char *name);
+  UDATA *(PVMCALL thread_global) (struct HyThreadLibrary * threadLibrary, const char *name);
 
   IDATA (PVMCALL thread_monitor_destroy) (struct HyThreadLibrary * threadLibrary, hythread_monitor_t
monitor);
   IDATA (PVMCALL thread_monitor_enter) (struct HyThreadLibrary * threadLibrary, hythread_monitor_t
monitor);
   IDATA (PVMCALL thread_monitor_exit) (struct HyThreadLibrary * threadLibrary, hythread_monitor_t
monitor);
-  IDATA (PVMCALL thread_monitor_init_with_name) (struct HyThreadLibrary * threadLibrary,
hythread_monitor_t * handle, UDATA flags, char *name);
+  IDATA (PVMCALL thread_monitor_init_with_name) (struct HyThreadLibrary * threadLibrary,
hythread_monitor_t * handle, UDATA flags, const char *name);
   IDATA (PVMCALL thread_monitor_notify) (struct HyThreadLibrary * threadLibrary, hythread_monitor_t
monitor);
   IDATA (PVMCALL thread_monitor_notify_all) (struct HyThreadLibrary * threadLibrary, hythread_monitor_t
monitor);
   IDATA (PVMCALL thread_monitor_wait) (struct HyThreadLibrary * threadLibrary, hythread_monitor_t
monitor);



Mime
View raw message