yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

posix-threads.cc (_Jv_CondNotify,_Jv_CondNotifyAll): Rename _Jv_PthreadCheckMonitor to _Jv_MutexCheckMonitor.

Browse Source 
2003-10-21  Jerry Quinn  <jlquinn@optonline.net>

        * posix-threads.cc (_Jv_CondNotify,_Jv_CondNotifyAll): Rename
        _Jv_PthreadCheckMonitor to _Jv_MutexCheckMonitor.
	* include/no-threads.h (_Jv_MutexCheckMonitor): New.
	* include/posix-threads.h (_Jv_MutexCheckMonitor): Rename from
        _Jv_PthreadCheckMonitor.  Simplify code.
	(_Jv_MutexUnlock): Use _Jv_MutexCheckMonitor.
	* include/win32-threads.h (_Jv_MutexCheckMonitor): New.
	* java/lang/Object.h (_Jv_ObjectCheckMonitor): Declare.
	* java/lang/Thread.java (holdsLock): New.
	* java/lang/natObject.cc (_Jv_ObjectCheckMonitor): New, with and
        without JV_HASH_SYNCHRONIZATION.
	* java/lang/natThread.cc (java::lang::Thread::holdsLock): New.

From-SVN: r72741
This commit is contained in:
Jerry Quinn
2003-10-21 04:46:19 +00:00
committed by Jerry Quinn
parent 036a75ac29
commit 16a10fb6fc
9 changed files with 96 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libjava/java/lang/natObject.cc
+47
View File
@@ -264,6 +264,13 @@ _Jv_MonitorExit (jobject obj)
throw new java::lang::IllegalMonitorStateException;
}
bool
_Jv_ObjectCheckMonitor (jobject obj)
{
_Jv_SyncInfo *si = (_Jv_SyncInfo *) obj->sync_info;
return _Jv_MutexCheckMonitor (&si->mutex);
}
#else /* JV_HASH_SYNCHRONIZATION */
// FIXME: We shouldn't be calling GC_register_finalizer directly.
@@ -1087,6 +1094,46 @@ retry:
keep_live(addr);
}
// Return false if obj's monitor is held by the current thread
bool
_Jv_ObjectCheckMonitor (jobject obj)
{
#ifdef JV_LINKER_CANNOT_8BYTE_ALIGN_STATICS
obj_addr_t addr = (obj_addr_t)obj & ~((obj_addr_t)FLAGS);
#else
obj_addr_t addr = (obj_addr_t)obj;
#endif
obj_addr_t address;
unsigned hash = JV_SYNC_HASH(addr);
hash_entry * he = light_locks + hash;
_Jv_ThreadId_t self = _Jv_ThreadSelf();
JvAssert(!(addr & FLAGS));
retry:
// Acquire the hash table entry lock
address = ((he -> address) & ~LOCKED);
if (!compare_and_swap(&(he -> address), address, address | LOCKED))
{
wait_unlocked(he);
goto retry;
}
bool not_mine;
if (!(address & ~FLAGS))
not_mine = true;
else if ((address & ~FLAGS) == addr)
not_mine = (he -> light_thr_id != self);
else
{
heavy_lock* hl = find_heavy(addr, he);
not_mine = hl ? (hl->si.mutex.owner != self) : true;
}
release_set(&(he -> address), address); // unlock hash entry
return not_mine;
}
// The rest of these are moderately thin veneers on _Jv_Cond ops.
// The current version of Notify might be able to make the pthread
// call AFTER releasing the lock, thus saving some context switches??