Wip++...

* use <tr1/unordered_map> for process::rev_neigh
* update setlocalversion to use -dirty suffix

diff --git a/process.cpp b/process.cpp
index 1a9066d66d013ba234f097fcffa5661cbba2a476..e1232f2ac59640923e46f1c5f5f0b627ca0055c8 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -49,6 +49,10 @@ process::process(int argc, char* argv[])
     print_loads(logp);
 }
 
     print_loads(logp);
 }
 

+process::~process()
+{
+}
+

 int process::run()
 {
     bool one_more = true;
 int process::run()
 {
     bool one_more = true;

diff --git a/process.h b/process.h
index a49c6efcd41e376189683c7761126db8abe0d859..58024265d8b0ac06fb43755966f0eaff02d814f2 100644 (file)
--- a/process.h
+++ b/process.h
@@ -1,8 +1,17 @@
 #ifndef PROCESS_H
 #define PROCESS_H
 
 #ifndef PROCESS_H
 #define PROCESS_H
 

-#include <map>
+#define USE_UNORDERED_MAP 1
+//#undef USE_UNORDERED_MAP
+

 #include <vector>
 #include <vector>

+#ifdef USE_UNORDERED_MAP
+#  include <tr1/unordered_map>
+#  define MAP_TEMPLATE std::tr1::unordered_map
+#else
+#  include <map>
+#  define MAP_TEMPLATE std::map
+#endif

 #include <msg/msg.h>
 #include "communicator.h"
 #include "neighbor.h"
 #include <msg/msg.h>
 #include "communicator.h"
 #include "neighbor.h"


@@ -10,12 +19,13 @@
 class process {
 public:
     process(int argc, char* argv[]);
 class process {
 public:
     process(int argc, char* argv[]);

-    ~process() { };
+    ~process();

     int run();
 
 private:
     std::vector<neighbor> neigh;
     int run();
 
 private:
     std::vector<neighbor> neigh;

-    std::map<m_host_t, neighbor*> rev_neigh;
+    MAP_TEMPLATE<m_host_t, neighbor*> rev_neigh;
+    std::vector<neighbor*> pneigh;

 
     communicator comm;
     int ctrl_close_pending;
 
     communicator comm;
     int ctrl_close_pending;

diff --git a/setlocalversion b/setlocalversion
index 43ac91a1e3ea7e6656df013f97fed132f4934527..221f868a6b0a4d3ec0ef606ef991eae71caf382c 100755 (executable)
--- a/setlocalversion
+++ b/setlocalversion
@@ -1,5 +1,7 @@
 #!/bin/bash
 
 #!/bin/bash
 

+# Inspired by linux-2.6/scripts/setlocalversion
+

 set -e
 
 FILE=localversion
 set -e
 
 FILE=localversion


@@ -11,6 +13,11 @@ compute_version()
     fi
     head=$(git rev-parse --verify --short HEAD)
     printf "~git-%s" "$head"
     fi
     head=$(git rev-parse --verify --short HEAD)
     printf "~git-%s" "$head"

+    # Check for uncommitted changes
+    if git diff-index --name-only HEAD | read dummy; then
+        printf '%s' "-dirty"
+    fi
+

 }
 
 [ -f "$FILE" ] || touch "$FILE"
 }
 
 [ -f "$FILE" ] || touch "$FILE"