harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wjwashb...@apache.org
Subject svn commit: r505384 [1/2] - /harmony/enhanced/drlvm/trunk/vm/thread/src/
Date Fri, 09 Feb 2007 17:25:03 GMT
Author: wjwashburn
Date: Fri Feb  9 09:25:01 2007
New Revision: 505384

URL: http://svn.apache.org/viewvc?view=rev&rev=505384
Log:
Harmony-2385, clean up the coding style
passes build, build test on both winxp32 and lin32 RHEL4, gcc 4.0.2


Modified:
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_helpers.cpp
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_helpers_ipf.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_init.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_attrs.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_basic.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_interrupt.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_iterator.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_monitors.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_park.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_suspend.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_attrs.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_basic.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_condvar.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_groups.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_interrupt.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_iterator.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_latch.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_mutex.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_park.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_semaphore.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_state.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_suspend.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_thin_monitor.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_tls.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_private.h
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_ti_instr.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_ti_monitors.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_ti_others.c
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_ti_timing.c

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_helpers.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_helpers.cpp?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_helpers.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_helpers.cpp Fri Feb  9 09:25:01 2007
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/**
- * @author Artem Aliev
- * @version $Revision: 1.1.2.11 $
- */  
-
 /** 
  * @file thread_helpers.cpp
  * @brief Set of VM helpers
@@ -85,7 +80,7 @@
 #ifdef LOCK_RESERVATION
     //get lock_id
     ss = mov(ss, eax_opnd,  M_Base_Opnd(ecx_reg, 0));
-   // move thread_id to AX
+    // move thread_id to AX
     ss = shift(ss, ror_opc,  eax_opnd,  Imm_Opnd(16));
 
     // test this recursion call
@@ -131,7 +126,7 @@
     offset2 = (signed)ss - (signed)backpatch_address__recursion_inc2 - 1;
     *backpatch_address__recursion_inc2 = (char)offset2;
 
-   // restore lock_id
+    // restore lock_id
     ss = shift(ss, ror_opc,  eax_opnd,  Imm_Opnd(16));
     ss = alu(ss, add_opc,  eax_opnd,  Imm_Opnd(size_16, 0x800), size_16);
     ss = mov(ss,  M_Base_Opnd(ecx_reg, 0), eax_opnd, size_16);
@@ -203,11 +198,11 @@
     ss = test(ss,  eax_opnd,   eax_opnd);
     ss = branch8(ss, Condition_NZ,  Imm_Opnd(size_8, 0));
     char *backpatch_address__fat_monitor = ((char *)ss) - 1;
-    
+
     // recursion or reservation => dec recursion count
-   ss = alu(ss, sub_opc,  edx_opnd, Imm_Opnd(0x800));
-   ss = mov(ss, M_Base_Opnd(ecx_reg,0),  edx_opnd);
-   ss = ret(ss,  Imm_Opnd(4));
+    ss = alu(ss, sub_opc,  edx_opnd, Imm_Opnd(0x800));
+    ss = mov(ss, M_Base_Opnd(ecx_reg,0),  edx_opnd);
+    ss = ret(ss,  Imm_Opnd(4));
 
     signed offset = (signed)ss - (signed)backpatch_address__thin_monitor - 1;
     *backpatch_address__thin_monitor = (char)offset;
@@ -215,8 +210,8 @@
     ss = ret(ss,  Imm_Opnd(4));
 
 
-   offset = (signed)ss - (signed)backpatch_address__fat_monitor - 1;
-   *backpatch_address__fat_monitor = (char)offset;
+    offset = (signed)ss - (signed)backpatch_address__fat_monitor - 1;
+    *backpatch_address__fat_monitor = (char)offset;
 
 #endif
 

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_helpers_ipf.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_helpers_ipf.c?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_helpers_ipf.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_helpers_ipf.c Fri Feb  9 09:25:01 2007
@@ -15,10 +15,6 @@
  *  limitations under the License.
  */
 
-/**
- * @author Ivan Volosyuk
- */  
-
 /** 
  * @file thread_helpers_ipf.c
  * Missing definition to ipf compile

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_init.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_init.c?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_init.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_init.c Fri Feb  9 09:25:01 2007
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/* 
- * @author Nikolay Kuznetsov
- * @version $Revision: 1.1.2.14 $
- */  
-
 /**
  * @file thread_init.c
  * @brief hythread init/shutdown functions
@@ -38,7 +33,7 @@
 hythread_library_t TM_LIBRARY = NULL;
 
 //Thread manager memory pool
-apr_pool_t     *TM_POOL = NULL;
+apr_pool_t *TM_POOL = NULL;
 
 //TLS key
 apr_threadkey_t *TM_THREAD_KEY;
@@ -56,7 +51,7 @@
 hythread_monitor_t *lock_table = NULL;
 int table_size = 8024;
 
-IDATA       groups_count;
+IDATA groups_count;
 
 static IDATA init_group_list();
 static IDATA destroy_group_list();
@@ -132,7 +127,7 @@
  * 
  * @see hythread_attach, hythread_shutdown
  */
-void VMCALL hythread_init(hythread_library_t lib){
+void VMCALL hythread_init(hythread_library_t lib) {
     apr_status_t apr_status;
     IDATA status;
     hythread_monitor_t *mon;
@@ -160,32 +155,33 @@
     assert(apr_status == APR_SUCCESS);
     
     status = hymutex_create(&lib->TM_LOCK, TM_MUTEX_NESTED);
-    assert (status == TM_ERROR_NONE);
+    assert(status == TM_ERROR_NONE);
     status = hymutex_create(&TM_START_LOCK, TM_MUTEX_NESTED);
-    assert (status == TM_ERROR_NONE);
+    assert(status == TM_ERROR_NONE);
     status = hymutex_create(&FAT_MONITOR_TABLE_LOCK, TM_MUTEX_NESTED);
-    assert (status == TM_ERROR_NONE);
+    assert(status == TM_ERROR_NONE);
     
     status = init_group_list();
-    assert (status == TM_ERROR_NONE);
+    assert(status == TM_ERROR_NONE);
 
     // Create default group - hosts any thread crated with NULL group
     status = hythread_group_create(&TM_DEFAULT_GROUP);
-    assert (status == TM_ERROR_NONE);
+    assert(status == TM_ERROR_NONE);
 
     //nondaemon thread barrier
     ////
     lib->nondaemon_thread_count = 0;
     status = hycond_create(&lib->nondaemon_thread_cond);
-    assert (status == TM_ERROR_NONE);
+    assert(status == TM_ERROR_NONE);
     
     lock_table = (hythread_monitor_t *)malloc(sizeof(hythread_monitor_t)*table_size);
     assert(lock_table);
     
     // init global monitor
     status=hythread_monitor_init_with_name(&p_global_monitor, 0, "Thread Global Monitor");
-    assert (status == TM_ERROR_NONE);
-        mon = (hythread_monitor_t*)hythread_global(GLOBAL_MONITOR_NAME);
+    assert(status == TM_ERROR_NONE);
+
+    mon = (hythread_monitor_t*)hythread_global(GLOBAL_MONITOR_NAME);
     *mon = p_global_monitor;
     assert(mon);
 }
@@ -244,7 +240,7 @@
     return hymutex_unlock(TM_LIBRARY->TM_LOCK);;
 }
 
-hythread_group_t  get_java_thread_group(void){
+hythread_group_t  get_java_thread_group(void) {
     return TM_DEFAULT_GROUP;
 }
 
@@ -257,7 +253,8 @@
     //the same pool for them
     ////
     dummy = (hythread_group_t)apr_pcalloc(TM_POOL, sizeof(HyThreadGroup));
-        assert(dummy);
+    assert(dummy);
+
     dummy->next = dummy->prev = dummy;
     group_list = dummy;
     groups_count = 0;
@@ -272,7 +269,8 @@
     // This method works only if there are no running threads.
     // there is no good way to kill running threads 
     status=hythread_global_lock();
-        if (status != TM_ERROR_NONE) return status;
+    if (status != TM_ERROR_NONE) return status;
+
     cur = group_list->next;
     status = TM_ERROR_NONE;
     
@@ -302,9 +300,9 @@
 // current scenario use only one global so it works well
 // need to be hashtable in the future
 */
-#define  TABLE_SIZE 256
-char *names [TABLE_SIZE];
-UDATA data [TABLE_SIZE];
+#define TABLE_SIZE 256
+char *names[TABLE_SIZE];
+UDATA data[TABLE_SIZE];
 int size = 0;
 
 /*
@@ -330,7 +328,7 @@
 // return new entry index,  -1 if failed.
 int add_entry(char* name) {
     int index = size++;
-    if(index >= TABLE_SIZE-1) {
+    if (index >= TABLE_SIZE-1) {
         return -1;
     }
     names[index] = name;
@@ -352,7 +350,7 @@
 UDATA* VMCALL hythread_global (char* name) {
     //hythread_monitor_enter(*p_global_monitor);
     int index = find_entry(name);
-    if(index == -1) {
+    if (index == -1) {
         index = add_entry(name);
         assert(index >=0);
         if (index < 0) {
@@ -393,7 +391,7 @@
 
 UDATA array_add(array_t array, void *value) {
     UDATA index;
-        if (!array) return 0;   
+    if (!array) return 0;   
     if (array->next_index) {
         index = array->next_index;
     } else {
@@ -409,7 +407,7 @@
     
     array->next_index = array->entries[index].next_free;
     array->entries[index].entry = value;
-        array->size++;
+    array->size++;
 
     return index;
 }

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_attrs.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_attrs.c?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_attrs.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_attrs.c Fri Feb  9 09:25:01 2007
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/** 
- * @author Sergey Petrovsky
- * @version $Revision: 1.1.2.5 $
- */
-
 /**
  * @file thread_java_attrs.c
  * @brief Java thread priority related functions
@@ -37,7 +32,7 @@
  */
 int jthread_get_priority(jthread java_thread) {
     hythread_t tm_native_thread = jthread_get_native_thread(java_thread);
-        return hythread_get_priority(tm_native_thread);
+    return hythread_get_priority(tm_native_thread);
 }
 
 /**
@@ -47,7 +42,7 @@
  * @param[in] priority thread priority
  * @sa java.lang.Thread.setPriority()
  */
-IDATA VMCALL jthread_set_priority(jthread java_thread, int priority){
+IDATA VMCALL jthread_set_priority(jthread java_thread, int priority) {
     hythread_t tm_native_thread = jthread_get_native_thread(java_thread);
     return hythread_set_priority(tm_native_thread, priority);
 }

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_basic.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_basic.c?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_basic.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_basic.c Fri Feb  9 09:25:01 2007
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/** 
- * @author Nikolay Kuznetsov
- * @version $Revision: 1.1.2.21 $
- */  
-
 /**
  * @file thread_java_basic.c
  * @brief Key threading operations like thread creation and pointer conversion.
@@ -91,12 +86,9 @@
     // Send Thread Start event.
     jvmti_send_thread_start_end_event(1);
 
-    if(data->tiProc != NULL)
-    {
+    if (data->tiProc != NULL) {
         data->tiProc(data->tiEnv, jni_env, data->tiProcArgs);
-    }
-    else
-    {
+    } else {
         // for jthread_create();
         (*jni_env) -> CallVoidMethodA(jni_env, java_thread, getRunMethod(jni_env), NULL);
     }
@@ -139,7 +131,7 @@
     // This is for irregular use. In ordinary live valid jthread instance
     // contains weak reference associated with it and native thread to reuse. 
     if (tm_native_thread == NULL) {
-        if( !jthread_thread_init(NULL, jni_env, java_thread, NULL, 0)) {
+        if ( !jthread_thread_init(NULL, jni_env, java_thread, NULL, 0)) {
             return TM_ERROR_OUT_OF_MEMORY;
         }
         tm_native_thread = vm_jthread_get_tm_data(java_thread);
@@ -229,7 +221,7 @@
  * @return the native thread
  */
 jlong jthread_thread_init(jvmti_thread_t *ret_thread, JNIEnv* env, jthread java_thread, jobject weak_ref, jlong old_thread) {
-    hythread_t     tm_native_thread = NULL;
+    hythread_t tm_native_thread = NULL;
     jvmti_thread_t tmj_thread;
     IDATA status;
 
@@ -275,7 +267,7 @@
     tm_jvmti_thread = hythread_get_private_data(tm_native_thread);
     jni_env = tm_jvmti_thread->jenv;
 
-    if (!tm_jvmti_thread->daemon){
+    if (!tm_jvmti_thread->daemon) {
         countdown_nondaemon_threads(tm_native_thread);
     }
 
@@ -371,15 +363,15 @@
 IDATA jthread_timed_join(jthread java_thread, jlong millis, jint nanos) {
         
     hythread_t  tm_native_thread;
-        IDATA status;
+    IDATA status;
 
-        if (java_thread == NULL){
-            return TM_ERROR_NULL_POINTER;
-        }
+    if (java_thread == NULL) {
+        return TM_ERROR_NULL_POINTER;
+    }
     tm_native_thread = jthread_get_native_thread(java_thread);
-        if(!tm_native_thread) {
-                return TM_ERROR_NONE;
-        }
+    if (!tm_native_thread) {
+            return TM_ERROR_NONE;
+    }
     status = hythread_join_interruptable(tm_native_thread, millis, nanos);
     TRACE(("TM: jthread %d joined %d", hythread_self()->thread_id, tm_native_thread->thread_id));
 
@@ -390,7 +382,7 @@
  * Lets an another thread to pass.
  * @sa java.lang.Thread.yield()
  */
-IDATA jthread_yield(){
+IDATA jthread_yield() {
     hythread_yield();
     return TM_ERROR_NONE;
 }
@@ -477,7 +469,7 @@
 IDATA jthread_sleep(jlong millis, jint nanos) {
 
     hythread_t tm_native_thread = hythread_self();
-        IDATA status;
+    IDATA status;
 
     tm_native_thread->state &= ~TM_THREAD_STATE_RUNNABLE;
     tm_native_thread->state |= TM_THREAD_STATE_WAITING | TM_THREAD_STATE_SLEEPING |
@@ -641,7 +633,7 @@
         status = hycond_wait(lib->nondaemon_thread_cond, lib->TM_LOCK);
         //check interruption and other problems
         TRACE(("TM wait for nondaemons notified, count: %d", lib->nondaemon_thread_count));
-        if(status != TM_ERROR_NONE) {
+        if (status != TM_ERROR_NONE) {
             hymutex_unlock(lib->TM_LOCK);
             return status;
         }
@@ -655,7 +647,7 @@
  *  Auxiliary function to throw java.lang.InterruptedException
  */
 
-void throw_interrupted_exception(void){
+void throw_interrupted_exception(void) {
 
     jvmti_thread_t tm_java_thread;
     hythread_t tm_native_thread;
@@ -676,7 +668,7 @@
     IDATA status;
     
     status=acquire_start_lock();
-    assert (status == TM_ERROR_NONE);
+    assert(status == TM_ERROR_NONE);
     //printf("run method find enter\n");
     if (!run_method) {
         clazz = (*env) -> FindClass(env, "java/lang/Thread");
@@ -684,7 +676,7 @@
     }
     status=release_start_lock();
     //printf("run method find exit\n");
-    assert (status == TM_ERROR_NONE);
+    assert(status == TM_ERROR_NONE);
     return run_method;
 }
 
@@ -711,7 +703,7 @@
     status = hymutex_lock(lib->TM_LOCK);
     if (status != TM_ERROR_NONE) return status;
     
-    if(lib->nondaemon_thread_count <= 0) {
+    if (lib->nondaemon_thread_count <= 0) {
         status = hymutex_unlock(lib->TM_LOCK);
         if (status != TM_ERROR_NONE) return status;
         return TM_ERROR_ILLEGAL_STATE;
@@ -719,10 +711,10 @@
     
     TRACE(("TM: nondaemons decreased, thread: %p count: %d\n", self, lib->nondaemon_thread_count));
     lib->nondaemon_thread_count--;
-    if(lib->nondaemon_thread_count <= 1) {
+    if (lib->nondaemon_thread_count <= 1) {
         status = hycond_notify_all(lib->nondaemon_thread_cond); 
         TRACE(("TM: nondaemons all dead, thread: %p count: %d\n", self, lib->nondaemon_thread_count));
-        if (status != TM_ERROR_NONE){
+        if (status != TM_ERROR_NONE) {
             hymutex_unlock(lib->TM_LOCK);
             return status;
         }

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_interrupt.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_interrupt.c?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_interrupt.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_interrupt.c Fri Feb  9 09:25:01 2007
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/** 
- * @author Sergey Petrovsky
- * @version $Revision: 1.1.2.5 $
- */  
-
 /**
  * @file thread_java_interrupt.c
  * @brief Java thread interruption related functions
@@ -56,7 +51,7 @@
  * @sa java.lang.Thread.isInterrupted()
  */
 jboolean jthread_is_interrupted(jthread java_thread) {   
-        hythread_t tm_native_thread = jthread_get_native_thread(java_thread);
+    hythread_t tm_native_thread = jthread_get_native_thread(java_thread);
     return hythread_interrupted(tm_native_thread) > 0;
    
 }

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_iterator.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_iterator.c?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_iterator.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_iterator.c Fri Feb  9 09:25:01 2007
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/** 
- * @author Dmitry Demin
- * @version $Revision: 1.1.2.8 $
- */  
-
 /**
  * @file thread_java_iterator.c
  * @brief Java thread iterator related functions
@@ -66,11 +61,11 @@
     hythread_t tm_native_thread;
     jvmti_thread_t tm_java_thread;
     tm_native_thread = hythread_iterator_next((hythread_iterator_t *)it);
-    while(tm_native_thread!=NULL)
+    while (tm_native_thread!=NULL)
     {
         if (hythread_is_alive(tm_native_thread)) {
             tm_java_thread = hythread_get_private_data(tm_native_thread);
-            if (tm_java_thread){
+            if (tm_java_thread) {
                 return (jthread)tm_java_thread->thread_object;
             }
         }
@@ -86,19 +81,17 @@
  * @param[in] iterator
  */
 IDATA VMCALL jthread_iterator_size(jthread_iterator_t iterator) {
-        jthread res;
-        IDATA status;
-        int count=0;
-        status=jthread_iterator_reset(&iterator);
-        assert (status == TM_ERROR_NONE);
+    jthread res;
+    IDATA status;
+    int count=0;
+    status=jthread_iterator_reset(&iterator);
+    assert(status == TM_ERROR_NONE);
+    res = jthread_iterator_next(&iterator);
+    while (res!=NULL) {
+        count++;        
         res = jthread_iterator_next(&iterator);
-        while(res!=NULL){
-            count++;        
-            res = jthread_iterator_next(&iterator);
-        }
-        status=jthread_iterator_reset(&iterator);
-        assert (status == TM_ERROR_NONE);
-        return count;
+    }
+    status=jthread_iterator_reset(&iterator);
+    assert(status == TM_ERROR_NONE);
+    return count;
 }
-
-

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_monitors.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_monitors.c?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_monitors.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_monitors.c Fri Feb  9 09:25:01 2007
@@ -14,10 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Artem Aliev
- * @version $Revision: 1.1.2.16 $
- */  
 
 /**
  * @file thread_java_monitors.c
@@ -73,7 +69,7 @@
     hythread_thin_monitor_t *lockword;
     IDATA status;
     // should be moved to event handler
-      apr_time_t enter_begin;
+    apr_time_t enter_begin;
     jvmti_thread_t tm_java_thread;
     hythread_t tm_native_thread;
     int disable_count;
@@ -82,20 +78,20 @@
     hythread_suspend_disable();
     lockword = vm_object_get_lockword_addr(monitor);
     status = hythread_thin_monitor_try_enter(lockword);
-    if(status != TM_ERROR_EBUSY) {
+    if (status != TM_ERROR_EBUSY) {
         goto entered;
     }
 
     /////////
 #ifdef LOCK_RESERVATION
-// busy unreserve lock before blocking and inflating
+    // busy unreserve lock before blocking and inflating
     while (TM_ERROR_NONE !=unreserve_lock(lockword)) {
         hythread_yield();
         hythread_safe_point();
-         lockword = vm_object_get_lockword_addr(monitor);
+        lockword = vm_object_get_lockword_addr(monitor);
     }
     status = hythread_thin_monitor_try_enter(lockword);
-    if(status != TM_ERROR_EBUSY) {
+    if (status != TM_ERROR_EBUSY) {
         goto entered;
     }
 #endif //LOCK_RESERVATION
@@ -104,7 +100,7 @@
     tm_native_thread->state |= TM_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER;
 
     // should be moved to event handler
-    if (ti_is_enabled()){
+    if (ti_is_enabled()) {
         enter_begin = apr_time_now();
         disable_count =  reset_suspend_disable();
         set_contended_monitor(monitor);
@@ -133,12 +129,12 @@
         hythread_yield();
     }
     assert(status == TM_ERROR_NONE);
-    if(!is_fat_lock(*lockword)) {
+    if (!is_fat_lock(*lockword)) {
         inflate_lock(lockword);
     }
 // do all ti staff here
 contended_entered:
-    if (ti_is_enabled()){
+    if (ti_is_enabled()) {
         disable_count =  reset_suspend_disable();
         jvmti_send_contended_enter_or_entered_monitor_event(monitor, 0);
         set_suspend_disable(disable_count);
@@ -173,7 +169,7 @@
     status = hythread_thin_monitor_try_enter(lockword);
     
     hythread_suspend_enable();
-    if (status == TM_ERROR_NONE && ti_is_enabled()){
+    if (status == TM_ERROR_NONE && ti_is_enabled()) {
         add_owned_monitor(monitor);
     }
     return status;
@@ -195,7 +191,7 @@
     lockword = vm_object_get_lockword_addr(monitor);
     status =  hythread_thin_monitor_exit(lockword);
     hythread_suspend_enable();
-     if (status == TM_ERROR_NONE && ti_is_enabled()){
+    if (status == TM_ERROR_NONE && ti_is_enabled()) {
         remove_owned_monitor(monitor);
     }
     if (status == TM_ERROR_ILLEGAL_STATE) {
@@ -303,9 +299,9 @@
     lockword = vm_object_get_lockword_addr(monitor);
     if (!is_fat_lock(*lockword)) {
         if (!owns_thin_lock(hythread_self(), *lockword)) {
-                    TRACE(("ILLEGAL_STATE wait %x\n", lockword));
-                                hythread_suspend_enable();
-                return TM_ERROR_ILLEGAL_STATE;  
+            TRACE(("ILLEGAL_STATE wait %x\n", lockword));
+            hythread_suspend_enable();
+            return TM_ERROR_ILLEGAL_STATE;  
         }    
         inflate_lock(lockword);
     }
@@ -328,7 +324,8 @@
     tm_native_thread->state &= ~TM_THREAD_STATE_RUNNABLE;
     tm_native_thread->state |= TM_THREAD_STATE_WAITING |
             TM_THREAD_STATE_IN_MONITOR_WAIT;
-    if((millis > 0) || (nanos > 0)) { 
+
+    if ((millis > 0) || (nanos > 0)) {
        tm_native_thread->state |= TM_THREAD_STATE_WAITING_WITH_TIMEOUT;
     } else {
        tm_native_thread->state |= TM_THREAD_STATE_WAITING_INDEFINITELY;
@@ -338,7 +335,7 @@
 
     tm_native_thread->state &= ~(TM_THREAD_STATE_WAITING | 
 			                         TM_THREAD_STATE_IN_MONITOR_WAIT);
-    if((millis > 0) || (nanos > 0)) { 
+    if ((millis > 0) || (nanos > 0)) {
        tm_native_thread->state &= ~TM_THREAD_STATE_WAITING_WITH_TIMEOUT;
     } else {
        tm_native_thread->state &= ~TM_THREAD_STATE_WAITING_INDEFINITELY;
@@ -346,7 +343,7 @@
     tm_native_thread->state |= TM_THREAD_STATE_RUNNABLE;
 
     hythread_suspend_enable();
-    if (ti_is_enabled()){
+    if (ti_is_enabled()) {
         add_owned_monitor(monitor);
         disable_count =  reset_suspend_disable();
         jvmti_send_contended_enter_or_entered_monitor_event(monitor, 0);
@@ -360,7 +357,7 @@
     return status;
 }
 
-void add_owned_monitor(jobject monitor){
+void add_owned_monitor(jobject monitor) {
     hythread_t tm_native_thread = hythread_self();
     jvmti_thread_t tm_java_thread = hythread_get_private_data(tm_native_thread);
     int disable_status;
@@ -379,7 +376,7 @@
     }
     
     
-    if (!tm_java_thread->owned_monitors){
+    if (!tm_java_thread->owned_monitors) {
          tm_java_thread->owned_monitors = apr_pcalloc(tm_java_thread->pool,
                             MAX_OWNED_MONITOR_NUMBER * sizeof(jobject));
          assert(tm_java_thread->owned_monitors);
@@ -393,7 +390,7 @@
     tm_java_thread->owned_monitors_nmb++;
 }
 
-void remove_owned_monitor(jobject monitor){
+void remove_owned_monitor(jobject monitor) {
     int i,j, disable_status;
     hythread_t tm_native_thread = hythread_self();
     jvmti_thread_t tm_java_thread = hythread_get_private_data(tm_native_thread);
@@ -401,12 +398,12 @@
     TRACE(("TM: remove owned monitor: %x", monitor));
     
     if (!tm_java_thread) return;
-    for (i = tm_java_thread->owned_monitors_nmb - 1; i >= 0; i--){
-        if (vm_objects_are_equal(tm_java_thread->owned_monitors[i], monitor)){
+    for (i = tm_java_thread->owned_monitors_nmb - 1; i >= 0; i--) {
+        if (vm_objects_are_equal(tm_java_thread->owned_monitors[i], monitor)) {
             disable_status = reset_suspend_disable();
             (*(tm_java_thread->jenv))->DeleteGlobalRef(tm_java_thread->jenv, tm_java_thread->owned_monitors[i]);
             set_suspend_disable(disable_status);
-            for (j = i; j < tm_java_thread->owned_monitors_nmb - 1; j++){
+            for (j = i; j < tm_java_thread->owned_monitors_nmb - 1; j++) {
                 tm_java_thread->owned_monitors[j] = tm_java_thread->owned_monitors[j + 1];
             }
             tm_java_thread->owned_monitors_nmb--;
@@ -416,7 +413,7 @@
     //assert(0); monitor - it is no valid monitor
 }
 
-void set_contended_monitor(jobject monitor){
+void set_contended_monitor(jobject monitor) {
     hythread_t tm_native_thread = hythread_self();
     IDATA suspend_status;
     
@@ -430,7 +427,7 @@
     set_suspend_disable(suspend_status);
 }
 
-void set_wait_monitor(jobject monitor){
+void set_wait_monitor(jobject monitor) {
     hythread_t tm_native_thread = hythread_self();
     IDATA suspend_status;
     
@@ -439,7 +436,7 @@
     if (!tm_java_thread) return;
 
     suspend_status = reset_suspend_disable();
-    assert (suspend_status == TM_ERROR_NONE);
+    assert(suspend_status == TM_ERROR_NONE);
     tm_java_thread->wait_monitor = (*(tm_java_thread->jenv))->NewGlobalRef(tm_java_thread->jenv, monitor);
     set_suspend_disable(suspend_status);
 }

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_park.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_park.c?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_park.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_park.c Fri Feb  9 09:25:01 2007
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/** 
- * @author Sergey Petrovsky
- * @version $Revision: 1.1.2.6 $
- */  
-
 /**
  * @file thread_java_park.c
  * @brief Java thread park/unpark functions
@@ -39,7 +34,7 @@
  * @sa java.util.concurrent.locks.LockSupport.park() 
  */
 IDATA VMCALL jthread_park() {
-    return hythread_park(0,0);
+    return hythread_park(0, 0);
 }
 
 /**
@@ -71,12 +66,10 @@
  * @sa java.util.concurrent.locks.LockSupport.unpark() 
  */
 IDATA VMCALL jthread_unpark(jthread java_thread) {
+    hythread_t tm_native_thread;
 
-        hythread_t tm_native_thread;
-
-        assert(java_thread);
+    assert(java_thread);
     tm_native_thread = jthread_get_native_thread(java_thread);
-    
     hythread_unpark(tm_native_thread);
     
     return TM_ERROR_NONE;

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_suspend.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_suspend.c?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_suspend.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_java_suspend.c Fri Feb  9 09:25:01 2007
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/** 
- * @author Sergey Petrovsky
- * @version $Revision: 1.1.2.5 $
- */  
-
 /**
  * @file thread_java_suspend.c
  * @brief Java thread suspend/resume functions
@@ -41,7 +36,7 @@
  */
 IDATA VMCALL jthread_resume(jthread java_thread) {
     hythread_t tm_native_thread = vm_jthread_get_tm_data(java_thread);
-        hythread_resume(tm_native_thread);
+    hythread_resume(tm_native_thread);
     return TM_ERROR_NONE;
 }
 
@@ -54,13 +49,12 @@
  * @sa JVMTI::ResumeThreadList()
  */
 IDATA VMCALL jthread_resume_all(jvmtiError* results, jint count, const jthread* thread_list) {
-    
-        int i;
+    int i;
 
-        for (i = 0; i < count; i++){
-                results[i] = (jvmtiError)jthread_resume(thread_list[i]);
-        }
-        return TM_ERROR_NONE;
+    for (i = 0; i < count; i++) {
+        results[i] = (jvmtiError)jthread_resume(thread_list[i]);
+    }
+    return TM_ERROR_NONE;
 }
 
 /**
@@ -82,9 +76,8 @@
  * @sa java.lang.Thread.suspend(), JVMTI::SuspendThread()
  */
 IDATA VMCALL jthread_suspend(jthread java_thread) {
-        hythread_t tm_native_thread = vm_jthread_get_tm_data(java_thread);
-        return hythread_suspend_other(tm_native_thread);
-    
+    hythread_t tm_native_thread = vm_jthread_get_tm_data(java_thread);
+    return hythread_suspend_other(tm_native_thread);
 }
 
 /**
@@ -108,10 +101,10 @@
  * @sa JVMTI::SuspendThreadList()
  */
 IDATA VMCALL jthread_suspend_all(jvmtiError* results, jint count, const jthread* thread_list) {
-        int i;
-        for (i = 0; i < count; i++){
-                results[i] = (jvmtiError)jthread_suspend(thread_list[i]);
-        }
+    int i;
+    for (i = 0; i < count; i++) {
+        results[i] = (jvmtiError)jthread_suspend(thread_list[i]);
+    }
     return TM_ERROR_NONE;
 }
 

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_attrs.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_attrs.c?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_attrs.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_attrs.c Fri Feb  9 09:25:01 2007
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/** 
- * @author Nikolay Kuznetsov
- * @version $Revision: 1.1.2.7 $
- */  
-
 /**
  * @file thread_native_attrs.c
  * @brief Hythread priority related functions
@@ -44,7 +39,7 @@
  * 
  * 
  */
-IDATA VMCALL hythread_set_priority(hythread_t thread, UDATA priority){
+IDATA VMCALL hythread_set_priority(hythread_t thread, UDATA priority) {
     apr_status_t apr_status = apr_thread_set_priority(thread->os_handle, priority); 
     if (apr_status != APR_SUCCESS) return CONVERT_ERROR(apr_status);
     thread->priority = priority;

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_basic.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_basic.c?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_basic.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_basic.c Fri Feb  9 09:25:01 2007
@@ -46,14 +46,13 @@
 static IDATA register_to_group(hythread_t thread, hythread_group_t group);
 //#define APR_TLS_USE 1
 
-#define NAKED __declspec( naked )
+#define NAKED __declspec(naked)
 
-#if !defined (APR_TLS_USE ) && !defined (FS14_TLS_USE)
+#if !defined (APR_TLS_USE) && !defined (FS14_TLS_USE)
 #ifdef PLATFORM_POSIX
 __thread hythread_t tm_self_tls = NULL;
 #else
 __declspec(thread) hythread_t tm_self_tls = NULL;
-
 #endif
 #endif
 
@@ -279,7 +278,7 @@
     
     // Acquire global TM lock to prevent concurrent access to thread list
     status = hythread_global_lock(NULL);
-    assert (status == TM_ERROR_NONE);
+    assert(status == TM_ERROR_NONE);
 
     // No actions required in case the specified thread is detached already.
     if (thread->group != NULL) {
@@ -428,7 +427,7 @@
     
     hythread_t thread = tm_self_tls;
     
-    if(nanos == 0 && millis == 0) {
+    if (nanos == 0 && millis == 0) {
         hythread_yield();
         return TM_ERROR_NONE;
     }         
@@ -503,7 +502,7 @@
  * @param[in] t thread those private data to get
  * @return pointer to thread private data
  */
-void* VMCALL hythread_get_private_data(hythread_t  t){
+void* VMCALL hythread_get_private_data(hythread_t t) {
     assert(t);
     return t->private_data;
 }
@@ -513,7 +512,7 @@
  * @param t thread
  * @param data pointer to private data
  */
-IDATA VMCALL hythread_set_private_data(hythread_t  t, void* data) {
+IDATA VMCALL hythread_set_private_data(hythread_t t, void* data) {
     assert(t);
     t->private_data = data;
     return TM_ERROR_NONE;
@@ -561,8 +560,8 @@
     }
     
     iter = hythread_iterator_create(group);
-    while((next = hythread_iterator_next (&iter)) != NULL) {
-        if(next != self) {
+    while ((next = hythread_iterator_next (&iter)) != NULL) {
+        if (next != self) {
             hythread_cancel(next);
             //since this method being used at shutdown it does not
             //make any sense to exit on error, but continue terminating threads
@@ -638,7 +637,7 @@
     IDATA status;
 
     apr_status = apr_pool_create(&pool, TM_POOL);
-    if((apr_status != APR_SUCCESS) || (pool == NULL)) return NULL;
+    if ((apr_status != APR_SUCCESS) || (pool == NULL)) return NULL;
 
     ptr = (hythread_t )apr_pcalloc(pool, sizeof(HyThread));
     if (ptr == NULL) return NULL;
@@ -653,15 +652,15 @@
     ptr->suspend_request = 0;
     ptr->suspend_disable_count = 0;
     status = hylatch_create(&ptr->join_event, 1);
-    assert (status == TM_ERROR_NONE);
+    assert(status == TM_ERROR_NONE);
     status = hylatch_create(&ptr->safe_region_event, 1);
-    assert (status == TM_ERROR_NONE);
+    assert(status == TM_ERROR_NONE);
     status = hysem_create(&ptr->resume_event, 0, 1);
-    assert (status == TM_ERROR_NONE);
+    assert(status == TM_ERROR_NONE);
     status = hymutex_create(&ptr->mutex, TM_MUTEX_NESTED);
-    assert (status == TM_ERROR_NONE);
+    assert(status == TM_ERROR_NONE);
     status = hycond_create(&ptr->condition);
-    assert (status == TM_ERROR_NONE);
+    assert(status == TM_ERROR_NONE);
     
     ptr->state = TM_THREAD_STATE_ALLOCATED;
     return ptr;
@@ -685,11 +684,11 @@
     thread->suspend_disable_count = 0;
     thread->safepoint_callback = NULL;
     status = hylatch_set(thread->join_event, 1);
-    assert (status == TM_ERROR_NONE);
+    assert(status == TM_ERROR_NONE);
     status = hylatch_set(thread->safe_region_event, 1);
-    assert (status == TM_ERROR_NONE);
+    assert(status == TM_ERROR_NONE);
     status = hysem_set(thread->resume_event, 0);
-    assert (status == TM_ERROR_NONE);
+    assert(status == TM_ERROR_NONE);
     
     thread->state = TM_THREAD_STATE_ALLOCATED;
 }
@@ -716,7 +715,7 @@
     // Also, should it be executed under TM global lock?
     thread->os_handle = thd; // DELETE?
     status = hythread_set_priority(thread, thread->priority);
-    //assert (status == TM_ERROR_NONE);//now we down - fixme
+    //assert(status == TM_ERROR_NONE);//now we down - fixme
     thread->state |= TM_THREAD_STATE_RUNNABLE;
 
     // Do actual call of the thread body supplied by the user.
@@ -724,7 +723,7 @@
 
     // Shutdown sequence.
     status = hythread_global_lock(NULL);
-    assert (status == TM_ERROR_NONE);
+    assert(status == TM_ERROR_NONE);
     assert(hythread_is_suspend_enabled()); 
     thread->state = TM_THREAD_STATE_TERMINATED | (TM_THREAD_STATE_INTERRUPTED  & thread->state);
     thread->exit_value = 0;
@@ -734,7 +733,7 @@
     hylatch_count_down(thread->join_event);
 
     status = hythread_global_unlock(NULL);
-    assert (status == TM_ERROR_NONE);    
+    assert(status == TM_ERROR_NONE);    
     
     // TODO: It seems it is there is no need to call apr_thread_exit.
     // Current thread should automatically exit upon returning from this function.

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_condvar.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_condvar.c?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_condvar.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_condvar.c Fri Feb  9 09:25:01 2007
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/** 
- * @author Nikolay Kuznetsov
- * @version $Revision: 1.1.2.8 $
- */  
-
 /**
  * @file thread_native_condvar.c
  * @brief Hythread condvar related functions
@@ -48,41 +43,40 @@
 }
 
 IDATA condvar_wait_impl(hycond_t cond, hymutex_t mutex, I_64 ms, IDATA nano, IDATA interruptable) {
-        apr_status_t apr_status;
-        int disable_count;
-        hythread_t this_thread;
+    apr_status_t apr_status;
+    int disable_count;
+    hythread_t this_thread;
     
     this_thread = tm_self_tls;    
     
     // Store provided cond into current thread cond
     this_thread->current_condition = interruptable ? cond : NULL;
 
-        // check interrupted flag
+    // check interrupted flag
     if (interruptable && (this_thread->state & TM_THREAD_STATE_INTERRUPTED)) {
         // clean interrupted flag
         this_thread->state &= (~TM_THREAD_STATE_INTERRUPTED);
                 return TM_ERROR_INTERRUPT;
     }
 
-        disable_count = reset_suspend_disable(); 
-        // Delegate to OS wait
+    disable_count = reset_suspend_disable(); 
+    // Delegate to OS wait
     apr_status = (!ms && !nano)?
         apr_thread_cond_wait((apr_thread_cond_t*)cond, (apr_thread_mutex_t*)mutex):
 	apr_thread_cond_timedwait ((apr_thread_cond_t*)cond, (apr_thread_mutex_t*)mutex, ms*1000 + ((nano < 1000) ? 1 : (nano / 1000)));
         
     set_suspend_disable(disable_count);
 
-        this_thread->current_condition = NULL;
+    this_thread->current_condition = NULL;
    
     // check interrupted flag
     if (interruptable &&  (this_thread->state & TM_THREAD_STATE_INTERRUPTED)) {
         // clean interrupted flag
         this_thread->state &= (~TM_THREAD_STATE_INTERRUPTED);
-                return TM_ERROR_INTERRUPT;
+        return TM_ERROR_INTERRUPT;
     }
 
-        return CONVERT_ERROR(apr_status);
-
+    return CONVERT_ERROR(apr_status);
 }
 
 /**
@@ -150,8 +144,8 @@
  * @sa apr_thread_cond_broadcast()
  */
 IDATA VMCALL hycond_notify_all (hycond_t cond) {
-        apr_status_t apr_status = apr_thread_cond_broadcast((apr_thread_cond_t*)cond);
-        if (apr_status != APR_SUCCESS) return CONVERT_ERROR(apr_status);
+    apr_status_t apr_status = apr_thread_cond_broadcast((apr_thread_cond_t*)cond);
+    if (apr_status != APR_SUCCESS) return CONVERT_ERROR(apr_status);
     return TM_ERROR_NONE;   
 }
 
@@ -162,14 +156,13 @@
  * @sa apr_thread_cond_destroy()
  */
 IDATA VMCALL hycond_destroy (hycond_t cond) {
-        apr_status_t apr_status;
+    apr_status_t apr_status;
     apr_pool_t *pool = apr_thread_cond_pool_get ((apr_thread_cond_t*)cond);
-    if(pool != get_local_pool()) {
+    if (pool != get_local_pool()) {
           return local_pool_cleanup_register(hycond_destroy, cond);
     }
     apr_status=apr_thread_cond_destroy((apr_thread_cond_t*)cond);
     return CONVERT_ERROR(apr_status);
-
 }
 
 //@}

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_groups.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_groups.c?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_groups.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_groups.c Fri Feb  9 09:25:01 2007
@@ -45,16 +45,16 @@
     hythread_t dummy;
     apr_pool_t  *group_pool;
     apr_status_t apr_status;
-        IDATA status;
+    IDATA status;
     
     apr_status = apr_pool_create(&(group_pool), TM_POOL);
     if (apr_status != APR_SUCCESS) return CONVERT_ERROR(apr_status);
     
     status=hythread_global_lock();
-        if (status != TM_ERROR_NONE) return status;
+    if (status != TM_ERROR_NONE) return status;
     
     (*group) = (hythread_group_t )apr_palloc(group_pool, sizeof(HyThreadGroup));
-    if (! *group){
+    if (!*group) {
        hythread_global_unlock();
        return TM_ERROR_OUT_OF_MEMORY;
     }
@@ -69,7 +69,7 @@
     //dummy thread as the head of the group
     ////
     dummy = (hythread_t)apr_pcalloc(group_pool, sizeof(HyThread));
-    if (! dummy){
+    if (!dummy) {
         hythread_global_unlock();
         return TM_ERROR_OUT_OF_MEMORY;
     }
@@ -125,7 +125,7 @@
          return status;
      (*size) = groups_count;
      array_for_list=(hythread_group_t*)malloc(sizeof(hythread_group_t)*groups_count);
-     if(array_for_list==NULL)
+     if (array_for_list==NULL)
      { 
          status=hythread_global_unlock();
          return TM_ERROR_OUT_OF_MEMORY;

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_interrupt.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_interrupt.c?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_interrupt.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_interrupt.c Fri Feb  9 09:25:01 2007
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/** 
- * @author Artem Aliev
- * @version $Revision: 1.1.2.7 $
- */  
-
 /**
  * @file thread_native_interrupt.c
  * @brief Hythread interruption related functions
@@ -82,7 +77,7 @@
  * @return  previous value of interrupted flag: non-zero if the thread had been interrupted.
  */
 UDATA VMCALL hythread_clear_interrupted() {
-        return hythread_clear_interrupted_other(tm_self_tls);
+    return hythread_clear_interrupted_other(tm_self_tls);
 }
 
 /**
@@ -92,7 +87,7 @@
  * @return 0 if not interrupted, non-zero if interrupted
  */
 UDATA VMCALL hythread_interrupted(hythread_t thread) {
-        int interrupted = thread->state & TM_THREAD_STATE_INTERRUPTED;
-        return interrupted?TM_ERROR_INTERRUPT:TM_ERROR_NONE;
+    int interrupted = thread->state & TM_THREAD_STATE_INTERRUPTED;
+    return interrupted?TM_ERROR_INTERRUPT:TM_ERROR_NONE;
 }
 

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_iterator.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_iterator.c?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_iterator.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_iterator.c Fri Feb  9 09:25:01 2007
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/** 
- * @author Nikolay Kuznetsov
- * @version $Revision: 1.1.2.6 $
- */  
-
 /**
  * @file thread_native_iterator.c
  * @brief Hythread iterator related functions
@@ -38,9 +33,9 @@
  * @param[in] group thread group number
  */
 hythread_iterator_t VMCALL hythread_iterator_create(hythread_group_t group) {
-        IDATA status;
-    status=hythread_global_lock();
-        assert (status == TM_ERROR_NONE);
+    IDATA status;
+    status = hythread_global_lock();
+    assert(status == TM_ERROR_NONE);
     group = (group)?group:TM_DEFAULT_GROUP;
     TRACE(("TM iterator created: %p head: %p", group->thread_list, group->thread_list->next));
     return (hythread_iterator_t)group->thread_list->next;

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_latch.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_latch.c?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_latch.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_latch.c Fri Feb  9 09:25:01 2007
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/** 
- * @author Artem Aliev
- * @version $Revision: 1.1.2.7 $
- */  
-
 /**
  * @file thread_native_latch.c
  * @brief Hythread latch related functions
@@ -48,22 +43,22 @@
 IDATA VMCALL hylatch_create(hylatch_t *latch, IDATA count) {
     hylatch_t l;
     apr_pool_t *pool = get_local_pool(); 
-        apr_status_t apr_status;
-        
-        l = apr_palloc(pool, sizeof(HyLatch));
-        if(l == NULL) {
-                return TM_ERROR_OUT_OF_MEMORY;
-        }
+    apr_status_t apr_status;
+    
+    l = apr_palloc(pool, sizeof(HyLatch));
+    if (l == NULL) {
+            return TM_ERROR_OUT_OF_MEMORY;
+    }
     apr_status = apr_thread_mutex_create((apr_thread_mutex_t**)&(l->mutex), TM_MUTEX_DEFAULT, pool);
-        if (apr_status != APR_SUCCESS) return CONVERT_ERROR(apr_status);
+    if (apr_status != APR_SUCCESS) return CONVERT_ERROR(apr_status);
         
     apr_status = apr_thread_cond_create((apr_thread_cond_t**)&(l->condition), pool);
 
-        if (apr_status != APR_SUCCESS) return CONVERT_ERROR(apr_status);
+    if (apr_status != APR_SUCCESS) return CONVERT_ERROR(apr_status);
 
-        l->count = count;
-        l->pool = pool;
-        *latch = l;
+    l->count = count;
+    l->pool = pool;
+    *latch = l;
     return TM_ERROR_NONE;
 }
 
@@ -72,20 +67,20 @@
 static IDATA latch_wait_impl(hylatch_t latch, I_64 ms, IDATA nano, IDATA interruptable) {
     IDATA status;
         
-        status = hymutex_lock(latch->mutex);
-        if (status != TM_ERROR_NONE) return status;
-        while (latch->count) {
-                status = condvar_wait_impl(latch->condition, latch->mutex, ms, nano, interruptable);
-                //check interruption and other problems
-                if (status != TM_ERROR_NONE) {
-                        hymutex_unlock(latch->mutex);
-                        return status;
-                }
+    status = hymutex_lock(latch->mutex);
+    if (status != TM_ERROR_NONE) return status;
+    while (latch->count) {
+        status = condvar_wait_impl(latch->condition, latch->mutex, ms, nano, interruptable);
+        //check interruption and other problems
+        if (status != TM_ERROR_NONE) {
+            hymutex_unlock(latch->mutex);
+            return status;
+        }
 
         if (ms || nano) break;
-        }
-        status = hymutex_unlock(latch->mutex);
-        if (status != TM_ERROR_NONE) return status;
+    }
+    status = hymutex_unlock(latch->mutex);
+    if (status != TM_ERROR_NONE) return status;
 
     return TM_ERROR_NONE;
 }
@@ -112,7 +107,7 @@
  * @return  
  *      TM_NO_ERROR on success 
  */
-IDATA VMCALL hylatch_wait_timed(hylatch_t latch, I_64 ms, IDATA nano){
+IDATA VMCALL hylatch_wait_timed(hylatch_t latch, I_64 ms, IDATA nano) {
     return latch_wait_impl(latch, ms, nano, WAIT_NONINTERRUPTABLE);       
 }
 
@@ -128,7 +123,7 @@
  *      TM_NO_ERROR on success 
  *      TM_THREAD_INTERRUPTED in case thread was interrupted during wait.
  */
-IDATA VMCALL hylatch_wait_interruptable(hylatch_t latch, I_64 ms, IDATA nano){
+IDATA VMCALL hylatch_wait_interruptable(hylatch_t latch, I_64 ms, IDATA nano) {
     return latch_wait_impl(latch, ms, nano, WAIT_INTERRUPTABLE);       
 }
 
@@ -139,13 +134,13 @@
  * @param[in] count new count value
  */
 IDATA VMCALL hylatch_set(hylatch_t latch, IDATA count) {
-        IDATA status;
-        
-        status = hymutex_lock(latch->mutex);
-        if (status != TM_ERROR_NONE) return status;
-        latch->count = count;
-        status = hymutex_unlock(latch->mutex);
-        if (status != TM_ERROR_NONE) return status;
+    IDATA status;
+    
+    status = hymutex_lock(latch->mutex);
+    if (status != TM_ERROR_NONE) return status;
+    latch->count = count;
+    status = hymutex_unlock(latch->mutex);
+    if (status != TM_ERROR_NONE) return status;
 
     return TM_ERROR_NONE;       
 }
@@ -157,27 +152,27 @@
  * @param[in] latch the latch 
  * @sa java.util.concurrent.CountDownLatch.countDown()
  */
-IDATA VMCALL hylatch_count_down(hylatch_t latch){
-        IDATA status;
-        
-        status = hymutex_lock(latch->mutex);
-        if (status != TM_ERROR_NONE) return status;
-        if(latch->count <= 0) {
-                status = hymutex_unlock(latch->mutex);
-                if (status != TM_ERROR_NONE) return status;
-                return TM_ERROR_ILLEGAL_STATE;
-        }
-        latch->count--;
-        if(latch->count == 0) {
-                status = hycond_notify_all(latch->condition); 
-                if (status != TM_ERROR_NONE){
-                        hymutex_unlock(latch->mutex);
-                        return status;
-                }
-        }
-                
+IDATA VMCALL hylatch_count_down(hylatch_t latch) {
+    IDATA status;
+    
+    status = hymutex_lock(latch->mutex);
+    if (status != TM_ERROR_NONE) return status;
+    if (latch->count <= 0) {
         status = hymutex_unlock(latch->mutex);
         if (status != TM_ERROR_NONE) return status;
+        return TM_ERROR_ILLEGAL_STATE;
+    }
+    latch->count--;
+    if (latch->count == 0) {
+        status = hycond_notify_all(latch->condition); 
+        if (status != TM_ERROR_NONE) {
+            hymutex_unlock(latch->mutex);
+            return status;
+        }
+    }
+            
+    status = hymutex_unlock(latch->mutex);
+    if (status != TM_ERROR_NONE) return status;
         
     return TM_ERROR_NONE;       
 }
@@ -190,14 +185,14 @@
  * @param[out] count count value
  * @param[in] latch the latch 
  */
-IDATA VMCALL hylatch_get_count(IDATA *count, hylatch_t latch){
-        IDATA status;
-        
-        status = hymutex_lock(latch->mutex);
-        if (status != TM_ERROR_NONE) return status;
-        *count = latch->count;
-        status = hymutex_unlock(latch->mutex);
-        if (status != TM_ERROR_NONE) return status;
+IDATA VMCALL hylatch_get_count(IDATA *count, hylatch_t latch) {
+    IDATA status;
+    
+    status = hymutex_lock(latch->mutex);
+    if (status != TM_ERROR_NONE) return status;
+    *count = latch->count;
+    status = hymutex_unlock(latch->mutex);
+    if (status != TM_ERROR_NONE) return status;
 
     return TM_ERROR_NONE;       
 }
@@ -206,9 +201,9 @@
  * 
  * @param[in] latch the latch 
  */
-IDATA VMCALL hylatch_destroy(hylatch_t latch){
+IDATA VMCALL hylatch_destroy(hylatch_t latch) {
     apr_pool_t *pool = latch->pool;
-    if(pool != get_local_pool()) {
+    if (pool != get_local_pool()) {
         return local_pool_cleanup_register(hylatch_destroy, latch);
     }
     apr_thread_mutex_destroy((apr_thread_mutex_t*)latch->mutex);

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_mutex.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_mutex.c?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_mutex.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_mutex.c Fri Feb  9 09:25:01 2007
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/** 
- * @author Artem Aliev
- * @version $Revision: 1.1.2.8 $
- */  
-
 /**
  * @file thread_native_mutex.c
  * @brief Hythread mutex related functions
@@ -53,11 +48,10 @@
  */
 IDATA VMCALL hymutex_create (hymutex_t *mutex, UDATA flags) {
     apr_pool_t *pool = get_local_pool(); 
-        apr_status_t apr_status;
+    apr_status_t apr_status;
         
     apr_status = apr_thread_mutex_create((apr_thread_mutex_t**)mutex, flags, pool);
-
-        return CONVERT_ERROR(apr_status);
+    return CONVERT_ERROR(apr_status);
 }
 
 /**
@@ -68,8 +62,8 @@
  * @sa apr_thread_mutex_lock()
  */
 IDATA VMCALL hymutex_lock(hymutex_t mutex) {
-        apr_status_t apr_status;
-        apr_status = apr_thread_mutex_lock((apr_thread_mutex_t*)mutex);
+    apr_status_t apr_status;
+    apr_status = apr_thread_mutex_lock((apr_thread_mutex_t*)mutex);
 
     return CONVERT_ERROR(apr_status);
 }
@@ -91,8 +85,8 @@
  * @sa apr_thread_mutex_unlock()
  */
 IDATA VMCALL hymutex_unlock (hymutex_t mutex) {
-        apr_status_t apr_status = apr_thread_mutex_unlock((apr_thread_mutex_t*)mutex);
-        assert(apr_status == APR_SUCCESS);
+    apr_status_t apr_status = apr_thread_mutex_unlock((apr_thread_mutex_t*)mutex);
+    assert(apr_status == APR_SUCCESS);
     return CONVERT_ERROR(apr_status);
 }
 
@@ -103,9 +97,9 @@
  * @sa apr_thread_mutex_destroy()
  */
 IDATA VMCALL hymutex_destroy (hymutex_t mutex) {
-        apr_pool_t *pool = apr_thread_mutex_pool_get ((apr_thread_mutex_t*)mutex);
-        apr_status_t apr_status;
-    if(pool != get_local_pool()) {
+    apr_pool_t *pool = apr_thread_mutex_pool_get ((apr_thread_mutex_t*)mutex);
+    apr_status_t apr_status;
+    if (pool != get_local_pool()) {
         return local_pool_cleanup_register(hymutex_destroy, mutex);
     }
     apr_status=apr_thread_mutex_destroy((apr_thread_mutex_t*)mutex);

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_park.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_park.c?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_park.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_park.c Fri Feb  9 09:25:01 2007
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/** 
- * @author Nikolay Kuznetsov
- * @version $Revision: 1.1.2.7 $
- */  
-
 /**
  * @file thread_native_park.c
  * @brief Hythread park/unpark related functions
@@ -84,7 +79,7 @@
  * @see hythread_park
  */
 void VMCALL hythread_unpark(hythread_t thread) {
-    if(thread ==  NULL) {
+    if (thread ==  NULL) {
         return;
     }
     

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_semaphore.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_semaphore.c?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_semaphore.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_semaphore.c Fri Feb  9 09:25:01 2007
@@ -38,22 +38,22 @@
 IDATA VMCALL hysem_create(hysem_t *sem, UDATA initial_count, UDATA max_count) {
     hysem_t l;
     apr_pool_t *pool = get_local_pool(); 
-        apr_status_t apr_status;
-        
-        l = apr_palloc(pool, sizeof(HySemaphore));
-        if(l == NULL) {
-                return TM_ERROR_OUT_OF_MEMORY;
-        }
+    apr_status_t apr_status;
+    
+    l = apr_palloc(pool, sizeof(HySemaphore));
+    if (l == NULL) {
+            return TM_ERROR_OUT_OF_MEMORY;
+    }
     apr_status = apr_thread_mutex_create((apr_thread_mutex_t**)&(l->mutex), TM_MUTEX_DEFAULT, pool);
-        if (apr_status != APR_SUCCESS) return CONVERT_ERROR(apr_status);
+    if (apr_status != APR_SUCCESS) return CONVERT_ERROR(apr_status);
         
     apr_status = apr_thread_cond_create((apr_thread_cond_t**)&(l->condition), pool);
 
-        if (apr_status != APR_SUCCESS) return CONVERT_ERROR(apr_status);
-        l->count = initial_count;
-        l->max_count = max_count;
-        l->pool = pool;
-        *sem = l;
+    if (apr_status != APR_SUCCESS) return CONVERT_ERROR(apr_status);
+    l->count = initial_count;
+    l->max_count = max_count;
+    l->pool = pool;
+    *sem = l;
     return TM_ERROR_NONE;
 }
 
@@ -61,33 +61,32 @@
 IDATA sem_wait_impl(hysem_t sem, I_64 ms, IDATA nano, IDATA interruptable) {
     IDATA status;
         
-        status = hymutex_lock(sem->mutex);
-        if (status != TM_ERROR_NONE) return status;
+    status = hymutex_lock(sem->mutex);
+    if (status != TM_ERROR_NONE) return status;
     //printf("wait %x %d\n", sem, sem->count);
-        //fflush(NULL);
-        while (sem->count<=0) {
-                status = condvar_wait_impl(sem->condition, sem->mutex, ms, nano, interruptable);
-                //check interruption and timeout
-                if(status != TM_ERROR_NONE) {
-                        hymutex_unlock(sem->mutex);
-                        return status;
-                }
+    //fflush(NULL);
+    while (sem->count <= 0) {
+        status = condvar_wait_impl(sem->condition, sem->mutex, ms, nano, interruptable);
+        //check interruption and timeout
+        if (status != TM_ERROR_NONE) {
+            hymutex_unlock(sem->mutex);
+            return status;
+        }
 
         if (nano || ms) break;
-        }
+    }
     //should we check here if timeout is not supposed to happen
-        if(sem->count==0 /*&& (ms || nano)*/)
-        {
-                if (ms || nano) {
-                        hymutex_unlock(sem->mutex);
-                        return TM_ERROR_TIMEOUT;
-                } else {
-                        assert(0);
-                }
+    if (sem->count == 0 /*&& (ms || nano)*/) {
+        if (ms || nano) {
+            hymutex_unlock(sem->mutex);
+            return TM_ERROR_TIMEOUT;
+        } else {
+            assert(0);
         }
-        sem->count--;
-        status = hymutex_unlock(sem->mutex);
-        if (status != TM_ERROR_NONE) return status;
+    }
+    sem->count--;
+    status = hymutex_unlock(sem->mutex);
+    if (status != TM_ERROR_NONE) return status;
 
     return TM_ERROR_NONE;
 }
@@ -147,24 +146,24 @@
  * @see hysem_init, hysem_destroy, hysem_wait
  */
 IDATA VMCALL hysem_post(hysem_t sem) {
-        IDATA status;
+    IDATA status;
     //printf("post %x %d\n", sem, sem->count);
-//      fflush(NULL);
-        status = hymutex_lock(sem->mutex);
-        if (status != TM_ERROR_NONE) return status;
-        if(sem->count >= sem->max_count) {
-                hymutex_unlock(sem->mutex);
+    //fflush(NULL);
+    status = hymutex_lock(sem->mutex);
+    if (status != TM_ERROR_NONE) return status;
+    if (sem->count >= sem->max_count) {
+        hymutex_unlock(sem->mutex);
         //printf("illegal state %d : %d \n", sem->count, sem->max_count);
         //fflush(NULL);
-                return TM_ERROR_ILLEGAL_STATE;
-        }
-        sem->count++;
-        if(sem->count > 0) {
-                hycond_notify(sem->condition);
-        }
-                
-        status = hymutex_unlock(sem->mutex);
-        if (status != TM_ERROR_NONE) return status;
+        return TM_ERROR_ILLEGAL_STATE;
+    }
+    sem->count++;
+    if (sem->count > 0) {
+        hycond_notify(sem->condition);
+    }
+            
+    status = hymutex_unlock(sem->mutex);
+    if (status != TM_ERROR_NONE) return status;
     return TM_ERROR_NONE;
 }
 
@@ -175,25 +174,25 @@
  * @param[in] sem semaphore
  */
 IDATA VMCALL hysem_set(hysem_t sem, IDATA count) {
-        IDATA status;
-        
-        status = hymutex_lock(sem->mutex);
+    IDATA status;
+    
+    status = hymutex_lock(sem->mutex);
+    if (status != TM_ERROR_NONE) return status;
+    if (count > sem->max_count) {
+        hymutex_unlock(sem->mutex);
         if (status != TM_ERROR_NONE) return status;
-        if(count > sem->max_count) {
-                hymutex_unlock(sem->mutex);
-                if (status != TM_ERROR_NONE) return status;
-                return TM_ERROR_ILLEGAL_STATE;
-        }
-        sem->count = count;
-        if(count > 0) {
-                status = hycond_notify_all(sem->condition); 
-                if (status != TM_ERROR_NONE){
-                        hymutex_unlock(sem->mutex);
-                        return status;
-                }
+        return TM_ERROR_ILLEGAL_STATE;
+    }
+    sem->count = count;
+    if (count > 0) {
+        status = hycond_notify_all(sem->condition); 
+        if (status != TM_ERROR_NONE) {
+            hymutex_unlock(sem->mutex);
+            return status;
         }
-        status = hymutex_unlock(sem->mutex);
-        if (status != TM_ERROR_NONE) return status;
+    }
+    status = hymutex_unlock(sem->mutex);
+    if (status != TM_ERROR_NONE) return status;
 
     return TM_ERROR_NONE;       
 }
@@ -205,13 +204,13 @@
  * @param[in] sem semaphore
  */
 IDATA VMCALL hysem_getvalue(IDATA *count, hysem_t sem) {
-        IDATA status;
-        
-        status = hymutex_lock(sem->mutex);
-        if (status != TM_ERROR_NONE) return status;
-        *count = sem->count;
-        status = hymutex_unlock(sem->mutex);
-        if (status != TM_ERROR_NONE) return status;
+    IDATA status;
+    
+    status = hymutex_lock(sem->mutex);
+    if (status != TM_ERROR_NONE) return status;
+    *count = sem->count;
+    status = hymutex_unlock(sem->mutex);
+    if (status != TM_ERROR_NONE) return status;
 
     return TM_ERROR_NONE;      
 }
@@ -229,13 +228,13 @@
  * @see hysem_init, hysem_wait, hysem_post
  */
 IDATA VMCALL hysem_destroy(hysem_t sem) {
-        apr_status_t apr_status;
+    apr_status_t apr_status;
     apr_pool_t *pool = sem->pool;
-    if(pool != get_local_pool()) {
+    if (pool != get_local_pool()) {
         return local_pool_cleanup_register(hysem_destroy, sem);
     }
     apr_status=apr_thread_mutex_destroy((apr_thread_mutex_t*)sem->mutex);
-        if (apr_status != APR_SUCCESS) return CONVERT_ERROR(apr_status);
+    if (apr_status != APR_SUCCESS) return CONVERT_ERROR(apr_status);
     apr_status=apr_thread_cond_destroy((apr_thread_cond_t*)sem->condition);
     // apr_pool_free(pool, sem);
     return CONVERT_ERROR(apr_status);;

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_state.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_state.c?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_state.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_state.c Fri Feb  9 09:25:01 2007
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/** 
- * @author Andrey Chernyshev
- * @version $Revision: 1.1.2.4 $
- */  
-
 /**
  * @file thread_native_state.c
  * @brief Hythread state related functions

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_suspend.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_suspend.c?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_suspend.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_suspend.c Fri Feb  9 09:25:01 2007
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/** 
- * @author Artem Aliev
- * @version $Revision: 1.1.2.11 $
- */
-
 /**
  * @file thread_native_suspend.c
  * @brief Hythread suspend/resume related functions
@@ -42,8 +37,8 @@
 /**
  * Returns non-zero if thread is suspended.
  */
-IDATA VMCALL hythread_is_suspend_enabled(){
-        return tm_self_tls->suspend_disable_count == 0;
+IDATA VMCALL hythread_is_suspend_enabled() {
+    return tm_self_tls->suspend_disable_count == 0;
 }
 
 
@@ -81,7 +76,7 @@
     thread->suspend_disable_count--;
 
 #endif
- //   if(!thread->suspend_request  || thread->suspend_disable_count!=0) {
+ //   if (!thread->suspend_request  || thread->suspend_disable_count!=0) {
    //     return;
    // }
         
@@ -126,7 +121,7 @@
     thread->suspend_disable_count++;
 #endif
 
-    if(!thread->suspend_request  || thread->suspend_disable_count!=1) {
+    if (!thread->suspend_request  || thread->suspend_disable_count!=1) {
         return;
     }
     thread_safe_point_impl(thread);
@@ -151,7 +146,7 @@
 
 static void thread_safe_point_impl(hythread_t thread) { 
     hythread_event_callback_proc callback_func;
-    if(thread->suspend_request >0) {   
+    if (thread->suspend_request >0) {
         
         int old_status = thread->suspend_disable_count;
         do {
@@ -195,20 +190,20 @@
 
     assert(thread->suspend_request >=0);
     // already suspended?
-    if(thread->suspend_request > 0) {
+    if (thread->suspend_request > 0) {
         apr_atomic_inc32((apr_uint32_t *)&(thread->suspend_request));
         return;
     }               
                 
-     //we really need to suspend thread.
+    //we really need to suspend thread.
 
-     hysem_set(thread->resume_event, 0);
+    hysem_set(thread->resume_event, 0);
                 
-     apr_atomic_inc32((apr_uint32_t *)&(thread->suspend_request));
+    apr_atomic_inc32((apr_uint32_t *)&(thread->suspend_request));
 
-     apr_thread_yield_other(thread->os_handle);
+    apr_thread_yield_other(thread->os_handle);
 
-     TRACE(("TM: suspend request sent: %p request count: %d",thread , thread->suspend_request));
+    TRACE(("TM: suspend request sent: %p request count: %d",thread , thread->suspend_request));
 }
 
 
@@ -281,18 +276,18 @@
     hythread_t self;
     self = tm_self_tls;
     TRACE(("TM: suspend one enter thread: %p self: %p request count: %d",thread , tm_self_tls, thread->suspend_request));
-    if(self == thread) {
+    if (self == thread) {
         hythread_suspend();
         return TM_ERROR_NONE; 
     }
-        send_suspend_request(thread);
-        while(wait_safe_region_event(thread)!=TM_ERROR_NONE) {
-            if(self->suspend_request>0)
-            {
-                hythread_resume(thread);
-                return TM_ERROR_EBUSY;
-            }
+
+    send_suspend_request(thread);
+    while (wait_safe_region_event(thread)!=TM_ERROR_NONE) {
+        if (self->suspend_request>0) {
+            hythread_resume(thread);
+            return TM_ERROR_EBUSY;
         }
+    }
     TRACE(("TM: suspend one exit thread: %p request count: %d",thread , thread->suspend_request));
         
     return TM_ERROR_NONE;
@@ -311,20 +306,20 @@
  * @see hythread_create, hythread_suspend
  */
 void VMCALL hythread_resume(hythread_t thread) {
-        TRACE(("TM: start resuming: %p request count: %d",thread , thread->suspend_request));
+    TRACE(("TM: start resuming: %p request count: %d",thread , thread->suspend_request));
     // If there was request for suspension, decrease the request counter
- //       printf("resume other now lock %d  %d  %d  %d\n",tm_self_tls->thread_id,tm_self_tls->suspend_disable_count,thread->thread_id,thread->suspend_disable_count);
-    if(thread->suspend_request > 0) {
+    //printf("resume other now lock %d  %d  %d  %d\n",tm_self_tls->thread_id,tm_self_tls->suspend_disable_count,thread->thread_id,thread->suspend_disable_count);
+    if (thread->suspend_request > 0) {
         if (thread->safepoint_callback && thread->suspend_request < 2) return;
         apr_atomic_dec32((apr_uint32_t *)&(thread->suspend_request));
-        if(thread->suspend_request == 0) {  
+        if (thread->suspend_request == 0) {
             // Notify the thread that it may wake up now
             hysem_post(thread->resume_event);            
             TRACE(("TM: resume one thread: %p request count: %d",thread , thread->suspend_request));
             thread->state &= ~TM_THREAD_STATE_SUSPENDED;
         }
     }
-   // printf("resume other now lock-compl %d  %d  %d  %d\n",tm_self_tls->thread_id,tm_self_tls->suspend_disable_count,thread->thread_id,thread->suspend_disable_count);
+    //printf("resume other now lock-compl %d  %d  %d  %d\n",tm_self_tls->thread_id,tm_self_tls->suspend_disable_count,thread->thread_id,thread->suspend_disable_count);
 }
 
 /**
@@ -338,7 +333,7 @@
 IDATA hythread_set_safepoint_callback(hythread_t thread, tm_thread_event_callback_proc callback) {
     IDATA status;
     while (apr_atomic_casptr((volatile void **)&thread->safepoint_callback, (void *)callback, (void *)NULL) != NULL);
-    if(tm_self_tls == thread) {
+    if (tm_self_tls == thread) {
         int old_status = thread->suspend_disable_count;
         thread->suspend_disable_count = 1;
         hythread_suspend();
@@ -356,7 +351,7 @@
     
     if (thread->current_condition) {
         status=hycond_notify_all(thread->current_condition);   
-        assert (status == TM_ERROR_NONE);
+        assert(status == TM_ERROR_NONE);
     }
 
     return TM_ERROR_NONE;
@@ -391,37 +386,35 @@
     
     self = tm_self_tls;
     // try to prevent cyclic suspend dead-lock
-    while(self->suspend_request > 0) {
+    while (self->suspend_request > 0) {
         thread_safe_point_impl(self);
     }
 
     iter = hythread_iterator_create(group);
-        // send suspend requests to all threads
+    // send suspend requests to all threads
     TRACE(("TM: send suspend requests"));
-        while((next = hythread_iterator_next(&iter)) != NULL) {
-                if(next != self) {
-                        send_suspend_request(next);
-                }       
-        }
-        hythread_iterator_reset(&iter);
-        // all threads should be stopped in safepoints or be in safe region.
-        TRACE(("TM: wait suspend responses"));
-        while((next = hythread_iterator_next(&iter)) != NULL) {
-                if(next != self) {
-                        while (wait_safe_region_event(next)!=TM_ERROR_NONE)
-                        {
-                            thread_safe_point_impl(tm_self_tls);
-                            hythread_yield();
-                        }
-                }       
-        }
-        
-        hythread_iterator_reset(&iter);
-        hythread_iterator_release(&iter);
-        if(t) 
-        {
-                *t=iter;
-        }
+    while ((next = hythread_iterator_next(&iter)) != NULL) {
+        if (next != self) {
+            send_suspend_request(next);
+        }       
+    }
+    hythread_iterator_reset(&iter);
+    // all threads should be stopped in safepoints or be in safe region.
+    TRACE(("TM: wait suspend responses"));
+    while ((next = hythread_iterator_next(&iter)) != NULL) {
+        if (next != self) {
+            while (wait_safe_region_event(next)!=TM_ERROR_NONE) {
+                thread_safe_point_impl(tm_self_tls);
+                hythread_yield();
+            }
+        }       
+    }
+    
+    hythread_iterator_reset(&iter);
+    hythread_iterator_release(&iter);
+    if (t) {
+        *t=iter;
+    }
        
     return TM_ERROR_NONE;
 }
@@ -439,11 +432,11 @@
     hythread_iterator_t iter;
     iter = hythread_iterator_create(group);
     TRACE(("TM: resume all"));
-        // send suspend requests to all threads
-    while((next = hythread_iterator_next(&iter)) != NULL) {
-          if(next != self) {
-                hythread_resume(next);
-          }       
+    // send suspend requests to all threads
+    while ((next = hythread_iterator_next(&iter)) != NULL) {
+        if (next != self) {
+            hythread_resume(next);
+        }       
     }
         
     hythread_iterator_release(&iter); 
@@ -454,22 +447,22 @@
 // Private functionality
 
 int reset_suspend_disable() {
-        hythread_t self = tm_self_tls;
-        int dis = self->suspend_disable_count;
-        self->suspend_disable_count = 0;
-        if(self->suspend_request >0) {   
-            // notify suspender
-            hylatch_count_down(self->safe_region_event);
-        }
-        return dis;
+    hythread_t self = tm_self_tls;
+    int dis = self->suspend_disable_count;
+    self->suspend_disable_count = 0;
+    if (self->suspend_request >0) {
+        // notify suspender
+        hylatch_count_down(self->safe_region_event);
+    }
+    return dis;
 }
 
 void set_suspend_disable(int count) {
     hythread_t self = tm_self_tls;
     assert(count>=0);
     self->suspend_disable_count = count;
-    if(count) {
-           thread_safe_point_impl(self);
+    if (count) {
+        thread_safe_point_impl(self);
     }
 }
 

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_thin_monitor.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_thin_monitor.c?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_thin_monitor.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_thin_monitor.c Fri Feb  9 09:25:01 2007
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/** 
- * @author Artem Aliev
- * @version $Revision: 1.1.2.20 $
- */  
-
 /**
  * @file thread_native_thin_monitor.c
  * @brief Hythread thin monitors related functions
@@ -63,26 +58,25 @@
 #define MAX_RECURSION 31
 
 IDATA owns_thin_lock(hythread_t thread, I_32 lockword) {
-        IDATA this_id = thread->thread_id;
-        assert(!IS_FAT_LOCK(lockword));
+    IDATA this_id = thread->thread_id;
+    assert(!IS_FAT_LOCK(lockword));
 #ifdef LOCK_RESERVATION
-        return THREAD_ID(lockword) == this_id
-          && (!IS_RESERVED(lockword) || RECURSION(lockword) !=0);
+    return THREAD_ID(lockword) == this_id
+        && (!IS_RESERVED(lockword) || RECURSION(lockword) !=0);
 #else
-      return THREAD_ID(lockword) == this_id;
+    return THREAD_ID(lockword) == this_id;
 #endif
 }
 
 void set_fat_lock_id(hythread_thin_monitor_t *lockword_ptr, IDATA monitor_id) {
-        I_32 lockword = *lockword_ptr;
+    I_32 lockword = *lockword_ptr;
 #ifdef LOCK_RESERVATION
-        assert(!IS_RESERVED(lockword));
+    assert(!IS_RESERVED(lockword));
 #endif
-        lockword&=0x7FF;
-        lockword|=(monitor_id << 11) | 0x80000000;
-        *lockword_ptr=lockword;
-        apr_memory_rw_barrier();
-
+    lockword&=0x7FF;
+    lockword|=(monitor_id << 11) | 0x80000000;
+    *lockword_ptr=lockword;
+    apr_memory_rw_barrier();
 }
 
 IDATA is_fat_lock(hythread_thin_monitor_t lockword) {
@@ -118,8 +112,8 @@
     I_32 lockword_new;
     TRACE(("unreserve self_id %d lock owner %d", hythread_get_id(hythread_self()), THREAD_ID(lockword)));
     assert(hythread_get_id(hythread_self()) == THREAD_ID(lockword));
-    assert (!IS_FAT_LOCK(*lockword_ptr));
-    assert (IS_RESERVED(lockword));
+    assert(!IS_FAT_LOCK(*lockword_ptr));
+    assert(IS_RESERVED(lockword));
     TRACE(("Unreserved self %d \n", ++unreserve_count_self/*, vm_get_object_class_name(lockword_ptr-1)*/));  
        
     // Set reservation bit to 1 and reduce recursion count
@@ -145,35 +139,34 @@
     IDATA status;
     // trylock used to prevent cyclic suspend deadlock
     // the java_monitor_enter calls safe_point between attempts.
-  /*  status = hymutex_trylock(TM_LOCK);
-    if(status !=TM_ERROR_NONE) {
+    /*status = hymutex_trylock(TM_LOCK);
+    if (status !=TM_ERROR_NONE) {
         return status;
     }*/
     
-    if(IS_FAT_LOCK(lockword))
-    {
+    if (IS_FAT_LOCK(lockword)) {
         return TM_ERROR_NONE;
     }
     lock_id = THREAD_ID(lockword);
     owner = hythread_get_thread(lock_id);
     TRACE(("Unreserved other %d \n", ++unreserve_count/*, vm_get_object_class_name(lockword_ptr-1)*/));
-    if(!IS_RESERVED(lockword) || IS_FAT_LOCK(lockword)) {
-       // hymutex_unlock(TM_LOCK);
+    if (!IS_RESERVED(lockword) || IS_FAT_LOCK(lockword)) {
+        // hymutex_unlock(TM_LOCK);
         return TM_ERROR_NONE;
     }
     // suspend owner 
-    if(owner) {
+    if (owner) {
         assert(owner);
         assert(hythread_get_id(owner) == lock_id);
         assert(owner != hythread_self());
         status=hythread_suspend_other(owner);
-        if(status !=TM_ERROR_NONE) {
+        if (status !=TM_ERROR_NONE) {
              return status;
         }
     }
     // prepare new unreserved lockword and try to CAS it with old one.
     while (IS_RESERVED(lockword)) {
-        assert (!IS_FAT_LOCK(lockword));
+        assert(!IS_FAT_LOCK(lockword));
         TRACE(("unreserving lock"));
         lockword_new = (lockword | RESERVED_BITMASK);
         if (RECURSION(lockword) != 0) {
@@ -183,7 +176,7 @@
         } else {
             lockword_new =  lockword_new & 0x0000ffff; 
         }
-        if(lockword == apr_atomic_cas32 (((volatile apr_uint32_t*) lockword_ptr), 
+        if (lockword == apr_atomic_cas32 (((volatile apr_uint32_t*) lockword_ptr), 
                 (apr_uint32_t) lockword_new, lockword)) {
             TRACE(("unreserved lock"));
             break;
@@ -192,9 +185,9 @@
     }
 
     // resume owner
-    if(owner) {
-            apr_thread_yield_other(owner->os_handle);
-            hythread_resume(owner);
+    if (owner) {
+        apr_thread_yield_other(owner->os_handle);
+        hythread_resume(owner);
     }
 
     /* status = hymutex_unlock(TM_LOCK);*/
@@ -248,7 +241,7 @@
     IDATA status;
     hythread_monitor_t fat_monitor;
     int UNUSED i;
-    assert (!hythread_is_suspend_enabled());
+    assert(!hythread_is_suspend_enabled());
     assert((UDATA)lockword_ptr > 4);    
     assert(tm_self_tls);
     lockword = *lockword_ptr;       
@@ -305,7 +298,7 @@
         } else 
 
         // Fat monitor
-        if(IS_FAT_LOCK(lockword)) {
+        if (IS_FAT_LOCK(lockword)) {
             TRACE(("FAT MONITOR %d \n", ++fat_lock2_count/*, vm_get_object_class_name(lockword_ptr-1)*/));  
             fat_monitor = locktable_get_fat_monitor(FAT_LOCK_ID(lockword)); //  find fat_monitor in lock table
 
@@ -322,9 +315,9 @@
         // unreserved busy lock
         else if (IS_RESERVED(lockword)) {
             status = unreserve_lock(lockword_ptr);
-            if(status != TM_ERROR_NONE) {
+            if (status != TM_ERROR_NONE) {
 #ifdef SPIN_COUNT
-                if(status == TM_ERROR_EBUSY) {
+                if (status == TM_ERROR_EBUSY) {
                     continue;
                 }
 #endif //SPIN_COUNT
@@ -359,7 +352,7 @@
     }
 
     while (hythread_thin_monitor_try_enter(lockword_ptr) == TM_ERROR_EBUSY) {
-        if(IS_FAT_LOCK(*lockword_ptr)) {      
+        if (IS_FAT_LOCK(*lockword_ptr)) {
             fat_monitor = locktable_get_fat_monitor(FAT_LOCK_ID(*lockword_ptr)); //  find fat_monitor in lock table
             TRACE((" lock %d\n", FAT_LOCK_ID(*lockword_ptr)));
             saved_disable_count=reset_suspend_disable();
@@ -370,7 +363,7 @@
         //hythread_safe_point();
         hythread_yield();
     }
-    if(IS_FAT_LOCK(*lockword_ptr)) {
+    if (IS_FAT_LOCK(*lockword_ptr)) {
         // lock already inflated
         return TM_ERROR_NONE;
     }
@@ -389,12 +382,12 @@
     hythread_monitor_t fat_monitor;
     IDATA this_id = tm_self_tls->thread_id; // obtain current thread id   
     assert(this_id > 0 && this_id < 0xffff);
-    assert (!hythread_is_suspend_enabled());
+    assert(!hythread_is_suspend_enabled());
 
-    if(THREAD_ID(lockword) == this_id) {
+    if (THREAD_ID(lockword) == this_id) {
         if (RECURSION(lockword)==0) {
 #ifdef LOCK_RESERVATION
-            if(IS_RESERVED(lockword)) {
+            if (IS_RESERVED(lockword)) {
                 TRACE(("ILLEGAL_STATE %x\n", lockword));
                 return TM_ERROR_ILLEGAL_STATE;
             }
@@ -563,31 +556,31 @@
     I_32 lockword;
     int i;
     status=hymutex_lock(FAT_MONITOR_TABLE_LOCK);
-    assert (status == TM_ERROR_NONE);
+    assert(status == TM_ERROR_NONE);
     TRACE(("inflate tmj%d\n", ++inflate_count));
     lockword = *lockword_ptr;
-    if(IS_FAT_LOCK (lockword)) {
-    status=hymutex_unlock(FAT_MONITOR_TABLE_LOCK);
-            assert (status == TM_ERROR_NONE);
-            return locktable_get_fat_monitor(FAT_LOCK_ID(lockword));
+    if (IS_FAT_LOCK (lockword)) {
+        status = hymutex_unlock(FAT_MONITOR_TABLE_LOCK);
+        assert(status == TM_ERROR_NONE);
+        return locktable_get_fat_monitor(FAT_LOCK_ID(lockword));
     }
 #ifdef LOCK_RESERVATION
     // unreserve lock first
     if (IS_RESERVED(lockword)) {
-    unreserve_self_lock(lockword_ptr);
-            lockword = *lockword_ptr;
+        unreserve_self_lock(lockword_ptr);
+        lockword = *lockword_ptr;
     }
     assert(!IS_RESERVED(lockword));
 #endif 
 
     assert(owns_thin_lock(tm_self_tls, lockword));
-    assert (!hythread_is_suspend_enabled());
+    assert(!hythread_is_suspend_enabled());
 
     TRACE (("inflation begin for %x thread: %d", lockword, tm_self_tls->thread_id));
     status = hythread_monitor_init(&fat_monitor, 0); // allocate fat fat_monitor    
     assert(status == TM_ERROR_NONE);  
     status = hythread_monitor_enter(fat_monitor);
-    if(status != TM_ERROR_NONE) {
+    if (status != TM_ERROR_NONE) {
         hymutex_unlock(FAT_MONITOR_TABLE_LOCK);
         return NULL;
     } 
@@ -605,7 +598,7 @@
     fat_monitor->inflate_count++;
     fat_monitor->inflate_owner=tm_self_tls;
     status=hymutex_unlock(FAT_MONITOR_TABLE_LOCK);
-    assert (status == TM_ERROR_NONE);
+    assert(status == TM_ERROR_NONE);
 #ifdef LOCK_RESERVATION
     assert(!IS_RESERVED(*lockword_ptr));
 #endif
@@ -661,21 +654,21 @@
  * Sets the value of the specific entry in the lock table
  */
 IDATA locktable_put_fat_monitor(hythread_monitor_t fat_monitor) {
-     int id;
-     //hythread_global_lock();
-     id = fat_monitor_count++;
-     if (id >= table_size) {
+    int id;
+    //hythread_global_lock();
+    id = fat_monitor_count++;
+    if (id >= table_size) {
         hythread_suspend_all(NULL, NULL); 
         table_size = table_size*2;
         lock_table = (hythread_monitor_t *)realloc(lock_table, sizeof(hythread_monitor_t)*table_size);
         assert(lock_table);
         apr_memory_rw_barrier();
         hythread_resume_all(NULL);
-     }
-        
-     lock_table[id] = fat_monitor;
-     //hythread_global_unlock();
-     return id;
+    }
+
+    lock_table[id] = fat_monitor;
+    //hythread_global_unlock();
+    return id;
 } 
 
 /*
@@ -687,7 +680,6 @@
     m = lock_table[lock_id];
     lock_table[lock_id] = NULL;
     return m;
-          
 }
 
 /**
@@ -701,7 +693,7 @@
     
     assert(lockword_ptr);    
     lockword = *lockword_ptr;       
-    if(IS_FAT_LOCK(lockword)) {
+    if (IS_FAT_LOCK(lockword)) {
         fat_monitor = locktable_get_fat_monitor(FAT_LOCK_ID(lockword)); //  find fat_monitor in lock table
         return fat_monitor->owner;
     }
@@ -729,11 +721,11 @@
     
     assert(lockword_ptr);    
     lockword = *lockword_ptr;       
-    if(IS_FAT_LOCK(lockword)) {
+    if (IS_FAT_LOCK(lockword)) {
         fat_monitor = locktable_get_fat_monitor(FAT_LOCK_ID(lockword)); //  find fat_monitor in lock table
         return fat_monitor->recursion_count+1;
     }
-    if(THREAD_ID(lockword) == 0) {
+    if (THREAD_ID(lockword) == 0) {
         return 0;
     }
 #ifdef LOCK_RESERVATION

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_tls.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_tls.c?view=diff&rev=505384&r1=505383&r2=505384
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_tls.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_tls.c Fri Feb  9 09:25:01 2007
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/** 
- * @author Nikolay Kuznetsov
- * @version $Revision: 1.1.2.7 $
- */  
-
 /**
  * @file thread_native_tls.c
  * @brief Hythread TLS related functions



Mime
View raw message