Adding settings to usedsettings when tuner hits timeout

diff --git a/src/Tuner/basictuner.cc b/src/Tuner/basictuner.cc
index 8ec104c63cde19403e85c401df373d8bb4bd8403..7d08098148c4db28c5c92b5eb495b42ab45d98eb 100644 (file)
--- a/src/Tuner/basictuner.cc
+++ b/src/Tuner/basictuner.cc
@@ -182,7 +182,10 @@ long long BasicTuner::evaluate(Problem *problem, TunerRecord *tuner) {
                updateTimeout(problem, metric);
                snprintf(buffer, sizeof(buffer), "tuner%uused", execnum);
                tuner->getTuner()->addUsed(buffer);
+       } else if (status == 124 << 8){ // timeout happens ...
+               tuner->getTuner()->copySettingstoUsedSettings();
        }
+       
        //Increment execution count
        execnum++;
 

diff --git a/src/Tuner/searchtuner.cc b/src/Tuner/searchtuner.cc
index 3cf94fb1f937f880c0dbb08c23d869d1e799bc49..582de740d53b26937c926b1cf22f3788c2e8ccad 100644 (file)
--- a/src/Tuner/searchtuner.cc
+++ b/src/Tuner/searchtuner.cc
@@ -175,8 +175,7 @@ bool SearchTuner::isSubTunerof(SearchTuner *newTuner) {
 
 SearchTuner *SearchTuner::copyUsed() {
        SearchTuner *tuner = new SearchTuner();
-       
-       SetIteratorTunableSetting *iterator = !usedSettings.isEmpty()? usedSettings.iterator():settings.iterator();
+       SetIteratorTunableSetting *iterator = usedSettings.iterator();
        while (iterator->hasNext()) {
                TunableSetting *setting = iterator->next();
                TunableSetting *copy = new TunableSetting(setting);
@@ -186,6 +185,16 @@ SearchTuner *SearchTuner::copyUsed() {
        return tuner;
 }
 
+void SearchTuner::copySettingstoUsedSettings() {
+       SetIteratorTunableSetting *iterator = settings.iterator();
+       while (iterator->hasNext()) {
+               TunableSetting *setting = iterator->next();
+               TunableSetting *copy = new TunableSetting(setting);
+               usedSettings.add(copy);
+       }
+       delete iterator;
+}
+
 SearchTuner::~SearchTuner() {
        SetIteratorTunableSetting *iterator = settings.iterator();
        while (iterator->hasNext()) {

diff --git a/src/Tuner/searchtuner.h b/src/Tuner/searchtuner.h
index 9d5913b841f81d4d9ce1a12dbc8e41577b545e38..dbac07f9b5fc05248e97c0d40b13648b306be693 100644 (file)
--- a/src/Tuner/searchtuner.h
+++ b/src/Tuner/searchtuner.h
@@ -43,6 +43,7 @@ public:
        void setVarTunable(VarType vartype, TunableParam param, TunableDesc *descriptor, uint value);
        void setVarTunable(VarType vartype1, VarType vartype2, TunableParam param, TunableDesc *descriptor, uint value);
        SearchTuner *copyUsed();
+       void copySettingstoUsedSettings();
        bool isSubTunerof(SearchTuner *newTuner);
        void randomMutate();
        uint getSize() { return usedSettings.getSize();}