firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 22:03:03 +01:00
Code Issues

Misc

Browse Source
This commit is contained in:
asfernandes 2007-02-23 01:42:10 +00:00
parent c6ac8f8115
commit d87a30bf0c
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jrd/cch.cpp
View File

@ -5988,6 +5988,7 @@ static bool set_write_direction(thread_db* tdbb, Database* dbb, BufferDesc* bdb,
bdb->bdb_write_direction = BDB_write_undefined; bdb->bdb_write_direction = BDB_write_undefined;
return false; return false;
} }
// fall through
case BDB_write_undefined: case BDB_write_undefined:
dbb->dbb_backup_manager->decrement_diff_use_count(); dbb->dbb_backup_manager->decrement_diff_use_count();
} }

9
src/jrd/isc.h
View File

@ -354,7 +354,7 @@ namespace Jrd {
AstInhibit(const AstInhibit&); AstInhibit(const AstInhibit&);
bool enabled; bool enabled;
}; };
#else #else // MULTI_THREAD
class AstInhibit : public SignalInhibit class AstInhibit : public SignalInhibit
// //
// This class inhibits signals' processing. // This class inhibits signals' processing.
@ -367,9 +367,8 @@ namespace Jrd {
// Forbid copy constructor // Forbid copy constructor
AstInhibit(const AstInhibit&); AstInhibit(const AstInhibit&);
}; };
#endif #endif // MULTI_THREAD
} } // namespace Jrd
#endif /* JRD_ISC_H */ #endif // JRD_ISC_H

2
src/jrd/jrd.cpp
View File

@ -6093,7 +6093,7 @@ static void release_attachment(Attachment* attachment)
/* bug #7781, need to null out the attachment pointer of all locks which /* bug #7781, need to null out the attachment pointer of all locks which
were hung off this attachment block, to ensure that the attachment were hung off this attachment block, to ensure that the attachment
block doesn't get dereferenced after it is released */ block doesn't get dereferenced after it is released */
{ { // scope for aiHolder
// Disable delivery of ASTs for the moment while queue of locks is in flux // Disable delivery of ASTs for the moment while queue of locks is in flux
AstInhibit aiHolder; AstInhibit aiHolder;
Lock* long_lock = attachment->att_long_locks; Lock* long_lock = attachment->att_long_locks;

2
src/jrd/os/isc_i_proto.h
View File

@ -75,4 +75,4 @@ private:
#endif #endif
}; };
#endif /* JRD_ISC_I_PROTO_H */ #endif // JRD_ISC_I_PROTO_H

10
src/lock/lock.cpp
View File

@ -1203,7 +1203,7 @@ void LOCK_re_post( lock_ast_t ast, void* arg, SRQ_PTR owner_offset)
owner->own_flags &= ~OWN_signal; owner->own_flags &= ~OWN_signal;
owner->own_ast_flags |= OWN_signaled; owner->own_ast_flags |= OWN_signaled;
DEBUG_DELAY; DEBUG_DELAY;
{ { // scope for siHolder
SignalInhibit siHolder; SignalInhibit siHolder;
DEBUG_DELAY; DEBUG_DELAY;
blocking_action2(owner_offset, (SRQ_PTR) NULL); blocking_action2(owner_offset, (SRQ_PTR) NULL);
@ -3861,7 +3861,7 @@ static void release_mutex(void)
**************************************/ **************************************/
DEBUG_DELAY; DEBUG_DELAY;
{ { // scope for siHolder
SignalInhibit siHolder; SignalInhibit siHolder;
DEBUG_DELAY; DEBUG_DELAY;
@ -4096,7 +4096,7 @@ static int signal_owner( own* blocking_owner, SRQ_PTR blocked_owner_offset)
#ifndef USE_BLOCKING_THREAD #ifndef USE_BLOCKING_THREAD
if (blocking_owner->own_process_id == LOCK_pid) { if (blocking_owner->own_process_id == LOCK_pid) {
DEBUG_DELAY; DEBUG_DELAY;
{ { // scope for siHolder
SignalInhibit siHolder; SignalInhibit siHolder;
DEBUG_DELAY; DEBUG_DELAY;
blocking_action2(SRQ_REL_PTR(blocking_owner), blocked_owner_offset); blocking_action2(SRQ_REL_PTR(blocking_owner), blocked_owner_offset);
@ -4796,7 +4796,7 @@ static USHORT wait_for_request(
/* Before starting to wait - look to see if someone resolved /* Before starting to wait - look to see if someone resolved
the request for us - if so we're out easy! */ the request for us - if so we're out easy! */
{ { // scope for siHolder
SignalInhibit siHolder; SignalInhibit siHolder;
request = (LRQ) SRQ_ABS_PTR(request_offset); request = (LRQ) SRQ_ABS_PTR(request_offset);
if (!(request->lrq_flags & LRQ_pending)) { if (!(request->lrq_flags & LRQ_pending)) {
@ -4903,7 +4903,7 @@ static USHORT wait_for_request(
/* If somebody else has resolved the lock, we're done */ /* If somebody else has resolved the lock, we're done */
{ { // scope for siHolder
SignalInhibit siHolder; SignalInhibit siHolder;
request = (LRQ) SRQ_ABS_PTR(request_offset); request = (LRQ) SRQ_ABS_PTR(request_offset);
if (!(request->lrq_flags & LRQ_pending)) { if (!(request->lrq_flags & LRQ_pending)) {