sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mem: change the namespace Message to ProtoMessage

Browse source 
The namespace Message conflicts with the Message data type used extensively
in Ruby.  Since Ruby is being moved to the same Master/Slave ports based
configuration style as the rest of gem5, this conflict needs to be resolved.
Hence, the namespace is being renamed to ProtoMessage.
This commit is contained in:
Nilay Vaish 2014-09-01 16:55:46 -05:00
parent cee8faaad0
commit d07abd9b5b
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cpu/testers/traffic_gen/generators.cc
View file

@ -301,7 +301,7 @@ void
TraceGen::InputStream::init() TraceGen::InputStream::init()
{ {
// Create a protobuf message for the header and read it from the stream // Create a protobuf message for the header and read it from the stream
Message::PacketHeader header_msg; ProtoMessage::PacketHeader header_msg;
if (!trace.read(header_msg)) { if (!trace.read(header_msg)) {
panic("Failed to read packet header from trace\n"); panic("Failed to read packet header from trace\n");
@ -322,7 +322,7 @@ TraceGen::InputStream::reset()
bool bool
TraceGen::InputStream::read(TraceElement& element) TraceGen::InputStream::read(TraceElement& element)
{ {
Message::Packet pkt_msg; ProtoMessage::Packet pkt_msg;
if (trace.read(pkt_msg)) { if (trace.read(pkt_msg)) {
element.cmd = pkt_msg.cmd(); element.cmd = pkt_msg.cmd();
element.addr = pkt_msg.addr(); element.addr = pkt_msg.addr();

4
src/mem/comm_monitor.cc
View file

@ -84,7 +84,7 @@ CommMonitor::CommMonitor(Params* params)
// Create a protobuf message for the header and write it to // Create a protobuf message for the header and write it to
// the stream // the stream
Message::PacketHeader header_msg; ProtoMessage::PacketHeader header_msg;
header_msg.set_obj_id(name()); header_msg.set_obj_id(name());
header_msg.set_tick_freq(SimClock::Frequency); header_msg.set_tick_freq(SimClock::Frequency);
traceStream->write(header_msg); traceStream->write(header_msg);
@ -214,7 +214,7 @@ CommMonitor::recvTimingReq(PacketPtr pkt)
// Create a protobuf message representing the // Create a protobuf message representing the
// packet. Currently we do not preserve the flags in the // packet. Currently we do not preserve the flags in the
// trace. // trace.
Message::Packet pkt_msg; ProtoMessage::Packet pkt_msg;
pkt_msg.set_tick(curTick()); pkt_msg.set_tick(curTick());
pkt_msg.set_cmd(cmd); pkt_msg.set_cmd(cmd);
pkt_msg.set_flags(req_flags); pkt_msg.set_flags(req_flags);

2
src/proto/packet.proto
View file

@ -36,7 +36,7 @@
// Authors: Andreas Hansson // Authors: Andreas Hansson
// Put all the generated messages in a namespace // Put all the generated messages in a namespace
package Message; package ProtoMessage;
// Packet header with the identifier describing what object captured // Packet header with the identifier describing what object captured
// the trace, the version of this file format, and the tick frequency // the trace, the version of this file format, and the tick frequency