Skip to content

Commit 50673c8

Browse files
matulskimatulski
committed
Removed debug logging.
1 parent 6ceb140 commit 50673c8

File tree

2 files changed

+21
-89
lines changed

2 files changed

+21
-89
lines changed

‎src/ccycles/ccsession.cpp‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ void _cleanup_sessions()
7676
{
7777
ccl::thread_scoped_lock session_lock(session_mutex);
7878
ccl::thread_scoped_lock params_lock(session_params_mutex);
79-
logger.logit("_cleanup_sessions begin sessions_size=", sessions.size(), " session_params_size=", session_params.size());
8079

8180
for (CCSession* se : sessions) {
8281
if (se == nullptr) continue;
@@ -95,7 +94,6 @@ void _cleanup_sessions()
9594
delete params;
9695
}
9796
session_params.clear();
98-
logger.logit("_cleanup_sessions end sessions_size=", sessions.size(), " session_params_size=", session_params.size());
9997
}
10098

10199
CCSession* CCSession::create(int width, int height, unsigned int buffer_stride) {
@@ -450,32 +448,24 @@ extern "C" {
450448
CCL_CAPI ccl::Session* CDECL cycles_session_create(ccl::SessionParams* _session_parameters)
451449
{
452450
ccl::thread_scoped_lock lock(session_mutex);
453-
logger.logit("cycles_session_create enter params_id=", _session_parameters, " sessions_size=", sessions.size());
454451

455452
CCSession* session = CCSession::create(10, 10, 4);
456453
{
457454
ccl::thread_scoped_lock params_lock(session_params_mutex);
458-
logger.logit("cycles_session_create lookup params_id=", _session_parameters, " session_params_size=", session_params.size());
459455
auto param_it = session_params.find(_session_parameters);
460456
if (param_it == session_params.end()) {
461-
logger.logit("cycles_session_create missing params_id=", _session_parameters, " session_params_size=", session_params.size());
462457
delete session;
463458
return nullptr;
464459
}
465460

466461
ccl::SessionParams *params = *param_it;
467462
if (params == nullptr) {
468-
logger.logit("cycles_session_create null params pointer for params_id=", _session_parameters);
469463
delete session;
470464
return nullptr;
471465
}
472466

473467
session->params = *params;
474468
session->params_original_handle = params;
475-
logger.logit("cycles_session_create copied params_id=", _session_parameters,
476-
" registry_handle=", session->params_original_handle,
477-
" ccsession=", session,
478-
" session_params_size=", session_params.size());
479469
}
480470

481471
int csesid{ -1 };
@@ -486,29 +476,20 @@ CCL_CAPI ccl::Session* CDECL cycles_session_create(ccl::SessionParams* _session_
486476
session->params.use_auto_tile = false;
487477
session->params.experimental = true;
488478
session->params.shadingsystem = ccl::SHADINGSYSTEM_SVM;
489-
490479
session->scene_params.shadingsystem = ccl::SHADINGSYSTEM_SVM;
491-
492-
logger.logit("cycles_session_create new ccl::Session begin ccsession=", session, " params_id=", _session_parameters);
493480
session->session = new ccl::Session(session->params, session->scene_params);
494481

495-
logger.logit("cycles_session_create prep_session begin session_id=", session->session, " ccsession=", session);
496482
prep_session(session->session, &session->passes, session);
497483

498484
sessions.insert(session);
499485
csesid = (unsigned int)(sessions.size() - 1);
500-
logger.logit("cycles_session_create inserted session_id=", session->session,
501-
" ccsession=", session,
502-
" sessions_size=", sessions.size(),
503-
" csesid=", csesid);
504486

505487
return session->session;
506488
}
507489

508490
CCL_CAPI void CDECL cycles_session_destroy(ccl::Session* session_id)
509491
{
510492
ccl::thread_scoped_lock lock(session_mutex);
511-
logger.logit("cycles_session_destroy enter session_id=", session_id, " sessions_size=", sessions.size());
512493

513494
auto found = sessions.cend();
514495
for (auto it = sessions.cbegin(); it != sessions.cend(); ++it) {
@@ -518,15 +499,11 @@ CCL_CAPI void CDECL cycles_session_destroy(ccl::Session* session_id)
518499
}
519500
}
520501
if (found == sessions.cend()) {
521-
logger.logit("cycles_session_destroy missing session_id=", session_id, " sessions_size=", sessions.size());
522502
return;
523503
}
524504

525505
CCSession* ccsess = *found;
526-
logger.logit("cycles_session_destroy found session_id=", session_id,
527-
" ccsession=", ccsess,
528-
" registry_handle=", ccsess->params_original_handle,
529-
" sessions_size_before=", sessions.size());
506+
530507
sessions.erase(ccsess);
531508
if (ccsess->params_original_handle != nullptr) {
532509
ccl::thread_scoped_lock params_lock(session_params_mutex);
@@ -535,10 +512,7 @@ CCL_CAPI void CDECL cycles_session_destroy(ccl::Session* session_id)
535512
}
536513
delete ccsess->params_original_handle;
537514
ccsess->params_original_handle = nullptr;
538-
logger.logit("cycles_session_destroy removed registry_handle for session_id=", session_id,
539-
" session_params_size_after=", session_params.size());
540515
}
541-
logger.logit("cycles_session_destroy deleting ccsession=", ccsess, " session_id=", session_id);
542516
delete ccsess;
543517
}
544518

‎src/ccycles/session_parameters.cpp‎

Lines changed: 20 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,6 @@ limitations under the License.
2323
std::unordered_set<ccl::SessionParams*> session_params;
2424
ccl::thread_mutex session_params_mutex;
2525

26-
template<typename TValue>
27-
static void log_session_params_action(const char* action,
28-
ccl::SessionParams* session_params_id,
29-
const TValue& value,
30-
bool found)
31-
{
32-
logger.logit("session_params ", action,
33-
" ptr=", session_params_id,
34-
" value=", value,
35-
" found=", found ? 1 : 0,
36-
" registry_size=", session_params.size());
37-
}
38-
39-
static void log_session_params_action(const char* action,
40-
ccl::SessionParams* session_params_id,
41-
bool found)
42-
{
43-
logger.logit("session_params ", action,
44-
" ptr=", session_params_id,
45-
" found=", found ? 1 : 0,
46-
" registry_size=", session_params.size());
47-
}
48-
4926
#define SESSION_PARAM_BOOL(session_params_id, varname) \
5027
PARAM_BOOL(session_params, session_params_id, varname)
5128

@@ -62,112 +39,93 @@ extern "C" {
6239
CCL_CAPI ccl::SessionParams* CDECL cycles_session_params_create(unsigned int device_id)
6340
{
6441
ccl::thread_scoped_lock lock(session_params_mutex);
42+
6543
ccl::SessionParams* params = new ccl::SessionParams();
6644

6745
GETDEVICE(params->device, device_id);
6846
session_params.insert(params);
69-
logger.logit("Created session parameters ptr=", params,
70-
" for device ", device_id,
71-
" registry_size=", session_params.size());
47+
logger.logit("Created session parameters for device ", device_id);
7248

7349
return params;
7450
}
7551

7652
CCL_CAPI void CDECL cycles_session_params_set_device(ccl::SessionParams* session_params_id, unsigned int device)
7753
{
7854
ccl::thread_scoped_lock lock(session_params_mutex);
79-
auto search = session_params.find(session_params_id);
80-
const bool found = search != session_params.end();
81-
log_session_params_action("set_device", session_params_id, device, found);
82-
if (found) {
55+
56+
if (auto search = session_params.find(session_params_id); search != session_params.end()) {
8357
GETDEVICE((*search)->device, device)
8458
}
8559
}
8660

8761
CCL_CAPI void CDECL cycles_session_params_set_background(ccl::SessionParams* session_params_id, unsigned int background)
8862
{
8963
ccl::thread_scoped_lock lock(session_params_mutex);
90-
auto search = session_params.find(session_params_id);
91-
const bool found = search != session_params.end();
92-
log_session_params_action("set_background", session_params_id, background, found);
93-
if (found) {
64+
65+
if (auto search = session_params.find(session_params_id); search != session_params.end()) {
9466
(*search)->background = background != 0;
9567
}
9668
}
9769

9870
CCL_CAPI void CDECL cycles_session_params_set_experimental(ccl::SessionParams* session_params_id, unsigned int experimental)
9971
{
10072
ccl::thread_scoped_lock lock(session_params_mutex);
101-
auto search = session_params.find(session_params_id);
102-
const bool found = search != session_params.end();
103-
log_session_params_action("set_experimental", session_params_id, experimental, found);
104-
if (found) {
73+
74+
if (auto search = session_params.find(session_params_id); search != session_params.end()) {
10575
(*search)->experimental = experimental != 0;
10676
}
10777
}
10878

10979
CCL_CAPI void CDECL cycles_session_params_set_samples(ccl::SessionParams* session_params_id, int samples)
11080
{
11181
ccl::thread_scoped_lock lock(session_params_mutex);
112-
auto search = session_params.find(session_params_id);
113-
const bool found = search != session_params.end();
114-
log_session_params_action("set_samples", session_params_id, samples, found);
115-
if (found) {
82+
83+
if (auto search = session_params.find(session_params_id); search != session_params.end()) {
11684
(*search)->samples = samples;
11785
}
11886
}
11987

12088
CCL_CAPI void CDECL cycles_session_params_set_tile_size(ccl::SessionParams* session_params_id, unsigned int tile_size)
12189
{
12290
ccl::thread_scoped_lock lock(session_params_mutex);
123-
auto search = session_params.find(session_params_id);
124-
const bool found = search != session_params.end();
125-
log_session_params_action("set_tile_size", session_params_id, tile_size, found);
126-
if (found) {
91+
92+
if (auto search = session_params.find(session_params_id); search != session_params.end()) {
12793
(*search)->tile_size = tile_size;
12894
}
12995
}
13096

13197
CCL_CAPI void CDECL cycles_session_params_set_threads(ccl::SessionParams* session_params_id, unsigned int threads)
13298
{
13399
ccl::thread_scoped_lock lock(session_params_mutex);
134-
auto search = session_params.find(session_params_id);
135-
const bool found = search != session_params.end();
136-
log_session_params_action("set_threads", session_params_id, threads, found);
137-
if (found) {
100+
101+
if (auto search = session_params.find(session_params_id); search != session_params.end()) {
138102
(*search)->threads = threads;
139103
}
140104
}
141105

142106
CCL_CAPI void CDECL cycles_session_params_set_shadingsystem(ccl::SessionParams* session_params_id, unsigned int shadingsystem)
143107
{
144108
ccl::thread_scoped_lock lock(session_params_mutex);
145-
auto search = session_params.find(session_params_id);
146-
const bool found = search != session_params.end();
147-
log_session_params_action("set_shadingsystem", session_params_id, shadingsystem, found);
148-
if (found) {
109+
110+
if (auto search = session_params.find(session_params_id); search != session_params.end()) {
149111
(*search)->shadingsystem = (ccl::ShadingSystem)shadingsystem;
150112
}
151113
}
152114

153115
CCL_CAPI void CDECL cycles_session_params_set_pixel_size(ccl::SessionParams* session_params_id, unsigned int pixel_size)
154116
{
155117
ccl::thread_scoped_lock lock(session_params_mutex);
156-
auto search = session_params.find(session_params_id);
157-
const bool found = search != session_params.end();
158-
log_session_params_action("set_pixel_size", session_params_id, pixel_size, found);
159-
if (found) {
118+
119+
if (auto search = session_params.find(session_params_id); search != session_params.end()) {
160120
(*search)->pixel_size = pixel_size;
161121
}
162122
}
163123

164124
CCL_CAPI void CDECL cycles_session_params_set_use_resolution_divider(ccl::SessionParams* session_params_id, bool use_resolution_divider)
165125
{
166126
ccl::thread_scoped_lock lock(session_params_mutex);
167-
auto search = session_params.find(session_params_id);
168-
const bool found = search != session_params.end();
169-
log_session_params_action("set_use_resolution_divider", session_params_id, use_resolution_divider, found);
170-
if (found) {
127+
128+
if (auto search = session_params.find(session_params_id); search != session_params.end()) {
171129
(*search)->use_resolution_divider = use_resolution_divider;
172130
}
173131
}

0 commit comments

Comments
 (0)