Attachment #2549 for bug #2480

View | Details | Raw Unified | Return to bug 2480
Collapse All | Expand All




      return;
    }

  Exec ("create table if not exists Experiments (run, experiment, strategy, input, description text)");

  sqlite3_stmt *stmt;
  sqlite3_prepare_v2 (m_db,
    "insert into Experiments (run, experiment, strategy, input, description) values (?, ?, ?, ?, ?)",
    -1,
    &stmt,
    NULL
  );

  std::string run = dc.GetRunLabel ();
  sqlite3_bind_text (stmt, 1, run.c_str (), run.length (), SQLITE_TRANSIENT);
  sqlite3_bind_text (stmt, 2, dc.GetExperimentLabel ().c_str (),
                              dc.GetExperimentLabel ().length (), SQLITE_TRANSIENT);
  sqlite3_bind_text (stmt, 3, dc.GetStrategyLabel ().c_str (),
                              dc.GetStrategyLabel ().length (), SQLITE_TRANSIENT);
  sqlite3_bind_text (stmt, 4, dc.GetInputLabel ().c_str (),
                              dc.GetInputLabel ().length (), SQLITE_TRANSIENT);
  sqlite3_bind_text (stmt, 5, dc.GetDescription ().c_str (),
                              dc.GetDescription ().length (), SQLITE_TRANSIENT);
  sqlite3_step (stmt);
  sqlite3_finalize (stmt);

  Exec ("create table if not exists Metadata ( run text, key text, value)");

  sqlite3_prepare_v2 (m_db,
    "insert into Metadata (run, key, value) values (?, ?, ?)",
    -1,
    &stmt,
    NULL
  );
  for (MetadataList::iterator i = dc.MetadataBegin ();
       i != dc.MetadataEnd (); i++) {
      std::pair<std::string, std::string> blob = (*i);

      sqlite3_reset (stmt);
      sqlite3_bind_text (stmt, 1, run.c_str (),
                                  run.length (), SQLITE_TRANSIENT);
      sqlite3_bind_text (stmt, 2, blob.first.c_str (),
                                  blob.first.length (), SQLITE_TRANSIENT);
      sqlite3_bind_text (stmt, 3, blob.second.c_str (),
                                  blob.second.length (), SQLITE_TRANSIENT);
      sqlite3_step (stmt);
    }
  sqlite3_finalize (stmt);

  Exec ("BEGIN");
  SqliteOutputCallback callback (this, run);


  m_owner->Exec ("create table if not exists Singletons ( run text, name text, variable text, value )");

  sqlite3_prepare_v2 (m_owner->m_db,
    "insert into Singletons (run, name, variable, value) values (?, ?, ?, ?)",
    -1,
    &m_insertSingletonStatement,
    NULL
  );
  sqlite3_bind_text (m_insertSingletonStatement, 1, m_runLabel.c_str (), m_runLabel.length (), SQLITE_TRANSIENT);

  // end SqliteDataOutput::SqliteOutputCallback::SqliteOutputCallback
}

SqliteDataOutput::SqliteOutputCallback::~SqliteOutputCallback ()
{
  sqlite3_finalize (m_insertSingletonStatement);
}

void
SqliteDataOutput::SqliteOutputCallback::OutputStatistic (std::string key,
                                                         std::string variable,

{
  NS_LOG_FUNCTION (this << key << variable << val);

  sqlite3_reset (m_insertSingletonStatement);
  sqlite3_bind_text (m_insertSingletonStatement, 2, key.c_str (), key.length (), SQLITE_TRANSIENT);
  sqlite3_bind_text (m_insertSingletonStatement, 3, variable.c_str (), variable.length (), SQLITE_TRANSIENT);
  sqlite3_bind_int (m_insertSingletonStatement, 4, val);
  sqlite3_step (m_insertSingletonStatement);
  val << ")";
  m_owner->Exec (sstr.str ());

  // end SqliteDataOutput::SqliteOutputCallback::OutputSingleton
}
void
SqliteDataOutput::SqliteOutputCallback::OutputSingleton (std::string key,

{
  NS_LOG_FUNCTION (this << key << variable << val);

  sqlite3_reset (m_insertSingletonStatement);
  sqlite3_bind_text (m_insertSingletonStatement, 2, key.c_str (), key.length (), SQLITE_TRANSIENT);
  sqlite3_bind_text (m_insertSingletonStatement, 3, variable.c_str (), -1, SQLITE_TRANSIENT);
  sqlite3_bind_int64 (m_insertSingletonStatement, 4, val);
  sqlite3_step (m_insertSingletonStatement);
  val << ")";
  m_owner->Exec (sstr.str ());
  // end SqliteDataOutput::SqliteOutputCallback::OutputSingleton
}

void
SqliteDataOutput::SqliteOutputCallback::OutputSingleton (std::string key,
                                                         std::string variable,

{
  NS_LOG_FUNCTION (this << key << variable << val);

  sqlite3_reset (m_insertSingletonStatement);
  sqlite3_bind_text (m_insertSingletonStatement, 2, key.c_str (), key.length (), SQLITE_TRANSIENT);
  sqlite3_bind_text (m_insertSingletonStatement, 3, variable.c_str (), variable.length (), SQLITE_TRANSIENT);
  sqlite3_bind_double (m_insertSingletonStatement, 4, val);
  sqlite3_step (m_insertSingletonStatement);
  val << ")";
  m_owner->Exec (sstr.str ());
  // end SqliteDataOutput::SqliteOutputCallback::OutputSingleton
}

void
SqliteDataOutput::SqliteOutputCallback::OutputSingleton (std::string key,
                                                         std::string variable,

{
  NS_LOG_FUNCTION (this << key << variable << val);

  sqlite3_reset (m_insertSingletonStatement);
  sqlite3_bind_text (m_insertSingletonStatement, 2, key.c_str (), key.length (), SQLITE_TRANSIENT);
  sqlite3_bind_text (m_insertSingletonStatement, 3, variable.c_str (), variable.length (), SQLITE_TRANSIENT);
  sqlite3_bind_text (m_insertSingletonStatement, 4, val.c_str (), val.length (), SQLITE_TRANSIENT);
  sqlite3_step (m_insertSingletonStatement);
  val << "')";
  m_owner->Exec (sstr.str ());
  // end SqliteDataOutput::SqliteOutputCallback::OutputSingleton
}

void
SqliteDataOutput::SqliteOutputCallback::OutputSingleton (std::string key,
                                                         std::string variable,

{
  NS_LOG_FUNCTION (this << key << variable << val);

  sqlite3_reset (m_insertSingletonStatement);
  sqlite3_bind_text (m_insertSingletonStatement, 2, key.c_str (), key.length (), SQLITE_TRANSIENT);
  sqlite3_bind_text (m_insertSingletonStatement, 3, variable.c_str (), variable.length (), SQLITE_TRANSIENT);
  sqlite3_bind_int64 (m_insertSingletonStatement, 4, val.GetTimeStep ());
  sqlite3_step (m_insertSingletonStatement);
  val.GetTimeStep () << ")";
  m_owner->Exec (sstr.str ());
  // end SqliteDataOutput::SqliteOutputCallback::OutputSingleton
}

(-)a/src/stats/model/sqlite-data-output.h (-1 / +7 lines)

Lines 27-33	Link Here

#define STATS_HAS_SQLITE3

#define STATS_HAS_SQLITE3

struct sqlite3;

#include <sqlite3.h>

namespace ns3 {

namespace ns3 {

Lines 70-75	Link Here

    SqliteOutputCallback(Ptr<SqliteDataOutput> owner, std::string run);

    SqliteOutputCallback(Ptr<SqliteDataOutput> owner, std::string run);

/**

/**

     * Destructor

*/

    ~SqliteOutputCallback ();

/**

     * \brief Generates data statistics

     * \brief Generates data statistics

     * \param key the SQL key to use

     * \param key the SQL key to use

     * \param variable the variable name

     * \param variable the variable name

Lines 132-137	Link Here

132

private:

137

private:

133

    Ptr<SqliteDataOutput> m_owner; //!< the instance this object belongs to

138

    Ptr<SqliteDataOutput> m_owner; //!< the instance this object belongs to

134

    std::string m_runLabel; //!< Run label

139

    std::string m_runLabel; //!< Run label

140

    sqlite3_stmt *m_insertSingletonStatement; //!< Prepared singleton insert statement

135

141

136

    // end class SqliteOutputCallback

142

    // end class SqliteOutputCallback

137

};

143

};

Return to bug 2480