Changeset 20103

Timestamp:

05/02/07 08:21:06 (2 years ago)

Author:

aronb

Message:

Remove code that is no longer useful.

Files:

• juggler/trunk/modules/gadgeteer/cluster/ClusterManager.cpp (modified) (4 diffs)
• juggler/trunk/modules/gadgeteer/cluster/ClusterManager.h (modified) (2 diffs)
• juggler/trunk/modules/gadgeteer/gadget/AbstractNetworkManager.cpp (modified) (1 diff)
• juggler/trunk/modules/gadgeteer/plugins/ApplicationDataManager/ApplicationDataManager.cpp (modified) (1 diff)

juggler/trunk/modules/gadgeteer/cluster/ClusterManager.cpp

@@ -153 +153 @@
-   ClusterManager::ClusterManager()
-      : mClusterActive( false )
-      , mClusterReady( false )
-      , mClusterStarted( false )
-      , mIsMaster(false)
@@ -224 +223 @@
-      if (mIsMaster)
-      {
-         std::cout << "XXX: ClusterManager::start() MASTER" << std::endl;
-         if (NULL == mClusterElement.get())
-         {
@@ -251 +249 @@
-            (*itr)->send(cfg_pkt);
-         }
-         std::cout << "Before barrier" << std::endl;
-         sendEndBlocksAndSignalUpdate(0);
-         std::cout << "After barrier" << std::endl;
-         //while(true)
-         //{;}
-         // Wait for all needed configuration.
-         // Connect to all nodes.
-      }
-      else if (mIsSlave)
-      {
-         std::cout << "XXX: ClusterManager::start() SLAVE" << std::endl;
-         // Start listening on known port for connections.
-         mClusterNetwork->waitForConnection();
-         std::cout << "Before barrier" << std::endl;
-         sendEndBlocksAndSignalUpdate(0);
-         std::cout << "After barrier" << std::endl;
-         //while(true)
-         //{;}
-      }
-   }
@@ -274 +261 @@
-   bool ClusterManager::isClusterReady()
-   {
-      // -If the cluster is active and not ready
-      //   -If a StartBarrier jccl::ConfigElement does not exist
-      //    -Warn the user and set cluster ready
-      //   -Get new value of mClusterReady from asking all plugins
-      // -Return the new mClusterReady
-
-      vpr::Guard<vpr::Mutex> ready_guard( mClusterReadyLock );
-      vpr::Guard<vpr::Mutex> active_guard( mClusterActiveLock );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-      // Lock it here so that we can avoid confusion in pluginsReady()
-      vpr::Guard<vpr::Mutex> guard( mPluginsLock );
-mClusterReady
+!pending_windows
-   }
-

juggler/trunk/modules/gadgeteer/cluster/ClusterManager.h

@@ -266 +266 @@
-
-   /**
-    * Change the ready state of the ClusterManager.
-    */
-   void setClusterReady( const bool ready )
-   {
-      vpr::Guard<vpr::Mutex> guard( mClusterReadyLock );
-
-      vprDEBUG( gadgetDBG_RIM, vprDBG_CONFIG_LVL )
-         << clrOutBOLD( clrCYAN, "[ClusterManager]" )
-         << " Cluster is ready." << std::endl << vprDEBUG_FLUSH;
-
-      mClusterReady = ready;
-   }
-
-   /**
-    * Output the current status of the cluster.
-    */
@@ -351 +337 @@
-   bool                         mClusterActive;      /**< Flag informing us if this app is running on a cluster. */
-
-   vpr::Mutex                   mClusterReadyLock;   /**< Lock on ClusterReady bool.*/
-   bool                         mClusterReady;       /**< Flag set true when all dependancies are satisfied. */
-
-   bool                         mClusterStarted;     /**< If the cluster has already started. */
-

juggler/trunk/modules/gadgeteer/gadget/AbstractNetworkManager.cpp

@@ -296 +296 @@
-   {
-      // -Set New State
-
-
-
-
-
+
-      node->setUpdated( true );
-      return;
-   }
-   else if (packet->getPacketType() == cluster::Header::RIM_CONNECTION_REQ ||
-            packet->getPacketType() == cluster::Header::RIM_CONNECTION_ACK)
-   {
-      //handleLocalPacket(packet, node);
-      
-      vprDEBUG( gadgetDBG_NET_MGR, vprDBG_CRITICAL_LVL )
-         << clrOutBOLD( clrRED, "[ERROR] " )
-         << "RIM_CONNECTION_REQ & RIM_CONNECTION_ACK data packet types are depreciated."
-         << std::endl << vprDEBUG_FLUSH;
-      return;
-   }
-
-   vpr::GUID handler_guid = packet->getPluginId();
-
-   PacketHandler* temp_handler = getHandlerByGUID( handler_guid );
-

juggler/trunk/modules/gadgeteer/plugins/ApplicationDataManager/ApplicationDataManager.cpp

@@ -30 +30 @@
-
-#include <cluster/ClusterManager.h>
-#include <gadget/AbstractNetworkManager.h>
-#include <gadget/Node.h>
-#include <gadget/Util/Debug.h>