Falling back to select when target OS(NT < 6.0) not support poll

Author: halx99

examples/lua/main.cpp

@@ -43,12 +43,20 @@ int main(int argc, char** argv)
 
   std::string new_package_path = s["package"]["path"];
 
-  sol::function function = s.script_file("scripts/example.lua");
-
-  do
+  try
+  {
+    sol::table module_example   = s.load_file("scripts/example.lua").call();
+    sol::function update_func = module_example["update"];
+    do
+    {
+      std::this_thread::sleep_for(std::chrono::milliseconds(16));
+    } while (!update_func(50.0 / 1000));
+  }
+  catch (const sol::error& e)
   {
-    std::this_thread::sleep_for(std::chrono::milliseconds(16));
-  } while (!function.call(50.0 / 1000));
+    std::cerr << "Error: " << e.what() << std::endl;
+    return -1;
+  }
 #else
   kaguya::State s;
   s.openlibs();
@@ -65,11 +73,12 @@ int main(int argc, char** argv)
   s["package"]["path"] = package_path;
 
   auto function = s.loadfile("scripts/example.lua");
-  auto update   = function();
+  auto module_example   = function();
+  auto update_func = module_example["update"];
   do
   {
     std::this_thread::sleep_for(std::chrono::milliseconds(50));
-  } while (!update(50.0 / 1000));
+  } while (!update_func(50.0 / 1000));
 #endif
   return 0;
 }

yasio/bindings/lyasio.cpp

@@ -795,7 +795,7 @@ end
 
   char version[32];
   snprintf(version, sizeof(version), "%x.%x.%x", (YASIO_VERSION_NUM >> 16) & 0xff, (YASIO_VERSION_NUM >> 8) & 0xff, YASIO_VERSION_NUM & 0xff);
-  YASIO_EXPORT_ANY(version);
+  yasio_lib["version"] = std::string(version);
 
   return yasio_lib.push(); /* return 'yasio' table */
 }

yasio/compiler/feature_test.hpp

@@ -121,6 +121,13 @@ SOFTWARE.
 
 /// Tests multiplex io model of current OS
 
+// poll
+#if !defined(_WIN32) || NTDDI_VERSION >= NTDDI_VISTA
+#  define YASIO__HAS_POLL 1
+#else
+#  define YASIO__HAS_POLL 0
+#endif
+
 // ppoll
 #if defined(__linux__) && !defined(__ANDROID__) || (defined(__ANDROID_API__) && __ANDROID_API__ >= 21)
 #  define YASIO__HAS_PPOLL 1

yasio/io_watcher.hpp

@@ -17,7 +17,12 @@
 #elif YASIO__HAS_EVPORT && defined(YASIO_ENABLE_HPERF_IO)
 #  include "yasio/impl/evport_io_watcher.hpp"
 #elif !defined(YASIO_DISABLE_POLL)
-#  include "yasio/impl/poll_io_watcher.hpp"
+#  if YASIO__HAS_POLL
+#    include "yasio/impl/poll_io_watcher.hpp"
+#  else
+#    pragma message("Falling back to select_io_watcher due to target OS(NT < 6.0) not support poll")
+#    include "yasio/impl/select_io_watcher.hpp"
+#  endif
 #else
 #  include "yasio/impl/select_io_watcher.hpp"
 #endif
@@ -33,7 +38,7 @@ using io_watcher = kqueue_io_watcher;
 using io_watcher = epoll_io_watcher;
 #elif defined(YASIO__EVPORT_IO_WATCHER_HPP)
 using io_watcher = evport_io_watcher;
-#elif !defined(YASIO_DISABLE_POLL)
+#elif !defined(YASIO_DISABLE_POLL) && YASIO__HAS_POLL
 using io_watcher = poll_io_watcher;
 #else
 using io_watcher = select_io_watcher;