firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 10:00:38 +01:00
Code Issues

Use-count approach to track lifetime of trace configurations storage file.

Browse Source
This commit is contained in:
hvlad 2009-02-02 22:27:03 +00:00
parent db2e49bd8e
commit 2ece5acb86
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/jrd/trace/TraceConfigStorage.cpp
View File

@ -78,15 +78,23 @@ ConfigStorage::ConfigStorage()
StorageGuard guard(this);
checkFile();
++m_base->cnt_uses;
}
ConfigStorage::~ConfigStorage()
{
::close(m_cfg_file);
m_cfg_file = -1;
#ifdef WIN_NT
unlink((char*) &m_base->cfg_file_name[0]);
#endif
{
StorageGuard guard(this);
--m_base->cnt_uses;
if (m_base->cnt_uses == 0)
{
unlink((char*) &m_base->cfg_file_name[0]);
memset(m_base->cfg_file_name, 0, sizeof(m_base->cfg_file_name));
}
}
ISC_STATUS_ARRAY status;
ISC_unmap_file(status, &m_handle);
@ -121,10 +129,10 @@ void ConfigStorage::initShMem(void* arg, SH_MEM_T* shmemData, bool initialize)
// Initialize the shared data header
if (initialize)
{
memset(header->cfg_file_name, 0, sizeof(header->cfg_file_name));
header->version = 1;
header->change_number = 0;
header->session_number = 1;
header->cnt_uses = 0;
memset(header->cfg_file_name, 0, sizeof(header->cfg_file_name));
#ifndef WIN_NT
checkMutex("init", ISC_mutex_init(&header->mutex));
@ -141,6 +149,8 @@ void ConfigStorage::checkFile()
if (!(*cfg_file_name))
{
fb_assert(m_base->cnt_uses == 0);
PathName filename = TempFile::create("fb_trace_");
filename.copyTo(cfg_file_name, sizeof(m_base->cfg_file_name));
m_cfg_file = ::open(cfg_file_name, O_CREAT | O_RDWR | O_BINARY, S_IREAD | S_IWRITE);
@ -155,10 +165,6 @@ void ConfigStorage::checkFile()
Arg::Gds(isc_io_open_err) << SYS_ERR(errno));
}
#ifndef WIN_NT
// unlink(cfg_file_name);
#endif
// put default (audit) trace file contents into storage
if (m_base->change_number == 0)
{

1
src/jrd/trace/TraceConfigStorage.h
View File

@ -84,6 +84,7 @@ private:
ULONG version;
volatile ULONG change_number;
volatile ULONG session_number;
ULONG cnt_uses;
char cfg_file_name[MAXPATHLEN];
#ifndef WIN_NT
struct mtx mutex;