mem: change the namespace Message to ProtoMessage

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.

diff --git a/src/cpu/testers/traffic_gen/generators.cc b/src/cpu/testers/traffic_gen/generators.cc
index f0c126a81017f46e9743beaded44d3ef522f3641..7c6bab92cdd2c89334f64d79b1267e2a5f655b35 100644 (file)
--- a/src/cpu/testers/traffic_gen/generators.cc
+++ b/src/cpu/testers/traffic_gen/generators.cc
@@ -301,7 +301,7 @@ void
 TraceGen::InputStream::init()
 {
     // 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)) {
         panic("Failed to read packet header from trace\n");
 
@@ -322,7 +322,7 @@ TraceGen::InputStream::reset()
 bool
 TraceGen::InputStream::read(TraceElement& element)
 {
-    Message::Packet pkt_msg;
+    ProtoMessage::Packet pkt_msg;
     if (trace.read(pkt_msg)) {
         element.cmd = pkt_msg.cmd();
         element.addr = pkt_msg.addr();

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

diff --git a/src/proto/packet.proto b/src/proto/packet.proto
index a98df7efebf0f2eefe339c2a860836a8ae4c6eb5..d2759969123d819c2db53eba64a2cec22f9a5272 100644 (file)
--- a/src/proto/packet.proto
+++ b/src/proto/packet.proto
@@ -36,7 +36,7 @@
 // Authors: Andreas Hansson
 
 // Put all the generated messages in a namespace
-package Message;
+package ProtoMessage;
 
 // Packet header with the identifier describing what object captured
 // the trace, the version of this file format, and the tick frequency