Changeset 2997 for code/branches/ggz

Timestamp:

May 20, 2009, 4:18:02 PM (16 years ago)

Author:

adrfried

Message:

some asio functionality

Location:

code/branches/ggz

Files:

• cmake/BuildConfigGCC.cmake (modified) (1 diff)
• src/orxonox/GGZClient.cc (modified) (5 diffs)
• src/orxonox/GGZClient.h (modified) (3 diffs)
• src/orxonox/objects/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/FDWatcher.cc (deleted)
• src/orxonox/objects/FDWatcher.h (deleted)

code/branches/ggz/cmake/BuildConfigGCC.cmake

@@ -64 +64 @@
 
 # Increase warning level if requested
+SET(EXTRA_COMPILER_WARNINGS TRUE)
 IF(EXTRA_COMPILER_WARNINGS)
   ADD_COMPILER_FLAGS("-Wall -Wextra -Wno-unused-parameter" CACHE)

code/branches/ggz/src/orxonox/GGZClient.cc

@@ -8 +8 @@
 
     GGZClient::GGZClient()
+        : ggzSocket(io), gameSocket(io)
     {
         assert(singletonRef_s == 0);
         singletonRef_s = this;
+
+        boost::asio::ip::tcp::socket::non_blocking_io non_blocking_io(true);
+        ggzSocket.io_control(non_blocking_io);
+        gameSocket.io_control(non_blocking_io);
 
         active = ggzmod_is_ggz_mode();
@@ -34 +39 @@
     }
 
+    void GGZClient::tick(const float /*dt*/)
+    {
+        boost::system::error_code ec;
+        io.poll(ec);
+        if (ec) {
+            /* TODO: Error */
+        }
+    }
+
     void GGZClient::initGGZ()
     {
@@ -42 +56 @@
             /* TODO: Error */
         }
-        int ggzSocket = ggzmod_get_fd(ggzmod);
-        if (ggzSocket < 0) {
+        int fd = ggzmod_get_fd(ggzmod);
+        if (fd < 0) {
             /* TODO: Error */
         }
-        sockets.add(ggzSocket, &orxonox::GGZClient::handleGGZ);
+        /* TODO: Error */
+        ggzSocket.assign(boost::asio::ip::tcp::v4(), fd);
+        ggzSocket.async_read_some(boost::asio::null_buffers(), handleGGZ);
     }
 
@@ -56 +72 @@
 
     /* Got data from game server */
-    void handleGame(int fd)
+    void handleGame(const boost::system::error_code& /*e*/)
     {
-        /* TODO: read from fd */
+        /* TODO: read from gameSocket */
     }
 
     /* Got data from GGZ */
-    void GGZClient::handleGGZ(int fd)
+    void GGZClient::handleGGZ(const boost::system::error_code& /*e*/)
     {
         ggzmod_dispatch(getInstance().ggzmod);
@@ -72 +88 @@
     {
         ggzmod_set_state(ggzmod, GGZMOD_STATE_PLAYING);
-        int gameSocket = *(int*)data;
-        getInstance().sockets.add(gameSocket, &orxonox::GGZClient::handleGGZ);
+        gameSocket.assign(boost::asio::ip::tcp::v4(), *(int*)data);
+        gameSocket.async_read_some(boost::asio::null_buffers(), handleGame);
     }
 }

code/branches/ggz/src/orxonox/GGZClient.h

@@ -3 +3 @@
 
 #include "OrxonoxPrereqs.h"
-#include "objects/FDWatcher.h"
+#include "objects/Tickable.h"
 
 #include <ggzmod.h>
+#include <boost/asio.hpp>
 
 namespace orxonox
 {
-    class _OrxonoxExport GGZClient
+    class _OrxonoxExport GGZClient : public Tickable
     {
         public:
@@ -16 +17 @@
 
             static GGZClient& getInstance();
+            virtual void tick(const float dt);
 
         private:
@@ -21 +23 @@
 
             bool active;
-            GGZMod *ggzmod;
-            FDWatcher sockets;
+            GGZMod * ggzmod;
+            boost::asio::io_service io;
+            boost::asio::ip::tcp::socket ggzSocket;
+            boost::asio::ip::tcp::socket gameSocket;
 
             void initGGZ();
             void deinitGGZ();
-            static void handleGame(int fd);
-            static void handleGGZ(int fd);
+            void handleGame(const boost::system::error_code& e);
+            void handleGGZ(const boost::system::error_code& e);
             static void handleGGZModServer(GGZMod * ggzmod, GGZModEvent e,
                     const void *data);

code/branches/ggz/src/orxonox/objects/CMakeLists.txt

@@ -3 +3 @@
   EventDispatcher.cc
   EventTarget.cc
-  FDWatcher.cc
   GlobalShader.cc
   Level.cc