- removed obsolete functions

diff --git a/snapper/Snapper.cc b/snapper/Snapper.cc
index e8d14adc9d6676f8bce186290ec534e25b165278..d5921f25ef9f8b284dccd2fc2af146642ffe784a 100644 (file)
--- a/snapper/Snapper.cc
+++ b/snapper/Snapper.cc
@@ -206,313 +206,6 @@ namespace snapper
     }
 
 
-    struct younger_than
-    {
-       younger_than(time_t t)
-           : t(t) {}
-       bool operator()(Snapshots::const_iterator it)
-           { return it->getDate() > t; }
-       const time_t t;
-    };
-
-
-    // Removes snapshots younger than min_age from tmp
-    void
-    Snapper::filter1(list<Snapshots::iterator>& tmp, time_t min_age)
-    {
-       tmp.remove_if(younger_than(time(NULL) - min_age));
-    }
-
-
-    // Removes pre and post snapshots from tmp that do have a corresponding
-    // snapshot but which is not included in tmp.
-    void
-    Snapper::filter2(list<Snapshots::iterator>& tmp)
-    {
-       list<Snapshots::iterator> ret;
-
-       for (list<Snapshots::iterator>::const_iterator it1 = tmp.begin(); it1 != tmp.end(); ++it1)
-       {
-           if ((*it1)->getType() == PRE)
-           {
-               Snapshots::const_iterator it2 = snapshots.findPost(*it1);
-               if (it2 != snapshots.end())
-               {
-                   if (find(tmp.begin(), tmp.end(), it2) == tmp.end())
-                       continue;
-               }
-           }
-
-           if ((*it1)->getType() == POST)
-           {
-               Snapshots::const_iterator it2 = snapshots.findPre(*it1);
-               if (it2 != snapshots.end())
-               {
-                   if (find(tmp.begin(), tmp.end(), it2) == tmp.end())
-                       continue;
-               }
-           }
-
-           ret.push_back(*it1);
-       }
-
-       swap(ret, tmp);
-    }
-
-
-    bool
-    Snapper::doCleanupNumber()
-    {
-       time_t min_age = 1800;
-       size_t limit = 50;
-
-       string val;
-       if (config->getValue("NUMBER_MIN_AGE", val))
-           val >> min_age;
-       if (config->getValue("NUMBER_LIMIT", val))
-           val >> limit;
-
-       y2mil("min_age:" << min_age << " limit:" << limit);
-
-       list<Snapshots::iterator> tmp;
-
-       for (Snapshots::iterator it = snapshots.begin(); it != snapshots.end(); ++it)
-       {
-           if (it->getCleanup() == "number")
-               tmp.push_back(it);
-       }
-
-       if (tmp.size() > limit)
-       {
-           list<Snapshots::iterator>::iterator it = tmp.end();
-           advance(it, - limit);
-           tmp.erase(it, tmp.end());
-
-           filter1(tmp, min_age);
-           filter2(tmp);
-
-           y2mil("deleting " << tmp.size() << " snapshots");
-
-           for (list<Snapshots::iterator>::iterator it = tmp.begin(); it != tmp.end(); ++it)
-               deleteSnapshot(*it);
-       }
-
-       return true;
-    }
-
-
-    bool
-    is_first(list<Snapshots::iterator>::const_iterator first,
-            list<Snapshots::iterator>::const_iterator last,
-            Snapshots::const_iterator it1,
-            std::function<bool(const struct tm& tmp1, const struct tm& tmp2)> pred)
-    {
-       time_t t1 = it1->getDate();
-       struct tm tmp1;
-       localtime_r(&t1, &tmp1);
-
-       for (list<Snapshots::iterator>::const_iterator it2 = first; it2 != last; ++it2)
-       {
-           if (it1 == *it2)
-               continue;
-
-           time_t t2 = (*it2)->getDate();
-           struct tm tmp2;
-           localtime_r(&t2, &tmp2);
-
-           if (!pred(tmp1, tmp2))
-               return true;
-
-           if (t1 > t2)
-               return false;
-       }
-
-       return true;
-    }
-
-
-    bool
-    equal_year(const struct tm& tmp1, const struct tm& tmp2)
-    {
-       return tmp1.tm_year == tmp2.tm_year;
-    }
-
-    bool
-    equal_month(const struct tm& tmp1, const struct tm& tmp2)
-    {
-       return equal_year(tmp1, tmp2) && tmp1.tm_mon == tmp2.tm_mon;
-    }
-
-    bool
-    equal_day(const struct tm& tmp1, const struct tm& tmp2)
-    {
-       return equal_month(tmp1, tmp2) && tmp1.tm_mday == tmp2.tm_mday;
-    }
-
-    bool
-    equal_hour(const struct tm& tmp1, const struct tm& tmp2)
-    {
-       return equal_day(tmp1, tmp2) && tmp1.tm_hour == tmp2.tm_hour;
-    }
-
-
-    bool
-    is_first_yearly(list<Snapshots::iterator>::const_iterator first,
-                   list<Snapshots::iterator>::const_iterator last,
-                   Snapshots::const_iterator it1)
-    {
-       return is_first(first, last, it1, equal_year);
-    }
-
-    bool
-    is_first_monthly(list<Snapshots::iterator>::const_iterator first,
-                    list<Snapshots::iterator>::const_iterator last,
-                    Snapshots::const_iterator it1)
-    {
-       return is_first(first, last, it1, equal_month);
-    }
-
-    bool
-    is_first_daily(list<Snapshots::iterator>::const_iterator first,
-                  list<Snapshots::iterator>::const_iterator last,
-                  Snapshots::const_iterator it1)
-    {
-       return is_first(first, last, it1, equal_day);
-    }
-
-    bool
-    is_first_hourly(list<Snapshots::iterator>::const_iterator first,
-                   list<Snapshots::iterator>::const_iterator last,
-                   Snapshots::const_iterator it1)
-    {
-       return is_first(first, last, it1, equal_hour);
-    }
-
-
-    bool
-    Snapper::doCleanupTimeline()
-    {
-       time_t min_age = 1800;
-       size_t limit_hourly = 10;
-       size_t limit_daily = 10;
-       size_t limit_monthly = 10;
-       size_t limit_yearly = 10;
-
-       string val;
-       if (config->getValue("TIMELINE_MIN_AGE", val))
-           val >> min_age;
-       if (config->getValue("TIMELINE_LIMIT_HOURLY", val))
-           val >> limit_hourly;
-       if (config->getValue("TIMELINE_LIMIT_DAILY", val))
-           val >> limit_daily;
-       if (config->getValue("TIMELINE_LIMIT_MONTHLY", val))
-           val >> limit_monthly;
-       if (config->getValue("TIMELINE_LIMIT_YEARLY", val))
-           val >> limit_yearly;
-
-       y2mil("min_age:" << min_age <<" limit_hourly:" << limit_hourly << " limit_daily:" <<
-             limit_daily << " limit_monthly:" << limit_monthly << " limit_yearly:" <<
-             limit_yearly);
-
-       size_t num_hourly = 0;
-       size_t num_daily = 0;
-       size_t num_monthly = 0;
-       size_t num_yearly = 0;
-
-       list<Snapshots::iterator> tmp;
-
-       for (Snapshots::iterator it = snapshots.begin(); it != snapshots.end(); ++it)
-       {
-           if (it->getCleanup() == "timeline")
-               tmp.push_front(it);
-       }
-
-       list<Snapshots::iterator>::iterator it = tmp.begin();
-       while (it != tmp.end())
-       {
-           if (num_hourly < limit_hourly && is_first_hourly(it, tmp.end(), *it))
-           {
-               ++num_hourly;
-               it = tmp.erase(it);
-           }
-           else if (num_daily < limit_daily && is_first_daily(it, tmp.end(), *it))
-           {
-               ++num_daily;
-               it = tmp.erase(it);
-           }
-           else if (num_monthly < limit_monthly && is_first_monthly(it, tmp.end(), *it))
-           {
-               ++num_monthly;
-               it = tmp.erase(it);
-           }
-           else if (num_yearly < limit_yearly && is_first_yearly(it, tmp.end(), *it))
-           {
-               ++num_yearly;
-               it = tmp.erase(it);
-           }
-           else
-           {
-               ++it;
-           }
-       }
-
-       tmp.reverse();
-
-       filter1(tmp, min_age);
-       filter2(tmp);
-
-       y2mil("deleting " << tmp.size() << " snapshots");
-
-       for (list<Snapshots::iterator>::iterator it = tmp.begin(); it != tmp.end(); ++it)
-           deleteSnapshot(*it);
-
-       return true;
-    }
-
-
-    bool
-    Snapper::doCleanupEmptyPrePost()
-    {
-       time_t min_age = 1800;
-
-       string val;
-       if (config->getValue("EMPTY_PRE_POST_MIN_AGE", val))
-           val >> min_age;
-
-       y2mil("min_age:" << min_age);
-
-       list<Snapshots::iterator> tmp;
-
-       for (Snapshots::iterator it1 = snapshots.begin(); it1 != snapshots.end(); ++it1)
-       {
-           if (it1->getType() == PRE)
-           {
-               Snapshots::iterator it2 = snapshots.findPost(it1);
-
-               if (it2 != snapshots.end())
-               {
-                   Comparison comparison(this, it1, it2);
-                   if (comparison.getFiles().empty())
-                   {
-                       tmp.push_back(it1);
-                       tmp.push_back(it2);
-                   }
-               }
-           }
-       }
-
-       filter1(tmp, min_age);
-       filter2(tmp);
-
-       y2mil("deleting " << tmp.size() << " snapshots");
-
-       for (list<Snapshots::iterator>::iterator it = tmp.begin(); it != tmp.end(); ++it)
-           deleteSnapshot(*it);
-
-       return true;
-    }
-
-
     ConfigInfo
     Snapper::getConfig(const string& config_name)
     {

diff --git a/snapper/Snapper.h b/snapper/Snapper.h
index e6fddee9dd384a3a0551dfe610d8a325583ebf85..cc56352c0f0476b19c30638b630cfe2889bf6ecf 100644 (file)
--- a/snapper/Snapper.h
+++ b/snapper/Snapper.h
@@ -119,10 +119,6 @@ namespace snapper
        void startBackgroundComparsion(Snapshots::const_iterator snapshot1,
                                       Snapshots::const_iterator snapshot2);
 
-       bool doCleanupNumber();
-       bool doCleanupTimeline();
-       bool doCleanupEmptyPrePost();
-
        const vector<string>& getIgnorePatterns() const { return ignore_patterns; }
 
        static ConfigInfo getConfig(const string& config_name);