changeset ccb1801742a1 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=ccb1801742a1
description:
        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.

diffstat:

 src/cpu/testers/traffic_gen/generators.cc |  4 ++--
 src/mem/comm_monitor.cc                   |  4 ++--
 src/proto/packet.proto                    |  2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diffs (54 lines):

diff -r 8c0870dbae5c -r ccb1801742a1 src/cpu/testers/traffic_gen/generators.cc
--- a/src/cpu/testers/traffic_gen/generators.cc Mon Sep 01 16:55:45 2014 -0500
+++ b/src/cpu/testers/traffic_gen/generators.cc Mon Sep 01 16:55:46 2014 -0500
@@ -301,7 +301,7 @@
 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 @@
 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 -r 8c0870dbae5c -r ccb1801742a1 src/mem/comm_monitor.cc
--- a/src/mem/comm_monitor.cc   Mon Sep 01 16:55:45 2014 -0500
+++ b/src/mem/comm_monitor.cc   Mon Sep 01 16:55:46 2014 -0500
@@ -84,7 +84,7 @@
 
         // 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 @@
         // 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 -r 8c0870dbae5c -r ccb1801742a1 src/proto/packet.proto
--- a/src/proto/packet.proto    Mon Sep 01 16:55:45 2014 -0500
+++ b/src/proto/packet.proto    Mon Sep 01 16:55:46 2014 -0500
@@ -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
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev

Reply via email to