Changeset 2273

Timestamp:

11/04/06 08:59:01 (7 years ago)

Author:

stud-matfried

Message:

Renamed the benchmark class to benchmark_journal.
We will need the name "benchmark" later.

Location:

natfw-nslp/trunk

Files:

• include/benchmark_journal.h (moved) (moved from natfw-nslp/trunk/include/benchmark.h) (5 diffs)
• src/Makefile (modified) (1 diff)
• src/benchmark_journal.cpp (moved) (moved from natfw-nslp/trunk/src/benchmark.cpp) (7 diffs)
• src/dispatcher.cpp (modified) (3 diffs)
• src/gistka_mapper.cpp (modified) (8 diffs)
• src/natfw_daemon.cpp (modified) (5 diffs)

natfw-nslp/trunk/include/benchmark_journal.h

@@ -5 +5 @@
  * $HeadURL$
  */
-#ifndef NATFW__BENCHMARK_H
-#define NATFW__BENCHMARK_H
+#ifndef NATFW__BENCHMARK_JOURNAL_H
+#define NATFW__BENCHMARK_JOURNAL_H
 
 #include <iostream>
@@ -27 +27 @@
  * journal.
  */
-class benchmark {
+class benchmark_journal {
   public:
         /**
@@ -41 +41 @@
                 PRE_MAPPING             = 3,
                 POST_MAPPING            = 4,
-                PRE_PARSER              = 5,
-                POST_PARSER             = 6,
-                PRE_DISPATCHER          = 7,
-                POST_DISPATCHER         = 8,
-                PRE_SESSION             = 9,
-                POST_SESSION            = 10,
-                HIGHEST_VALID_ID        = 10
+                PRE_SERIALIZE           = 5,
+                POST_SERIALIZE          = 6,
+                PRE_DESERIALIZE         = 7,
+                POST_DESERIALIZE        = 8,
+                PRE_DISPATCHER          = 9,
+                POST_DISPATCHER         = 10,
+                PRE_SESSION             = 11,
+                POST_SESSION            = 12,
+                HIGHEST_VALID_ID        = 12
         };
 
-        benchmark(int journal_size, const std::string &filename="");
-        ~benchmark();
+        benchmark_journal(int journal_size, const std::string &filename="");
+        ~benchmark_journal();
 
         void add(measuring_point_id_t mp_id);
@@ -84 +86 @@
 
 
-inline void benchmark::add(measuring_point_id_t mp_id) {
+inline void benchmark_journal::add(measuring_point_id_t mp_id) {
         pthread_mutex_lock(&mutex);
 
@@ -114 +116 @@
 
 
-#endif // NATFW__BENCHMARK_H
+#endif // NATFW__BENCHMARK_JOURNAL_H

natfw-nslp/trunk/src/Makefile

@@ -63 +63 @@
         nf_edge_rea_session.o nf_non_edge_rea_session.o natfw_config.o \
         policy_rule.o policy_rule_installer.o iptables_policy_rule_installer.o \
-        nat_manager.o gistka_mapper.o natfw_timers.o benchmark.o
+        nat_manager.o gistka_mapper.o natfw_timers.o benchmark_journal.o
 
 

natfw-nslp/trunk/src/benchmark_journal.cpp

@@ -9 +9 @@
 #include <pthread.h>
 
-#include "benchmark.h"
+#include "benchmark_journal.h"
 
 using namespace natfw;
@@ -17 +17 @@
  * Human readable measuring point names, used in write_header().
  */
-const char *benchmark::mp_names[benchmark::HIGHEST_VALID_ID+1] = {
+const char *
+benchmark_journal::mp_names[benchmark_journal::HIGHEST_VALID_ID+1] = {
         "INVALID_ID",
+        "PRE_PROCESSING",
+        "POST_PROCESSING",
         "PRE_MAPPING",
         "POST_MAPPING",
-        "PRE_PARSER",
-        "POST_PARSER",
+        "PRE_SERIALIZE",
+        "POST_SERIALIZE",
+        "PRE_DESERIALIZE",
+        "POST_DESERIALIZE",
         "PRE_DISPATCHER",
         "POST_DISPATCHER",
@@ -40 +45 @@
  * @param filename the name of the file to write the journal to
  */
-benchmark::benchmark(int journal_size, const std::string &filename)
+benchmark_journal::benchmark_journal(
+                int journal_size, const std::string &filename)
                 : journal_size(journal_size), journal_pos(0),
                   filename(filename), disable_journal(false) {
 
         journal = new measuring_point_t[journal_size];
-        memset(journal, 0, sizeof(benchmark::measuring_point_t) * journal_size);
+        memset(journal, 0,
+                sizeof(benchmark_journal::measuring_point_t) * journal_size);
 
         /*
@@ -61 +68 @@
 
 
-benchmark::~benchmark() {
+benchmark_journal::~benchmark_journal() {
         delete journal;
         pthread_mutex_destroy(&mutex);
@@ -67 +74 @@
 
 
-void benchmark::write_journal(const std::string &filename) {
+void benchmark_journal::write_journal(const std::string &filename) {
         std::ofstream out(filename.c_str());
 
@@ -91 +98 @@
  * Note that the caller is responsible for closing the stream.
  */
-void benchmark::write_journal(std::ostream &out) {
+void benchmark_journal::write_journal(std::ostream &out) {
         pthread_mutex_lock(&mutex);
 
@@ -110 +117 @@
  * Write a header to the journal documenting the measuring points.
  */
-void benchmark::write_header(std::ostream &out) {
+void benchmark_journal::write_header(std::ostream &out) {
         time_t t;
 

natfw-nslp/trunk/src/dispatcher.cpp

@@ -14 +14 @@
 #include "dispatcher.h"
 #include "events.h"
-#include "benchmark.h"
+#include "benchmark_journal.h"
 
 
@@ -32 +32 @@
 
 #ifdef BENCHMARK
-  extern benchmark journal;
+  extern benchmark_journal journal;
 #endif
 
@@ -140 +140 @@
         if ( s != NULL ) {
                 try {
-                        MP(benchmark::PRE_SESSION);
+                        MP(benchmark_journal::PRE_SESSION);
                         s->process(this, evt);
-                        MP(benchmark::POST_SESSION);
+                        MP(benchmark_journal::POST_SESSION);
                 }
                 catch ( ... ) {

natfw-nslp/trunk/src/gistka_mapper.cpp

@@ -14 +14 @@
 #include "events.h"
 #include "gistka_mapper.h"
-#include "benchmark.h"
+#include "benchmark_journal.h"
 
 
@@ -31 +31 @@
 
 #ifdef BENCHMARK
-  extern benchmark journal;
+  extern benchmark_journal journal;
 #endif
 
@@ -41 +41 @@
         using ntlp::nslpdata;
 
-        MP(benchmark::PRE_SERIALIZE);
+        MP(benchmark_journal::PRE_SERIALIZE);
 
         /*
@@ -90 +90 @@
                 sii_handle, attr, timeout, ip_ttl, ntlp_hop_count);
 
-        MP(benchmark::POST_SERIALIZE);
+        MP(benchmark_journal::POST_SERIALIZE);
 
         return apimsg;
@@ -106 +106 @@
         assert( msg != NULL );
 
-        MP(benchmark::PRE_MAPPING);
+        MP(benchmark_journal::PRE_MAPPING);
 
         if ( dynamic_cast<const APIMsg *>(msg) != NULL )
@@ -126 +126 @@
                 LogWarn("map_to_event(): mapping not possible");
 
-        MP(benchmark::POST_MAPPING);
+        MP(benchmark_journal::POST_MAPPING);
 
         return ret;
@@ -207 +207 @@
          * Parse the NSLP payload (the NTLP's body).
          */
-        MP(benchmark::PRE_DESERIALIZE);
+        MP(benchmark_journal::PRE_DESERIALIZE);
         NetMsg payload(data->get_buffer(), data->get_size()); // copies the data
         NATFW_IEManager *mgr = NATFW_IEManager::instance();
@@ -243 +243 @@
         msg_event *evt = new msg_event(sid, ret, final_hop);
 
-        MP(benchmark::POST_DESERIALIZE);
+        MP(benchmark_journal::POST_DESERIALIZE);
 
         return evt;

natfw-nslp/trunk/src/natfw_daemon.cpp

@@ -11 +11 @@
 #include "dispatcher.h"
 #include "natfw_daemon.h"
-#include "benchmark.h"
+#include "benchmark_journal.h"
 
 
@@ -27 +27 @@
 
 #ifdef BENCHMARK
-  benchmark journal(10000, "benchmark_journal.txt");
+  benchmark_journal journal(1000, "benchmark_journal.txt");
 #endif
 
@@ -196 +196 @@
                         << " processing received message #" << msg->get_id());
 
-                MP(benchmark::PRE_PROCESSING);
+                MP(benchmark_journal::PRE_PROCESSING);
 
                 // Analyze message and create an event from it.
@@ -203 +203 @@
                 // Then feed the event to the dispatcher.
                 if ( evt != NULL ) {
-                        MP(benchmark::PRE_DISPATCHER);
+                        MP(benchmark_journal::PRE_DISPATCHER);
                         disp.process(evt);
-                        MP(benchmark::POST_DISPATCHER);
+                        MP(benchmark_journal::POST_DISPATCHER);
                         delete evt;
                 }
@@ -211 +211 @@
                 delete msg;
 
-                MP(benchmark::POST_PROCESSING);
+                MP(benchmark_journal::POST_PROCESSING);
         }
 }