From 15c7a863e9aa035422e12b31c668c74f1b4905de Mon Sep 17 00:00:00 2001 From: Tobias Stumpf Date: Tue, 17 Jun 2014 12:44:58 +0200 Subject: [PATCH] Enhance campain to use parameters. Now we need to add the parameter --tpye to chosse between memory and register injection. --- src/experiments/l4-sys/campaign.cc | 12 ++++++++++-- src/experiments/l4-sys/campaign.hpp | 10 ++++++++++ src/experiments/l4-sys/main.cc | 23 +++++++++++++++++++++-- 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/src/experiments/l4-sys/campaign.cc b/src/experiments/l4-sys/campaign.cc index bd45cbec..0b111863 100644 --- a/src/experiments/l4-sys/campaign.cc +++ b/src/experiments/l4-sys/campaign.cc @@ -6,7 +6,15 @@ void L4SysCampaign::cb_send_pilot(DatabaseCampaignMessage p) { L4SysExperimentData *d = new L4SysExperimentData; d->msg.mutable_fsppilot()->CopyFrom(p); - //d->msg.set_exp_type(d->msg.GPRFLIP); - d->msg.set_exp_type(d->msg.MEM); + + if(!type.compare("mem")) { + d->msg.set_exp_type(d->msg.MEM); + } else if(!type.compare("reg")) { + d->msg.set_exp_type(d->msg.GPRFLIP); + } else { + log << "Specified FI-type not supported" << std::endl; + exit(-1); + } + fail::campaignmanager.addParam(d); } diff --git a/src/experiments/l4-sys/campaign.hpp b/src/experiments/l4-sys/campaign.hpp index ab883d30..22066c75 100644 --- a/src/experiments/l4-sys/campaign.hpp +++ b/src/experiments/l4-sys/campaign.hpp @@ -1,11 +1,16 @@ #ifndef __L4SYS_CAMPAIGN_HPP__ #define __L4SYS_CAMPAIGN_HPP__ + #include "cpn/DatabaseCampaign.hpp" #include "comm/ExperimentData.hpp" #include "l4sys.pb.h" #include +#include "util/Logger.hpp" + +#include + class L4SysExperimentData : public fail::ExperimentData { public: L4SysProtoMsg msg; @@ -17,6 +22,11 @@ class L4SysCampaign : public fail::DatabaseCampaign { { return google::protobuf::DescriptorPool::generated_pool()->FindMessageTypeByName("L4SysProtoMsg"); } virtual void cb_send_pilot(DatabaseCampaignMessage pilot); + + fail::Logger log; //