25a358983a
Add support for generic visitors for stats and use them to implement independent output functions. Support for mysql output and some initial code for hacking on mysql output with python arch/alpha/pseudo_inst.cc: base/hybrid_pred.cc: base/hybrid_pred.hh: base/sat_counter.cc: base/sat_counter.hh: cpu/simple_cpu/simple_cpu.cc: kern/tru64/tru64_events.cc: sim/main.cc: sim/process.cc: sim/process.hh: sim/sim_events.cc: sim/sim_object.cc: sim/system.hh: update for changes in stats package base/statistics.cc: move the python output code to base/stats/puthon.(cc|hh) and reimplement it as a visitor. move the text output code to base/stats/text.(cc|hh) and reimplement it as a visitor. move the database stuff into base/stats/statdb.(cc|hh) and get rid of the class. Put everything as globals in the Statistics::Database namespace. allocate unique ids for all stats. directly implement the check routine and get rid of the various dumping routines since they're now in separate files. make sure that no two stats have the same name clean up some loops base/statistics.hh: major changes to the statistics package again lots of code was factored out of statistics.hh into several separate files in base/stats/ (this will continue) There are now two Stat package types Result and Counter that are specified to allow the user to keep the counted type separate from the result type. They are currently both doubles but that's an experiment. There is no more per stat ability to set the type. Statistics::Counter is not the same as Counter! Implement a visitor for statistics output so that new output types can be implemented independently from the stats package itself. Add a unique id to each stat so that it can be used to keep track of stats more simply. This number can also be used in debugging problems with stats. Tweak the bucket size stuff a bit to make it work better. fixed VectorDist size bug cpu/memtest/memtest.cc: Fix up for changes in stats package Don't use value() since it doesn't work with binning. If you want a number as a stat, and to use it in the program itself, you really want two separate variables, one that's a stat, and one that's not. cpu/memtest/memtest.hh: Fix up for changes in stats package test/Makefile: Try to build stuff now that directories matter test/stattest.cc: test all new output types choose which one with command line options --HG-- extra : convert_revision : e3a3f5f0828c67c0e2de415d936ad240adaddc89
149 lines
4.1 KiB
C++
149 lines
4.1 KiB
C++
/*
|
|
* Copyright (c) 2003-2004 The Regents of The University of Michigan
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are
|
|
* met: redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer;
|
|
* redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution;
|
|
* neither the name of the copyright holders nor the names of its
|
|
* contributors may be used to endorse or promote products derived from
|
|
* this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef __BASE_STATS_MYSQL_HH__
|
|
#define __BASE_STATS_MYSQL_HH__
|
|
|
|
#include <string>
|
|
|
|
#include "base/stats/output.hh"
|
|
|
|
namespace MySQL { class Connection; }
|
|
namespace Statistics {
|
|
|
|
class DistDataData;
|
|
class MySqlData;
|
|
|
|
struct SetupStat
|
|
{
|
|
std::string name;
|
|
std::string descr;
|
|
std::string type;
|
|
bool print;
|
|
uint16_t prereq;
|
|
int8_t prec;
|
|
bool nozero;
|
|
bool nonan;
|
|
bool total;
|
|
bool pdf;
|
|
bool cdf;
|
|
double min;
|
|
double max;
|
|
double bktsize;
|
|
uint16_t size;
|
|
|
|
void init();
|
|
unsigned operator()(MySqlData *data);
|
|
};
|
|
|
|
class InsertData
|
|
{
|
|
private:
|
|
char *query;
|
|
int size;
|
|
bool first;
|
|
static const int maxsize = 1024*1024;
|
|
|
|
public:
|
|
MySQL::Connection *mysql;
|
|
|
|
public:
|
|
uint64_t sample;
|
|
double data;
|
|
uint16_t stat;
|
|
uint16_t bin;
|
|
uint16_t run;
|
|
int16_t x;
|
|
int16_t y;
|
|
|
|
public:
|
|
InsertData();
|
|
~InsertData();
|
|
|
|
void flush();
|
|
void insert();
|
|
};
|
|
|
|
class MySql : public Output
|
|
{
|
|
protected:
|
|
std::list<FormulaData *> formulas;
|
|
MySqlData *mysql;
|
|
bool configured;
|
|
uint16_t run_id;
|
|
|
|
SetupStat stat;
|
|
InsertData newdata;
|
|
|
|
void insert(int sim_id, int db_id);
|
|
int find(int sim_id);
|
|
|
|
public:
|
|
MySql();
|
|
~MySql();
|
|
|
|
void connect(const std::string &host, const std::string &user,
|
|
const std::string &passwd, const std::string &db,
|
|
const std::string &name, const std::string &project);
|
|
|
|
// Implement Visit
|
|
virtual void visit(const ScalarData &data);
|
|
virtual void visit(const VectorData &data);
|
|
virtual void visit(const DistData &data);
|
|
virtual void visit(const VectorDistData &data);
|
|
virtual void visit(const Vector2dData &data);
|
|
virtual void visit(const FormulaData &data);
|
|
|
|
// Implement Output
|
|
virtual bool valid() const;
|
|
virtual void output();
|
|
|
|
protected:
|
|
// Output helper
|
|
void output(const std::string &bin);
|
|
void output(const DistDataData &data);
|
|
void output(const ScalarData &data);
|
|
void output(const VectorData &data);
|
|
void output(const DistData &data);
|
|
void output(const VectorDistData &data);
|
|
void output(const Vector2dData &data);
|
|
void output(const FormulaData &data);
|
|
|
|
void configure();
|
|
void configure(const StatData &data, std::string type);
|
|
void configure(const ScalarData &data);
|
|
void configure(const VectorData &data);
|
|
void configure(const DistData &data);
|
|
void configure(const VectorDistData &data);
|
|
void configure(const Vector2dData &data);
|
|
void configure(const FormulaData &data);
|
|
};
|
|
|
|
/* namespace Statistics */ }
|
|
|
|
#endif // __BASE_STATS_MYSQL_HH__
|