Attachment.cpp (Firebird-3.0.2.32703-0.tar.bz2) | : | Attachment.cpp (Firebird-3.0.4.33054-0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 347 | skipping to change at line 347 | |||
} | } | |||
blob->BLB_close(tdbb); | blob->BLB_close(tdbb); | |||
} | } | |||
void Jrd::Attachment::signalCancel() | void Jrd::Attachment::signalCancel() | |||
{ | { | |||
att_flags |= ATT_cancel_raise; | att_flags |= ATT_cancel_raise; | |||
if (att_ext_connection && att_ext_connection->isConnected()) | if (att_ext_connection && att_ext_connection->isConnected()) | |||
att_ext_connection->cancelExecution(); | att_ext_connection->cancelExecution(false); | |||
LCK_cancel_wait(this); | LCK_cancel_wait(this); | |||
} | } | |||
void Jrd::Attachment::signalShutdown() | void Jrd::Attachment::signalShutdown() | |||
{ | { | |||
att_flags |= ATT_shutdown; | att_flags |= ATT_shutdown; | |||
if (att_ext_connection && att_ext_connection->isConnected()) | if (att_ext_connection && att_ext_connection->isConnected()) | |||
att_ext_connection->cancelExecution(); | att_ext_connection->cancelExecution(true); | |||
LCK_cancel_wait(this); | LCK_cancel_wait(this); | |||
} | } | |||
void Jrd::Attachment::mergeStats() | void Jrd::Attachment::mergeStats() | |||
{ | { | |||
MutexLockGuard guard(att_database->dbb_stats_mutex, FB_FUNCTION); | MutexLockGuard guard(att_database->dbb_stats_mutex, FB_FUNCTION); | |||
att_database->dbb_stats.adjust(att_base_stats, att_stats, true); | att_database->dbb_stats.adjust(att_base_stats, att_stats, true); | |||
att_base_stats.assign(att_stats); | att_base_stats.assign(att_stats); | |||
} | } | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |