From a8611d1ec08a2f3a0b661469e864e626ae22b01c Mon Sep 17 00:00:00 2001 From: Horst Schirmeier Date: Tue, 8 Apr 2014 10:40:05 +0200 Subject: [PATCH] DatabaseCampaign: fix log output When no variants matching the command line parameters were found, the campaign printed an uninitialized sent_pilots count. Change-Id: Ib1d70ae86f02059daeb9a62567d6c83802e4986e --- src/core/cpn/DatabaseCampaign.cc | 4 ++-- src/core/cpn/DatabaseCampaign.hpp | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/core/cpn/DatabaseCampaign.cc b/src/core/cpn/DatabaseCampaign.cc index 5e32d81d..209321da 100644 --- a/src/core/cpn/DatabaseCampaign.cc +++ b/src/core/cpn/DatabaseCampaign.cc @@ -88,7 +88,6 @@ bool DatabaseCampaign::run() { } } - log_send << "pushed " << sent_pilots << " pilots into the queue" << std::endl; log_send << "wait for the clients to complete" << std::endl; campaignmanager.noMoreParameters(); @@ -170,7 +169,7 @@ bool DatabaseCampaign::run_variant(Database::Variant variant) { log_send << "Found " << experiment_count << " unfinished experiments in database. (" << variant.variant << "/" << variant.benchmark << ")" << std::endl; - sent_pilots = 0; + unsigned sent_pilots = 0; while ((row = mysql_fetch_row(pilots)) != 0) { unsigned pilot_id = strtoul(row[0], NULL, 10); unsigned injection_instr = strtoul(row[3], NULL, 10); @@ -206,6 +205,7 @@ bool DatabaseCampaign::run_variant(Database::Variant variant) { return false; } + log_send << "pushed " << sent_pilots << " pilots into the queue" << std::endl; assert(experiment_count == sent_pilots && "ERROR: not all unfinished experiments pushed to queue"); mysql_free_result(pilots); diff --git a/src/core/cpn/DatabaseCampaign.hpp b/src/core/cpn/DatabaseCampaign.hpp index 1fbb75dd..d3ec7e98 100644 --- a/src/core/cpn/DatabaseCampaign.hpp +++ b/src/core/cpn/DatabaseCampaign.hpp @@ -28,8 +28,6 @@ class DatabaseCampaign : public Campaign { void collect_result_thread(); - int sent_pilots; - public: DatabaseCampaign() {};