4 files changed, 0 insertions, 309 deletions
diff --git a/yhttpd/src/monitor/dump.cpp b/yhttpd/src/monitor/dump.cpp
deleted file mode 100644
index c5f51d0..0000000
--- a/yhttpd/src/monitor/dump.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-#ifndef DUMP_CPP
-#define DUMP_CPP
-
-#include "dump.h"
-
-using namespace std;
-
-const string dumpable::s_sep = "->";
-const int dumpable::i_max_level = 100;
-
-dumpable::dumpable()
-{
-  initialize(0);
-}
-
-void
-dumpable::initialize(int i_level)
-{
-  this->i_level = i_level;
-  this->i_lined = i_level;
-  this->b_lined = false;
-  this->b_next_no_nl = false;
-  this->s_dump = "";
-}
-
-string
-dumpable::dump()
-{
-  return dump(0);
-}
-
-string
-dumpable::dump(int i_level)
-{
-  initialize(i_level);
-  dumpit();
-  return s_dump;
-}
-
-void
-dumpable::add
-  (string s_line)
-{
-  if ( i_lined > i_max_level )
-    i_lined = i_max_level;
-
-  if (!b_lined)
-    s_dump.append(s_sep);
-
-  else
-    for ( int i = 0; i < i_lined; ++i )
-      s_dump.append(" ");
-
-  s_dump.append(s_line);
-
-  if (b_next_no_nl)
-    b_next_no_nl = false;
-
-  else
-    s_dump.append("\n");
-
-  if (!b_lined)
-  {
-    b_lined = true;
-    i_lined = i_level + s_sep.length();
-  }
-}
-
-int
-dumpable::get_level() const
-{
-  return i_lined;
-}
-
-dump::dump(vector<string> vec_params)
-{
-  if (vec_params.empty())
-  {
-    cout << CLIPRMO << "all conf sock";
-    cout << endl;
-    return;
-  }
-
-  cout << run(vec_params);
-}
-
-string
-dump::run(vector<string> &vec_params)
-{
-  string s_ret("");
-  string s_part;
-
-  vector<string>::iterator iter;
-  for (iter = vec_params.begin(); iter != vec_params.end(); ++iter)
-  {
-    s_part = *iter;
-
-    if (!s_part.compare("conf") || !s_part.compare("all"))
-      s_ret.append(wrap::CONF->dump());
-
-    if (!s_part.compare("sock") || !s_part.compare("all"))
-      s_ret.append(wrap::SOCK->dump());
-
-  }
-
-  return s_ret;
-}
-
-#endif
diff --git a/yhttpd/src/monitor/dump.h b/yhttpd/src/monitor/dump.h
deleted file mode 100644
index ffb3529..0000000
--- a/yhttpd/src/monitor/dump.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#include "../incl.h"
-
-#ifndef DUMP_H
-#define DUMP_H
-
-using namespace std;
-
-class dumpable
-{
-private:
-  int i_level;
-  int i_lined;
-  bool b_lined;
-  bool b_next_no_nl;
-  string s_dump;
-
-  static const string s_sep;
-  static const int i_max_level;
-
-  virtual void dumpit() = 0;
-  void initialize(int i_level);
-  void reset();
-
-protected:
-  void add
-    (unsigned i_num)
-  {
-    add
-      ("<unsigned>");
-  }
-
-  void add
-    (int i_num)
-  {
-    add
-      ("<int>");
-  }
-
-  void add
-    (string s_line);
-  dumpable();
-
-  void next_no_newline()
-  {
-    b_next_no_nl = true;
-  }
-
-public:
-  string dump();
-  string dump(int i_level);
-  int get_level() const;
-};
-
-class dump
-{
-private:
-  string run(vector<string> &vec_params);
-public:
-  dump(vector<string> vec_params);
-};
-
-#endif
diff --git a/yhttpd/src/monitor/stats.cpp b/yhttpd/src/monitor/stats.cpp
deleted file mode 100644
index e0aa146..0000000
--- a/yhttpd/src/monitor/stats.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef STATS_CPP
-#define STATS_CPP
-
-#include "stats.h"
-
-using namespace std;
-
-stats::stats()
-{
-  i_rusage_vec_size = tool::string2int(
-                        wrap::CONF->get_elem("httpd.stats.rusagehistory"));
-
-
-  pthread_mutex_init( &mut_vec_rusage, NULL );
-
-}
-
-stats::~stats()
-{
-  pthread_mutex_destroy( &mut_vec_rusage );
-}
-
-void
-stats::update_rusage_history()
-{
-  wrap::system_message(STATUPR);
-
-  rusage* p_rusage = new rusage;
-  getrusage( RUSAGE_SELF, p_rusage );
-
-  map<string,long> map_rusage;
-
-  map_rusage["ru_maxrss"] = p_rusage->ru_maxrss;
-  map_rusage["ru_ixrss"] = p_rusage->ru_ixrss;
-  map_rusage["ru_idrss"] = p_rusage->ru_idrss;
-  map_rusage["ru_isrss"] = p_rusage->ru_isrss;
-  map_rusage["ru_minflt"] = p_rusage->ru_minflt;
-  map_rusage["ru_majflt"] = p_rusage->ru_majflt;
-  map_rusage["ru_nswap"] = p_rusage->ru_nswap;
-  map_rusage["ru_inblock"] = p_rusage->ru_inblock;
-  map_rusage["ru_oublock"] = p_rusage->ru_oublock;
-  map_rusage["ru_msgsnd"] = p_rusage->ru_msgsnd;
-  map_rusage["ru_msgrcv"] = p_rusage->ru_msgrcv;
-  map_rusage["ru_nsignals"] = p_rusage->ru_nsignals;
-  map_rusage["ru_nvcsw"] = p_rusage->ru_nvcsw;
-  map_rusage["ru_nivcsw"] = p_rusage->ru_nivcsw;
-
-  delete p_rusage;
-
-  pthread_mutex_lock ( &mut_vec_rusage );
-
-  if ( vec_rusage_history.size() >= i_rusage_vec_size )
-    vec_rusage_history.erase( vec_rusage_history.begin() );
-
-  vec_rusage_history.push_back(map_rusage);
-
-  pthread_mutex_unlock( &mut_vec_rusage );
-}
-
-void
-stats::set_rusage_vec_size( int i_rusage_vec_size )
-{
-  pthread_mutex_lock ( &mut_vec_rusage );
-  this->i_rusage_vec_size = i_rusage_vec_size;
-  pthread_mutex_unlock( &mut_vec_rusage );
-}
-
-long
-stats::get_ru_maxrss()
-{
-  rusage* p_rusage = new rusage;
-  getrusage( RUSAGE_SELF, p_rusage );
-
-  long l_ret = p_rusage->ru_maxrss;
-  delete p_rusage;
-
-  return l_ret;
-}
-
-string
-stats::get_rusage_history( string s_type, string s_seperator )
-{
-  string s_ret;
-  int i_count = 0;
-  vector< map<string,long> >::iterator iter;
-
-  pthread_mutex_lock  ( &mut_vec_rusage );
-
-  for ( iter = vec_rusage_history.begin();
-        iter != vec_rusage_history.end();
-        iter++, i_count++ )
-    s_ret.append(s_seperator +
-                 tool::int2string(i_count) + ". " + iter->find(s_type)->first + " " +
-                 tool::int2string( iter->find(s_type)->second) + "\n");
-
-  pthread_mutex_unlock( &mut_vec_rusage );
-
-  return s_ret;
-}
-
-
-#endif
diff --git a/yhttpd/src/monitor/stats.h b/yhttpd/src/monitor/stats.h
deleted file mode 100644
index 0478258..0000000
--- a/yhttpd/src/monitor/stats.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "../incl.h"
-
-#ifndef STATS_H
-#define STATS_H
-
-#include "../tool/tool.h"
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-
-using namespace std;
-
-class stats
-{
-private:
-  // Specifies the max. amount of elements in vec_rusage_history;
-  int i_rusage_vec_size;
-  // History of the last i_rusage_vec_size rusage values.
-  vector< map<string,long> > vec_rusage_history;
-  pthread_mutex_t mut_vec_rusage;
-
-
-  void set_rusage_vec_size( int i_rusage_vec_size );
-
-public:
-  stats( );
-  ~stats( );
-
-  void update_rusage_history();
-  string get_rusage_history( string s_type, string s_seperator );
-  long get_ru_maxrss();
-};
-
-#endif