Skip to content

STYLE: Replace non-POD ctkLogger globals with Q_GLOBAL_STATIC_WITH_ARGS #1409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hjmjohnson wants to merge 2 commits into
base: master
Choose a base branch
from
Open

STYLE: Replace non-POD ctkLogger globals with Q_GLOBAL_STATIC_WITH_ARGS #1409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6eb5bae
STYLE: Replace non-POD ctkLogger globals with Q_GLOBAL_STATIC_WITH_ARGS
hjmjohnson Apr 2, 2026
48aa71a
STYLE: Fix static ctkLogger in public PythonQt decorator headers
hjmjohnson Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions Libs/Core/ctkCorePythonQtDecorators.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
// PythonQt includes
#include <PythonQt.h>

// Qt includes
#include <QGlobalStatic>

// CTK includes
#include <ctkAbstractJob.h> // For ctkJobDetail
#include <ctkBooleanMapper.h>
Expand All @@ -40,7 +43,7 @@
// for non-static methods.
//

static ctkLogger logger("org.commontk.core.ctkCorePythonQtDecorators");
Q_GLOBAL_STATIC_WITH_ARGS(ctkLogger, logger, ("org.commontk.core.ctkCorePythonQtDecorators"))

/// \ingroup Core
class ctkCorePythonQtDecorators : public QObject
Expand Down Expand Up @@ -250,7 +253,7 @@ public Q_SLOTS:
{
if (td == nullptr)
{
logger.error("ctkJobDetail::setJobClass - Invalid ctkJobDetail");
logger->error("ctkJobDetail::setJobClass - Invalid ctkJobDetail");
return;
}

Expand All @@ -260,7 +263,7 @@ public Q_SLOTS:
{
if (td == nullptr)
{
logger.error("ctkJobDetail::jobClass - Invalid ctkJobDetail");
logger->error("ctkJobDetail::jobClass - Invalid ctkJobDetail");
return "";
}

Expand All @@ -271,7 +274,7 @@ public Q_SLOTS:
{
if (td == nullptr)
{
logger.error("ctkJobDetail::setJobUID - Invalid ctkJobDetail");
logger->error("ctkJobDetail::setJobUID - Invalid ctkJobDetail");
return;
}

Expand All @@ -281,7 +284,7 @@ public Q_SLOTS:
{
if (td == nullptr)
{
logger.error("ctkJobDetail::JobUID - Invalid ctkJobDetail");
logger->error("ctkJobDetail::JobUID - Invalid ctkJobDetail");
return "";
}

Expand All @@ -292,7 +295,7 @@ public Q_SLOTS:
{
if (td == nullptr)
{
logger.error("ctkJobDetail::setCreationDateTime - Invalid ctkJobDetail");
logger->error("ctkJobDetail::setCreationDateTime - Invalid ctkJobDetail");
return;
}

Expand All @@ -302,7 +305,7 @@ public Q_SLOTS:
{
if (td == nullptr)
{
logger.error("ctkJobDetail::creationDateTime - Invalid ctkJobDetail");
logger->error("ctkJobDetail::creationDateTime - Invalid ctkJobDetail");
return "";
}

Expand All @@ -313,7 +316,7 @@ public Q_SLOTS:
{
if (td == nullptr)
{
logger.error("ctkJobDetail::setStartDateTime - Invalid ctkJobDetail");
logger->error("ctkJobDetail::setStartDateTime - Invalid ctkJobDetail");
return;
}

Expand All @@ -323,7 +326,7 @@ public Q_SLOTS:
{
if (td == nullptr)
{
logger.error("ctkJobDetail::startDateTime - Invalid ctkJobDetail");
logger->error("ctkJobDetail::startDateTime - Invalid ctkJobDetail");
return "";
}

Expand All @@ -334,7 +337,7 @@ public Q_SLOTS:
{
if (td == nullptr)
{
logger.error("ctkJobDetail::setCompletionDateTime - Invalid ctkJobDetail");
logger->error("ctkJobDetail::setCompletionDateTime - Invalid ctkJobDetail");
return;
}

Expand All @@ -344,7 +347,7 @@ public Q_SLOTS:
{
if (td == nullptr)
{
logger.error("ctkJobDetail::completionDateTime - Invalid ctkJobDetail");
logger->error("ctkJobDetail::completionDateTime - Invalid ctkJobDetail");
return "";
}

Expand All @@ -355,7 +358,7 @@ public Q_SLOTS:
{
if (td == nullptr)
{
logger.error("ctkJobDetail::setRunningThreadID - Invalid ctkJobDetail");
logger->error("ctkJobDetail::setRunningThreadID - Invalid ctkJobDetail");
return;
}

Expand All @@ -365,7 +368,7 @@ public Q_SLOTS:
{
if (td == nullptr)
{
logger.error("ctkJobDetail::runningThreadID - Invalid ctkJobDetail");
logger->error("ctkJobDetail::runningThreadID - Invalid ctkJobDetail");
return "";
}

Expand All @@ -376,7 +379,7 @@ public Q_SLOTS:
{
if (td == nullptr)
{
logger.error("ctkJobDetail::setLogging - Invalid ctkJobDetail");
logger->error("ctkJobDetail::setLogging - Invalid ctkJobDetail");
return;
}
td->Logging = logging;
Expand All @@ -385,7 +388,7 @@ public Q_SLOTS:
{
if (td == nullptr)
{
logger.error("ctkJobDetail::logging - Invalid ctkJobDetail");
logger->error("ctkJobDetail::logging - Invalid ctkJobDetail");
return "";
}

Expand Down
36 changes: 20 additions & 16 deletions Libs/Core/ctkJobScheduler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@
#include "ctkJobScheduler.h"
#include "ctkAbstractWorker.h"
#include "ctkLogger.h"
#include <QGlobalStatic>

static ctkLogger logger("org.commontk.core.AbstractScheduler");
Q_GLOBAL_STATIC_WITH_ARGS(ctkLogger, logger, ("org.commontk.core.AbstractScheduler"))

// --------------------------------------------------------------------------
// ctkJobSchedulerPrivate methods
Expand Down Expand Up @@ -114,7 +115,7 @@ void ctkJobSchedulerPrivate::queueJobsInThreadPool()
return;
}

logger.debug(QString("ctkDICOMScheduler: creating worker for job %1 in thread %2.\n")
logger->debug(QString("ctkDICOMScheduler: creating worker for job %1 in thread %2.\n")
.arg(job->jobUID())
.arg(QString::number(reinterpret_cast<quint64>(QThread::currentThreadId())), 16));

Expand Down Expand Up @@ -143,15 +144,16 @@ bool ctkJobSchedulerPrivate::insertJob(QSharedPointer<ctkAbstractJob> job)

if (this->FreezeJobsScheduling)
{
logger.debug(QString("ctkJobScheduler: job object %1 of type %2 in thread %3 "
logger->debug(QString("ctkJobScheduler: job object %1 of type %2 in thread %3 "
"not added to the job list since jobs are being stopped.\n")
.arg(job->jobUID(), job->className())
.arg(QString::number(reinterpret_cast<quint64>(QThread::currentThreadId())), 16));
return false;
}

logger.debug(QString("ctkJobScheduler: creating job object %1 of type %2 in thread %3.\n")
.arg(job->jobUID(), job->className())
logger->debug(QString("ctkJobScheduler: creating job object %1 of type %2 in thread %3.\n")
.arg(job->jobUID())
.arg(job->className())
.arg(QString::number(reinterpret_cast<quint64>(QThread::currentThreadId())), 16));

QMetaObject::Connection startedConnection = QObject::connect(job.data(), &ctkAbstractJob::started, q, [q, job](){
Expand Down Expand Up @@ -185,7 +187,7 @@ bool ctkJobSchedulerPrivate::insertJob(QSharedPointer<ctkAbstractJob> job)

emit q->jobInitialized(job->toVariant());

logger.debug(QString("ctkDICOMScheduler: creating worker for job %1 in thread %2.\n")
logger->debug(QString("ctkDICOMScheduler: creating worker for job %1 in thread %2.\n")
.arg(job->jobUID())
.arg(QString::number(reinterpret_cast<quint64>(QThread::currentThreadId())), 16));

Expand All @@ -203,7 +205,7 @@ bool ctkJobSchedulerPrivate::insertJob(QSharedPointer<ctkAbstractJob> job)
return false;
}

logger.debug(QString("ctkDICOMScheduler: creating worker for job %1 in thread %2.\n")
logger->debug(QString("ctkDICOMScheduler: creating worker for job %1 in thread %2.\n")
.arg(job->jobUID())
.arg(QString::number(reinterpret_cast<quint64>(QThread::currentThreadId())), 16));

Expand All @@ -223,8 +225,9 @@ bool ctkJobSchedulerPrivate::insertJob(QSharedPointer<ctkAbstractJob> job)
//------------------------------------------------------------------------------
bool ctkJobSchedulerPrivate::cleanJob(const QString &jobUID)
{
logger.debug(QString("ctkJobScheduler: deleting job object %1 in thread %2.\n")
.arg(jobUID, QString::number(reinterpret_cast<quint64>(QThread::currentThreadId()), 16)));
logger->debug(QString("ctkJobScheduler: deleting job object %1 in thread %2.\n")
.arg(jobUID)
.arg(QString::number(reinterpret_cast<quint64>(QThread::currentThreadId()), 16)));

{
// The QWriteLocker is enclosed within brackets to restrict its scope and
Expand Down Expand Up @@ -273,8 +276,9 @@ void ctkJobSchedulerPrivate::cleanJobs(const QStringList &jobUIDs)
//------------------------------------------------------------------------------
bool ctkJobSchedulerPrivate::removeJob(const QString& jobUID)
{
logger.debug(QString("ctkJobScheduler: deleting job object %1 in thread %2.\n")
.arg(jobUID, QString::number(reinterpret_cast<quint64>(QThread::currentThreadId()), 16)));
logger->debug(QString("ctkJobScheduler: deleting job object %1 in thread %2.\n")
.arg(jobUID)
.arg(QString::number(reinterpret_cast<quint64>(QThread::currentThreadId()), 16)));

{
// The QWriteLocker is enclosed within brackets to restrict its scope and
Expand Down Expand Up @@ -806,7 +810,7 @@ void ctkJobScheduler::onJobStarted(ctkAbstractJob* job)
return;
}

logger.debug(job->loggerReport(tr("started")));
logger->debug(job->loggerReport(tr("started")));

d->BatchedJobsStarted.append(job->toVariant());
if (!d->ThrottleTimer->isActive())
Expand All @@ -824,7 +828,7 @@ void ctkJobScheduler::onJobUserStopped(ctkAbstractJob* job)
return;
}

logger.debug(job->loggerReport(tr("user stopped")));
logger->debug(job->loggerReport(tr("user stopped")));

QString jobUID = job->jobUID();
this->deleteWorker(jobUID);
Expand Down Expand Up @@ -853,7 +857,7 @@ void ctkJobScheduler::onJobFinished(ctkAbstractJob* job)
return;
}

logger.debug(job->loggerReport(tr("finished")));
logger->debug(job->loggerReport(tr("finished")));

QString jobUID = job->jobUID();
this->deleteWorker(jobUID);
Expand Down Expand Up @@ -882,7 +886,7 @@ void ctkJobScheduler::onJobAttemptFailed(ctkAbstractJob* job)
return;
}

logger.debug(job->loggerReport(tr("attempt failed")));
logger->debug(job->loggerReport(tr("attempt failed")));

QString jobUID = job->jobUID();
this->deleteWorker(jobUID);
Expand Down Expand Up @@ -911,7 +915,7 @@ void ctkJobScheduler::onJobFailed(ctkAbstractJob* job)
return;
}

logger.debug(job->loggerReport(tr("failed")));
logger->debug(job->loggerReport(tr("failed")));

QString jobUID = job->jobUID();
this->deleteWorker(jobUID);
Expand Down
3 changes: 2 additions & 1 deletion Libs/DICOM/Core/ctkDICOMAbstractThumbnailGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@
// ctkDICOMCore includes
#include "ctkDICOMAbstractThumbnailGenerator.h"
#include "ctkLogger.h"
#include <QGlobalStatic>

static ctkLogger logger ( "org.commontk.dicom.DICOMAbstractThumbnailGenerator" );
Q_GLOBAL_STATIC_WITH_ARGS(ctkLogger, logger, ("org.commontk.dicom.DICOMAbstractThumbnailGenerator"))
struct Node;

//------------------------------------------------------------------------------
Expand Down
Loading