ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch db_mutex to a std::mutex. Use modern locking with it. Use zmDbDo or dbQueue.push where appropriate. code cleanup.

This commit is contained in:
Isaac Connor 2021-02-25 12:26:26 -05:00
parent fdf515ca10
commit 8aeb4ab758
9 changed files with 135 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/zm_db.cpp
View File

@ -23,7 +23,7 @@
#include <cstdlib>
MYSQL dbconn;
RecursiveMutex db_mutex;
std::mutex db_mutex;
zmDbQueue dbQueue;
bool zmDbConnected = false;
@ -108,40 +108,30 @@ bool zmDbConnect() {
void zmDbClose() {
if (zmDbConnected) {
db_mutex.lock();
std::lock_guard<std::mutex> lck(db_mutex);
mysql_close(&dbconn);
// mysql_init() call implicitly mysql_library_init() but
// mysql_close() does not call mysql_library_end()
mysql_library_end();
zmDbConnected = false;
db_mutex.unlock();
}
}
MYSQL_RES * zmDbFetch(const char * query) {
std::lock_guard<std::mutex> lck(db_mutex);
if (!zmDbConnected) {
Error("Not connected.");
return nullptr;
}
db_mutex.lock();
// Might have been disconnected while we waited for the lock
if ( !zmDbConnected ) {
db_mutex.unlock();
Error("Not connected.");
return nullptr;
}
if (mysql_query(&dbconn, query)) {
db_mutex.unlock();
Error("Can't run query: %s", mysql_error(&dbconn));
return nullptr;
}
Debug(4, "Success running query: %s", query);
MYSQL_RES *result = mysql_store_result(&dbconn);
if (!result) {
Error("Can't use query result: %s for query %s", mysql_error(&dbconn), query);
}
db_mutex.unlock();
return result;
} // end MYSQL_RES * zmDbFetch(const char * query);
@ -178,33 +168,29 @@ MYSQL_RES *zmDbRow::fetch(const char *query) {
}
int zmDbDo(const char *query) {
db_mutex.lock();
std::lock_guard<std::mutex> lck(db_mutex);
if (!zmDbConnected)
return 0;
int rc;
while ((rc = mysql_query(&dbconn, query)) and !zm_terminate) {
db_mutex.unlock();
Error("Can't run query %s: %s", query, mysql_error(&dbconn));
if ( (mysql_errno(&dbconn) != ER_LOCK_WAIT_TIMEOUT) )
if ( (mysql_errno(&dbconn) != ER_LOCK_WAIT_TIMEOUT) ) {
return rc;
db_mutex.lock();
}
db_mutex.unlock();
}
return 1;
}
int zmDbDoInsert(const char *query) {
db_mutex.lock();
std::lock_guard<std::mutex> lck(db_mutex);
if (!zmDbConnected) return 0;
int rc;
while ( (rc = mysql_query(&dbconn, query)) and !zm_terminate) {
db_mutex.unlock();
Error("Can't run query %s: %s", query, mysql_error(&dbconn));
if ( (mysql_errno(&dbconn) != ER_LOCK_WAIT_TIMEOUT) )
return 0;
db_mutex.lock();
}
int id = mysql_insert_id(&dbconn);
db_mutex.unlock();
return id;
}

2
src/zm_db.h
View File

@ -62,7 +62,7 @@ class zmDbRow {
};
extern MYSQL dbconn;
extern RecursiveMutex db_mutex;
extern std::mutex db_mutex;
extern zmDbQueue dbQueue;
extern bool zmDbConnected;

29
src/zm_event.cpp
View File

@ -251,11 +251,10 @@ Event::~Event() {
frames, alarm_frames,
tot_score, (int)(alarm_frames?(tot_score/alarm_frames):0), max_score,
id);
db_mutex.lock();
{ // scope for lock
std::lock_guard<std::mutex> lck(db_mutex);
while ( mysql_query(&dbconn, sql) && !zm_terminate ) {
db_mutex.unlock();
Error("Can't update event: %s reason: %s", sql, mysql_error(&dbconn));
db_mutex.lock();
}
if ( !mysql_affected_rows(&dbconn) ) {
// Name might have been changed during recording, so just do the update without changing the name.
@ -267,12 +266,10 @@ Event::~Event() {
tot_score, (int)(alarm_frames?(tot_score/alarm_frames):0), max_score,
id);
while ( mysql_query(&dbconn, sql) && !zm_terminate ) {
db_mutex.unlock();
Error("Can't update event: %s reason: %s", sql, mysql_error(&dbconn));
db_mutex.lock();
}
} // end if no changed rows due to Name change during recording
db_mutex.unlock();
}
} // Event::~Event()
void Event::createNotes(std::string &notes) {
@ -489,14 +486,7 @@ void Event::AddFramesInternal(int n_frames, int start_frame, Image **images, str
if ( frameCount ) {
*(frame_insert_values-1) = '\0';
db_mutex.lock();
int rc = mysql_query(&dbconn, frame_insert_sql);
db_mutex.unlock();
if ( rc ) {
Error("Can't insert frames: %s, sql was (%s)", mysql_error(&dbconn), frame_insert_sql);
} else {
Debug(1, "INSERT %d/%d frames sql %s", frameCount, n_frames, frame_insert_sql);
}
zmDbDo(frame_insert_sql);
last_db_frame = frames;
} else {
Debug(1, "No valid pre-capture frames to add");
@ -548,16 +538,7 @@ void Event::WriteDbFrames() {
delete frame;
}
*(frame_insert_values_ptr-1) = '\0'; // The -1 is for the extra , added for values above
db_mutex.lock();
int rc = mysql_query(&dbconn, frame_insert_sql);
db_mutex.unlock();
if ( rc ) {
Error("Can't insert frames: %s, sql was %s", mysql_error(&dbconn), frame_insert_sql);
return;
} else {
Debug(1, "INSERT FRAMES: sql was %s", frame_insert_sql);
}
zmDbDo(frame_insert_sql);
} // end void Event::WriteDbFrames()
void Event::AddFrame(Image *image, struct timeval timestamp, int score, Image *alarm_image) {

3
src/zm_libvnc_camera.cpp
View File

@ -132,7 +132,7 @@ VncCamera::VncCamera(
}
VncCamera::~VncCamera() {
if (capture) {
if (capture and mRfb) {
if (mRfb->frameBuffer)
free(mRfb->frameBuffer);
(*rfbClientCleanup_f)(mRfb);
@ -164,6 +164,7 @@ int VncCamera::PrimeCapture() {
mRfb->GetCredential = GetCredentialsCallback;
mRfb->programName = "Zoneminder VNC Monitor";
if ( mRfb->serverHost ) free(mRfb->serverHost);
mRfb->serverHost = strdup(mHost.c_str());
mRfb->serverPort = atoi(mPort.c_str());
}

47
src/zm_logger.cpp
View File

@ -21,10 +21,7 @@
#include "zm_db.h"
#include "zm_utils.h"
#include <cerrno>
#include <csignal>
#include <cstdarg>
#include <cstring>
#include <libgen.h>
#include <syslog.h>
#include <sys/time.h>
@ -32,6 +29,11 @@
#ifdef __FreeBSD__
#include <sys/thr.h>
#endif
#include <cerrno>
#include <csignal>
#include <cstdarg>
#include <cstring>
bool Logger::smInitialised = false;
Logger *Logger::smInstance = nullptr;
@ -61,7 +63,6 @@ Logger::Logger() :
mLogFileFP(nullptr),
mHasTerminal(false),
mFlush(false) {
if (smInstance) {
Panic("Attempt to create second instance of Logger class");
}
@ -88,7 +89,7 @@ Logger::Logger() :
}
smInitialised = true;
}
} // end if ! smInitialised
if (fileno(stderr) && isatty(fileno(stderr))) {
mHasTerminal = true;
@ -101,14 +102,6 @@ Logger::~Logger() {
smCodes.clear();
smSyslogPriorities.clear();
smInitialised = false;
#if 0
for ( StringMap::iterator itr = smCodes.begin(); itr != smCodes.end(); itr ++ ) {
smCodes.erase( itr );
}
for ( IntMap::iterator itr = smSyslogPriorities.begin(); itr != smSyslogPriorities.end(); itr ++ ) {
smSyslogPriorities.erase(itr);
}
#endif
}
void Logger::initialise(const std::string &id, const Options &options) {
@ -416,7 +409,6 @@ void Logger::closeFile() {
}
void Logger::closeDatabase() {
}
void Logger::openSyslog() {
@ -428,12 +420,12 @@ void Logger::closeSyslog() {
}
void Logger::logPrint(bool hex, const char * const filepath, const int line, const int level, const char *fstring, ...) {
if ( level > mEffectiveLevel ) {
return;
}
if (level > mEffectiveLevel) return;
if (level < PANIC || level > DEBUG9)
Panic("Invalid logger level %d", level);
log_mutex.lock();
// Can we save some cycles by having these as members and not allocate them on the fly? I think so.
char timeString[64];
char logString[8192];
va_list argPtr;
@ -443,9 +435,6 @@ void Logger::logPrint(bool hex, const char * const filepath, const int line, con
const char *file = base ? base+1 : filepath;
const char *classString = smCodes[level].c_str();
if ( level < PANIC || level > DEBUG9 )
Panic("Invalid logger level %d", level);
gettimeofday(&timeVal, nullptr);
#if 0
@ -520,21 +509,22 @@ void Logger::logPrint(bool hex, const char * const filepath, const int line, con
if (level <= mFileLevel) {
if (!mLogFileFP) {
// We do this here so that we only create the file if we ever write to it.
// FIXME unlocking here is a problem. Another thread could sneak in.
log_mutex.unlock();
// We do this here so that we only create the file if we ever write to it.
openFile();
log_mutex.lock();
}
if (mLogFileFP) {
fputs(logString, mLogFileFP);
if ( mFlush )
fflush(mLogFileFP);
if (mFlush) fflush(mLogFileFP);
} else {
puts("Logging to file, but failed to open it\n");
}
} // end if level <= mFileLevel
if (level <= mDatabaseLevel) {
if (zmDbConnected) {
int syslogSize = syslogEnd-syslogStart;
char escapedString[(syslogSize*2)+1];
mysql_real_escape_string(&dbconn, escapedString, syslogStart, syslogSize);
@ -547,6 +537,9 @@ void Logger::logPrint(bool hex, const char * const filepath, const int line, con
timeVal.tv_sec, timeVal.tv_usec, mId.c_str(), staticConfig.SERVER_ID, tid, level, classString, escapedString, file, line
);
dbQueue.push(sql_string);
} else {
puts("Db is closed");
}
} // end if level <= mDatabaseLevel
if (level <= mSyslogLevel) {
@ -558,8 +551,7 @@ void Logger::logPrint(bool hex, const char * const filepath, const int line, con
if (level <= FATAL) {
logTerm();
zmDbClose();
if ( level <= PANIC )
abort();
if (level <= PANIC) abort();
exit(-1);
}
} // end logPrint
@ -567,7 +559,6 @@ void Logger::logPrint(bool hex, const char * const filepath, const int line, con
void logInit(const char *name, const Logger::Options &options) {
if (Logger::smInstance) {
delete Logger::smInstance;
Logger::smInstance = nullptr;
}
Logger::smInstance = new Logger();

12
src/zm_logger.h
View File

@ -153,18 +153,12 @@ public:
void terminate();
const std::string &id(const std::string &id);
const std::string &id() const {
return mId;
}
const std::string &id() const { return mId; }
Level level() const {
return mLevel;
}
Level level() const { return mLevel; }
Level level(Level=NOOPT);
bool debugOn() const {
return mEffectiveLevel >= DEBUG1;
}
bool debugOn() const { return mEffectiveLevel >= DEBUG1; }
Level terminalLevel(Level=NOOPT);
Level databaseLevel(Level=NOOPT);

14
src/zm_monitor.cpp
View File

@ -1692,7 +1692,6 @@ void Monitor::UpdateCaptureFPS() {
last_fps_time = now_double;
last_capture_image_count = image_count;
db_mutex.lock();
static char sql[ZM_SQL_SML_BUFSIZ];
// The reason we update the Status as well is because if mysql restarts, the Monitor_Status table is lost,
// and nothing else will update the status until zmc restarts. Since we are successfully capturing we can
@ -1702,9 +1701,7 @@ void Monitor::UpdateCaptureFPS() {
"VALUES (%d, %.2lf, %u, 'Connected') ON DUPLICATE KEY UPDATE "
"CaptureFPS = %.2lf, CaptureBandwidth=%u, Status='Connected'",
id, new_capture_fps, new_capture_bandwidth, new_capture_fps, new_capture_bandwidth);
int rc = mysql_query(&dbconn, sql);
db_mutex.unlock();
if ( rc ) Error("Can't run query: %s", mysql_error(&dbconn));
dbQueue.push(sql);
} // now != last_fps_time
} // end if report fps
} // void Monitor::UpdateCaptureFPS()
@ -1745,10 +1742,7 @@ void Monitor::UpdateAnalysisFPS() {
"INSERT INTO Monitor_Status (MonitorId,AnalysisFPS) VALUES (%d, %.2lf)"
" ON DUPLICATE KEY UPDATE AnalysisFPS = %.2lf",
id, new_analysis_fps, new_analysis_fps);
db_mutex.lock();
int rc = mysql_query(&dbconn, sql);
db_mutex.unlock();
if ( rc ) Error("Can't run query: %s", mysql_error(&dbconn));
dbQueue.push(sql);
last_analysis_fps_time = now_double;
last_motion_frame_count = motion_frame_count;
} else {
@ -2324,7 +2318,7 @@ void Monitor::ReloadLinkedMonitors(const char *p_linked_monitors) {
for ( int i = 0; i < n_link_ids; i++ ) {
Debug(1, "Checking linked monitor %d", link_ids[i]);
db_mutex.lock();
std::lock_guard<std::mutex> lck(db_mutex);
static char sql[ZM_SQL_SML_BUFSIZ];
snprintf(sql, sizeof(sql),
"SELECT `Id`, `Name` FROM `Monitors`"
@ -2334,13 +2328,11 @@ void Monitor::ReloadLinkedMonitors(const char *p_linked_monitors) {
" AND `Enabled`=1",
link_ids[i]);
if (mysql_query(&dbconn, sql)) {
db_mutex.unlock();
Error("Can't run query: %s", mysql_error(&dbconn));
continue;
}
MYSQL_RES *result = mysql_store_result(&dbconn);
db_mutex.unlock();
if ( !result ) {
Error("Can't use query result: %s", mysql_error(&dbconn));
continue;

16
src/zm_zone.cpp
View File

@ -134,16 +134,11 @@ Zone::~Zone() {
void Zone::RecordStats(const Event *event) {
static char sql[ZM_SQL_MED_BUFSIZ];
db_mutex.lock();
snprintf(sql, sizeof(sql),
"INSERT INTO Stats SET MonitorId=%d, ZoneId=%d, EventId=%" PRIu64 ", FrameId=%d, PixelDiff=%d, AlarmPixels=%d, FilterPixels=%d, BlobPixels=%d, Blobs=%d, MinBlobSize=%d, MaxBlobSize=%d, MinX=%d, MinY=%d, MaxX=%d, MaxY=%d, Score=%d",
monitor->Id(), id, event->Id(), event->Frames(), pixel_diff, alarm_pixels, alarm_filter_pixels, alarm_blob_pixels, alarm_blobs, min_blob_size, max_blob_size, alarm_box.LoX(), alarm_box.LoY(), alarm_box.HiX(), alarm_box.HiY(), score
);
int rc = mysql_query(&dbconn, sql);
db_mutex.unlock();
if ( rc ) {
Error("Can't insert event stats: %s", mysql_error(&dbconn));
}
zmDbDo(sql);
} // end void Zone::RecordStats( const Event *event )
bool Zone::CheckOverloadCount() {
@ -824,8 +819,10 @@ bool Zone::ParseZoneString(const char *zone_string, int &zone_id, int &colour, P
int Zone::Load(Monitor *monitor, Zone **&zones) {
static char sql[ZM_SQL_MED_BUFSIZ];
MYSQL_RES *result;
db_mutex.lock();
{ // scope for lock
std::lock_guard<std::mutex> lck(db_mutex);
snprintf(sql, sizeof(sql), "SELECT Id,Name,Type+0,Units,Coords,AlarmRGB,CheckMethod+0,"
"MinPixelThreshold,MaxPixelThreshold,MinAlarmPixels,MaxAlarmPixels,"
"FilterX,FilterY,MinFilterPixels,MaxFilterPixels,"
@ -833,13 +830,12 @@ int Zone::Load(Monitor *monitor, Zone **&zones) {
"OverloadFrames,ExtendAlarmFrames"
" FROM Zones WHERE MonitorId = %d ORDER BY Type, Id", monitor->Id());
if ( mysql_query(&dbconn, sql) ) {
db_mutex.unlock();
Error("Can't run query: %s", mysql_error(&dbconn));
return 0;
}
MYSQL_RES *result = mysql_store_result(&dbconn);
db_mutex.unlock();
result = mysql_store_result(&dbconn);
}
if (!result) {
Error("Can't use query result: %s", mysql_error(&dbconn));
return 0;

5
src/zmc.cpp
View File

@ -266,6 +266,7 @@ int main(int argc, char *argv[]) {
monitor->Id());
zmDbDo(sql);
} // end foreach monitor
if (zm_terminate) break;
#if HAVE_RTSP_SERVER
RTSPServerThread ** rtsp_server_threads = nullptr;
@ -418,9 +419,7 @@ int main(int argc, char *argv[]) {
snprintf(sql, sizeof(sql),
"INSERT INTO Monitor_Status (MonitorId,Status) VALUES (%d, 'Connected') ON DUPLICATE KEY UPDATE Status='NotRunning'",
monitor->Id());
if (mysql_query(&dbconn, sql)) {
Error("Can't run query: %s", mysql_error(&dbconn));
}
zmDbDo(sql);
}
Image::Deinitialise();