sim_object.cc (6216:2f4020838149) | sim_object.cc (7460:41550bb10e08) |
---|---|
1/* 2 * Copyright (c) 2001-2005 The Regents of The University of Michigan 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions are 7 * met: redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer; --- 21 unchanged lines hidden (view full) --- 30 */ 31 32#include <cassert> 33 34#include "base/callback.hh" 35#include "base/inifile.hh" 36#include "base/match.hh" 37#include "base/misc.hh" | 1/* 2 * Copyright (c) 2001-2005 The Regents of The University of Michigan 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions are 7 * met: redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer; --- 21 unchanged lines hidden (view full) --- 30 */ 31 32#include <cassert> 33 34#include "base/callback.hh" 35#include "base/inifile.hh" 36#include "base/match.hh" 37#include "base/misc.hh" |
38#include "base/stats/events.hh" | |
39#include "base/trace.hh" 40#include "base/types.hh" 41#include "sim/sim_object.hh" 42#include "sim/stats.hh" 43 44using namespace std; 45 46 --- 168 unchanged lines hidden (view full) --- 215 216void 217debugObjectBreak(const char *objs) 218{ 219 SimObject::debugObjectBreak(string(objs)); 220} 221#endif 222 | 38#include "base/trace.hh" 39#include "base/types.hh" 40#include "sim/sim_object.hh" 41#include "sim/stats.hh" 42 43using namespace std; 44 45 --- 168 unchanged lines hidden (view full) --- 214 215void 216debugObjectBreak(const char *objs) 217{ 218 SimObject::debugObjectBreak(string(objs)); 219} 220#endif 221 |
223void 224SimObject::recordEvent(const std::string &stat) 225{ 226 Stats::recordEvent(stat); 227} 228 | |
229unsigned int 230SimObject::drain(Event *drain_event) 231{ 232 state = Drained; 233 return 0; 234} 235 236void --- 38 unchanged lines hidden --- | 222unsigned int 223SimObject::drain(Event *drain_event) 224{ 225 state = Drained; 226 return 0; 227} 228 229void --- 38 unchanged lines hidden --- |