Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[52837] firebird/trunk/src/common/classes
|
From: <di...@us...> - 2011-04-28 16:59:36
|
Revision: 52837
http://firebird.svn.sourceforge.net/firebird/?rev=52837&view=rev
Author: dimitr
Date: 2011-04-28 16:59:29 +0000 (Thu, 28 Apr 2011)
Log Message:
-----------
Misc.
Modified Paths:
--------------
firebird/trunk/src/common/classes/SyncObject.cpp
firebird/trunk/src/common/classes/SyncObject.h
firebird/trunk/src/common/classes/Synchronize.cpp
firebird/trunk/src/common/classes/Synchronize.h
Modified: firebird/trunk/src/common/classes/SyncObject.cpp
===================================================================
--- firebird/trunk/src/common/classes/SyncObject.cpp 2011-04-28 16:59:29 UTC (rev 52836)
+++ firebird/trunk/src/common/classes/SyncObject.cpp 2011-04-28 16:59:29 UTC (rev 52837)
@@ -23,7 +23,7 @@
* Copyright (c) 1997 - 2000, 2001, 2003 Netfrastructure, Inc.
* All Rights Reserved.
*
- * The \xD1ode was ported into Firebird Open Source RDBMS project by
+ * The Code was ported into Firebird Open Source RDBMS project by
* Vladyslav Khorsun at 2010
*
* Contributor(s):
@@ -225,7 +225,7 @@
}
}
-void SyncObject::downGrade(LockType type)
+void SyncObject::downgrade(LockType type)
{
fb_assert(monitorCount == 0);
fb_assert(type == Shared);
@@ -389,7 +389,7 @@
return next;
}
-void SyncObject::grantLocks(void)
+void SyncObject::grantLocks()
{
mutex.enter();
fb_assert((waiters && waitingThreads) || (!waiters && !waitingThreads));
@@ -459,7 +459,7 @@
}
-bool SyncObject::ourExclusiveLock(void) const
+bool SyncObject::ourExclusiveLock() const
{
if (lockState != -1)
return false;
@@ -477,7 +477,7 @@
isc_arg_end);
}
-void SyncObject::assertionFailed(void)
+void SyncObject::assertionFailed()
{
throw OSRIException (isc_sys_request,
isc_arg_string, "SyncObject assertion failed",
Modified: firebird/trunk/src/common/classes/SyncObject.h
===================================================================
--- firebird/trunk/src/common/classes/SyncObject.h 2011-04-28 16:59:29 UTC (rev 52836)
+++ firebird/trunk/src/common/classes/SyncObject.h 2011-04-28 16:59:29 UTC (rev 52837)
@@ -23,7 +23,7 @@
* Copyright (c) 1997 - 2000, 2001, 2003 Netfrastructure, Inc.
* All Rights Reserved.
*
- * The \xD1ode was ported into Firebird Open Source RDBMS project by
+ * The Code was ported into Firebird Open Source RDBMS project by
* Vladyslav Khorsun at 2010
*
* Contributor(s):
@@ -38,7 +38,6 @@
namespace Firebird {
#define LOG_DEBUG
-#define ASSERT fb_assert
enum LockType {
None,
@@ -55,7 +54,7 @@
public:
virtual void lock(Sync *sync, LockType type) = 0;
virtual void unlock(Sync *sync, LockType type) = 0;
- virtual void downGrade(LockType type) = 0;
+ virtual void downgrade(LockType type) = 0;
};
class SyncObject : public SynchronizationObject
@@ -76,11 +75,11 @@
bool lockConditional(LockType type);
virtual void unlock(Sync *sync, LockType type);
- void unlock(void);
+ void unlock();
- virtual void downGrade(LockType type);
+ virtual void downgrade(LockType type);
- LockType getState(void) const
+ LockType getState() const
{
if (lockState.value() == 0)
return None;
@@ -101,15 +100,15 @@
return (waiters.value() > 0);
}
- bool ourExclusiveLock(void) const;
+ bool ourExclusiveLock() const;
void sysServiceFailed(const char* service, int code);
- void assertionFailed(void);
+ void assertionFailed();
protected:
void wait(LockType type, ThreadSync *thread, Sync *sync);
ThreadSync* grantThread(ThreadSync *thread);
- void grantLocks(void);
+ void grantLocks();
void validate(LockType lockType);
AtomicCounter lockState;
@@ -127,7 +126,7 @@
public:
Sync(SynchronizationObject *obj, const char *fromWhere)
{
- ASSERT(obj);
+ fb_assert(obj);
syncObject = obj;
prior = NULL;
where = fromWhere;
@@ -136,7 +135,7 @@
~Sync()
{
- ASSERT(state != Invalid);
+ fb_assert(state != Invalid);
if (syncObject && state != None)
{
@@ -160,15 +159,15 @@
void unlock()
{
- ASSERT(state != None);
+ fb_assert(state != None);
syncObject->unlock(this, state);
state = None;
}
- void downGrade(LockType type)
+ void downgrade(LockType type)
{
- ASSERT(state == Exclusive);
- syncObject->downGrade(type);
+ fb_assert(state == Exclusive);
+ syncObject->downgrade(type);
state = Shared;
}
@@ -204,7 +203,7 @@
~SyncLockGuard()
{
- //ASSERT(state != None);
+ //fb_assert(state != None);
if (state != None)
unlock();
}
@@ -218,7 +217,7 @@
{
oldState = state;
- ASSERT(oldState != None);
+ fb_assert(oldState != None);
if (oldState != None)
unlock();
}
Modified: firebird/trunk/src/common/classes/Synchronize.cpp
===================================================================
--- firebird/trunk/src/common/classes/Synchronize.cpp 2011-04-28 16:59:29 UTC (rev 52836)
+++ firebird/trunk/src/common/classes/Synchronize.cpp 2011-04-28 16:59:29 UTC (rev 52837)
@@ -23,7 +23,7 @@
* Copyright (c) 1997 - 2000, 2001, 2003 Netfrastructure, Inc.
* All Rights Reserved.
*
-* The \xD1ode was ported into Firebird Open Source RDBMS project by
+* The Code was ported into Firebird Open Source RDBMS project by
* Vladyslav Khorsun at 2010
*
* Contributor(s):
@@ -284,7 +284,7 @@
TLS_SET(threadIndex, thread);
}
-FB_THREAD_ID ThreadSync::getCurrentThreadId(void)
+FB_THREAD_ID ThreadSync::getCurrentThreadId()
{
return getThreadId();
}
@@ -315,8 +315,8 @@
void ThreadSync::grantLock(SyncObject *lock)
{
- ASSERT(!lockGranted);
- ASSERT(!lockPending || lockPending->syncObject == lock);
+ fb_assert(!lockGranted);
+ fb_assert(!lockPending || lockPending->syncObject == lock);
lockGranted = true;
lockPending = NULL;
Modified: firebird/trunk/src/common/classes/Synchronize.h
===================================================================
--- firebird/trunk/src/common/classes/Synchronize.h 2011-04-28 16:59:29 UTC (rev 52836)
+++ firebird/trunk/src/common/classes/Synchronize.h 2011-04-28 16:59:29 UTC (rev 52837)
@@ -23,7 +23,7 @@
* Copyright (c) 1997 - 2000, 2001, 2003 Netfrastructure, Inc.
* All Rights Reserved.
*
- * The \xD1ode was ported into Firebird Open Source RDBMS project by
+ * The Code was ported into Firebird Open Source RDBMS project by
* Vladyslav Khorsun at 2010
*
* Contributor(s):
@@ -84,7 +84,7 @@
static ThreadSync* findThread();
static ThreadSync* getThread(const char *desc);
- static FB_THREAD_ID getCurrentThreadId(void);
+ static FB_THREAD_ID getCurrentThreadId();
const char* getWhere();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|