Mejora debug.

[z.facultad/75.74/practicos.git] / practicas / pipi / src / media.cpp

diff --git a/practicas/pipi/src/media.cpp b/practicas/pipi/src/media.cpp
index 5a3077eb8d457ca4c3879e44c8e51dc9a5dc07c4..823703c9f5056859059abfea34ae519b2ddea0e4 100644 (file)
--- a/practicas/pipi/src/media.cpp
+++ b/practicas/pipi/src/media.cpp
@@ -1,5 +1,7 @@
 #include "media.h"
 #include "media.h"

+#ifdef DEBUG

 #include <iostream>
 #include <iostream>

+#endif

 
 Media::Media(key_t key) throw (std::runtime_error)
 {
 
 Media::Media(key_t key) throw (std::runtime_error)
 {


@@ -10,16 +12,24 @@ Media::Media(key_t key) throw (std::runtime_error)
 
 void Media::transmit(const Frame& frame)
 {
 
 void Media::transmit(const Frame& frame)
 {

-    std::cout << "tx -> msgtype = " << *(((int*)&frame)+1) << "\n";
+#ifdef DEBUG
+    std::cout << "Media::transmit(msgtype/mac = " << *(((int*)&frame)+1)
+        << ", size = " << frame.size() << ", data = " << frame.data() << ")\n";
+#endif
+    // HACK ASQUEROSO para pasarle por encima a la vtable... :-O~

     if (msgsnd(que_id, ((int*)&frame)+1, frame.size(), 0) == -1)
         throw std::runtime_error("Error al poner en la cola");
 }
 
 void Media::receive(Frame& frame)
 {
     if (msgsnd(que_id, ((int*)&frame)+1, frame.size(), 0) == -1)
         throw std::runtime_error("Error al poner en la cola");
 }
 
 void Media::receive(Frame& frame)
 {

-    std::cout << "rx -> msgtype = " << *(((int*)&frame)+1) << "\n";
+    // HACK ASQUEROSO para pasarle por encima a la vtable... :-O~

     if (msgrcv(que_id, ((int*)&frame)+1, frame.size(), frame.mac(), 0) == -1)
         throw std::runtime_error("Error al sacar de la cola");
     if (msgrcv(que_id, ((int*)&frame)+1, frame.size(), frame.mac(), 0) == -1)
         throw std::runtime_error("Error al sacar de la cola");

+#ifdef DEBUG
+    std::cout << "Media::receive(msgtype/mac = " << *(((int*)&frame)+1)
+        << ", size = " << frame.size() << ", data = " << frame.data() << ")\n";
+#endif

 }
 
 // vim: set et sw=4 sts=4 :
 }
 
 // vim: set et sw=4 sts=4 :