OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

posix-threads.cc (_Jv_MutexLock): Moved back to posix-threads.h. 

2000-04-08  Anthony Green  <green@cygnus.com>

	* posix-threads.cc (_Jv_MutexLock): Moved back to posix-threads.h.
	(_Jv_MutexUnlock): Ditto.
	* include/posix-threads.h (_Jv_MutexLock): From posix-threads.cc.
	(_Jv_MutexUnlock): Ditto.

From-SVN: r33037
This commit is contained in:
Anthony Green 2000-04-09 05:41:56 +00:00 committed by Anthony Green
parent bdf2ced905
commit 568fe067bc
3 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -1,3 +1,10 @@
2000-04-08 Anthony Green <green@cygnus.com>
* posix-threads.cc (_Jv_MutexLock): Moved back to posix-threads.h.
(_Jv_MutexUnlock): Ditto.
* include/posix-threads.h (_Jv_MutexLock): From posix-threads.cc.
(_Jv_MutexUnlock): Ditto.
2000-04-08 Anthony Green <green@cygnus.com>
* java/lang/StringBuffer.java (ensureCapacity): Don't call Math::max.

34
libjava/include/posix-threads.h
View File

@ -115,8 +115,38 @@ _Jv_MutexInit (_Jv_Mutex_t *mu)
mu->owner = 0;
}
int _Jv_MutexLock (_Jv_Mutex_t *mu);
int _Jv_MutexUnlock (_Jv_Mutex_t *mu);
inline int
_Jv_MutexLock (_Jv_Mutex_t *mu)
{
pthread_t self = pthread_self ();
if (mu->owner == self)
{
mu->count++;
}
else
{
pthread_mutex_lock (&mu->mutex);
mu->count = 1;
mu->owner = self;
}
return 0;
}
inline int
_Jv_MutexUnlock (_Jv_Mutex_t *mu)
{
if (_Jv_PthreadCheckMonitor (mu))
return _JV_NOT_OWNER;
mu->count--;
if (mu->count == 0)
{
mu->owner = 0;
pthread_mutex_unlock (&mu->mutex);
}
return 0;
}
#ifndef LINUX_THREADS

33
libjava/posix-threads.cc
View File

@ -402,39 +402,6 @@ _Jv_ThreadStart (java::lang::Thread *thread, _Jv_Thread_t *data,
}
}
int
_Jv_MutexLock (_Jv_Mutex_t *mu)
{
pthread_t self = pthread_self ();
if (mu->owner == self)
{
mu->count++;
}
else
{
pthread_mutex_lock (&mu->mutex);
mu->count = 1;
mu->owner = self;
}
return 0;
}
int
_Jv_MutexUnlock (_Jv_Mutex_t *mu)
{
if (_Jv_PthreadCheckMonitor (mu))
return _JV_NOT_OWNER;
mu->count--;
if (mu->count == 0)
{
mu->owner = 0;
pthread_mutex_unlock (&mu->mutex);
}
return 0;
}
void
_Jv_ThreadWait (void)
{