Deadlock fix, and other changes.

[loba.git] / process.h

diff --git a/process.h b/process.h
index 268fac9a2902641225f3145bf9cd3f30283f1aaa..4e6ab240f8d73b6f3b15c9fe404568bb82bdc7e2 100644 (file)
--- a/process.h
+++ b/process.h
@@ -13,13 +13,19 @@
 #  define MAP_TEMPLATE std::map
 #endif
 #include <msg/msg.h>
 #  define MAP_TEMPLATE std::map
 #endif
 #include <msg/msg.h>

+#include <xbt/log.h>

 #include "communicator.h"
 #include "neighbor.h"
 
 class process {
 public:
 #include "communicator.h"
 #include "neighbor.h"
 
 class process {
 public:

+    static double get_total_load_init()    { return total_load_init;    }
+    static double get_total_load_running() { return total_load_running; }
+    static double get_total_load_exit()    { return total_load_exit;    }
+

     process(int argc, char* argv[]);
     process(int argc, char* argv[]);

-    ~process();
+    virtual ~process();
+

     int run();
 
 protected:
     int run();
 
 protected:


@@ -32,9 +38,22 @@ protected:
     // Returns the sum of "to_send" for all neighbors.
     double sum_of_to_send() const;
 
     // Returns the sum of "to_send" for all neighbors.
     double sum_of_to_send() const;
 

+    // Calls neighbor::print(verbose, logp, cat) for each member of neigh.
+    void print_loads(bool verbose = false,
+                     e_xbt_log_priority_t logp = xbt_log_priority_info,
+                     xbt_log_category_t cat = _XBT_LOGV(default)) const;
+
+    // Calls neighbor::print(verbose, logp, cat) for each member of pneigh.
+    void print_loads_p(bool verbose = false,
+                       e_xbt_log_priority_t logp = xbt_log_priority_info,
+                       xbt_log_category_t cat = _XBT_LOGV(default)) const;
+

 private:
 private:

-    typedef MAP_TEMPLATE<m_host_t, neighbor*> rev_neigh_type;
+    static double total_load_init; // sum of process loads at init
+    static double total_load_running; // summ of loads while running
+    static double total_load_exit; // sum of process loads at exit

 
 

+    typedef MAP_TEMPLATE<m_host_t, neighbor*> rev_neigh_type;

     neigh_type neigh;           // list of neighbors (do not alter
                                 // after construction!)
     rev_neigh_type rev_neigh;   // map m_host_t -> neighbor
     neigh_type neigh;           // list of neighbors (do not alter
                                 // after construction!)
     rev_neigh_type rev_neigh;   // map m_host_t -> neighbor


@@ -44,6 +63,9 @@ private:
                                 // on ctrl channel
     int data_close_pending;     // number of "close" messages to wait
                                 // on data channel
                                 // on ctrl channel
     int data_close_pending;     // number of "close" messages to wait
                                 // on data channel

+    bool close_received;        // true if we received a "close" message
+    bool may_receive;           // true if there remains neighbors to listen for
+    bool finalizing;            // true when finalize() is running

 
     unsigned iter;              // counter of iterations
 
 
     unsigned iter;              // counter of iterations
 


@@ -67,18 +89,13 @@ private:
     void send();
 
     // Receive procedure: wait (or not) for a message to come.
     void send();
 
     // Receive procedure: wait (or not) for a message to come.

-    // Returns false if some "close" message was received, returns true
-    // otherwise.

     enum recv_wait_mode { NO_WAIT = 0, WAIT, WAIT_FOR_CLOSE };
     enum recv_wait_mode { NO_WAIT = 0, WAIT, WAIT_FOR_CLOSE };

-    bool receive(recv_wait_mode wait);
+    void receive(recv_wait_mode wait);

 
     // Finalize sends a "close" message to each neighbor and wait for
     // all of them to answer.
     void finalize1(neighbor& nb);
     void finalize();
 
     // Finalize sends a "close" message to each neighbor and wait for
     // all of them to answer.
     void finalize1(neighbor& nb);
     void finalize();

-
-    // Print with given priority what we know about our neighbors' loads
-    void print_loads(e_xbt_log_priority_t logp = xbt_log_priority_info);

 };
 
 #endif // !PROCESS_H
 };
 
 #endif // !PROCESS_H