Fixing for windows plattform on multiple classes

Author: florianbecker

source/CMakeLists.txt

@@ -45,5 +45,4 @@ add_library(modern.cpp.core
   Timing.h
   templates/CSVWriter.h
   templates/Timer.h
-  unixservice/main.cpp
 )

source/CPU.cpp

@@ -30,7 +30,6 @@
 
 #ifdef _WIN32
   #include <intrin.h>
-  using unsigned int = unsigned __int32;
 #endif
 
 /* local header */
@@ -58,7 +57,12 @@ namespace VX {
   void CPU::updateNativeId( unsigned int _leaf, unsigned int _subleaf ) {
 
 #ifdef _WIN32
-      __cpuid( m_currentLeaf.data(), _leaf, _subleaf );
+     std::array<int, 4> currentLeaf;
+      __cpuidex( currentLeaf.data(), _leaf, _subleaf );
+      m_currentLeaf[0] = currentLeaf[0];
+      m_currentLeaf[1] = currentLeaf[1];
+      m_currentLeaf[2] = currentLeaf[2];
+      m_currentLeaf[3] = currentLeaf[3];
 #else
       asm volatile
       ( "cpuid" : "=a"( m_currentLeaf[0] ), "=b"( m_currentLeaf[1] ), "=c"( m_currentLeaf[2] ), "=d"( m_currentLeaf[3] )

source/Exec.cpp

@@ -46,13 +46,17 @@ namespace VX {
 
     std::array<char, bufferSize> buffer {};
     std::string result;
+#ifdef _WIN32
+    std::unique_ptr<FILE, decltype( &_pclose )> pipe( _popen( _command.c_str(), "r" ), _pclose );
+#else
     std::unique_ptr<FILE, decltype( &pclose )> pipe( popen( _command.c_str(), "r" ), pclose );
+#endif
     if ( !pipe ) {
 
       std::cout << "popen() failed for " << _command << std::endl;
       return {};
     }
-    while ( fgets( buffer.data(), buffer.size(), pipe.get() ) != nullptr ) {
+    while ( fgets( buffer.data(), static_cast<int>( buffer.size() ), pipe.get() ) != nullptr ) {
 
       result += buffer.data();
     }

source/Serial.cpp

@@ -35,8 +35,12 @@
 
 /* system header */
 #include <fcntl.h> // open
+#ifdef _WIN32
+#include <io.h> // write, read, close
+#else
 #include <termios.h>
 #include <unistd.h> // write, read, close
+#endif
 
 /* stl header */
 #include <chrono>
@@ -57,13 +61,18 @@ namespace VX {
   Serial::Serial( const std::string &_path, Baudrate _baudrate ) {
 
     /* Open port, checking for errors */
+#ifdef _WIN32
+    m_descriptor = _open( _path.c_str(), ( O_RDWR | O_NOCTTY | O_NDELAY ) );
+#else
     m_descriptor = ::open( _path.c_str(), ( O_RDWR | O_NOCTTY | O_NDELAY ) );
+#endif
     if ( m_descriptor == -1 ) {
 
       std::cout << "Unable to open serial port: " << _path << " at baud rate: " << static_cast<int>( _baudrate ) << std::endl;
       return;
     }
 
+    /* TODO: Rework for windows */
     /* Configure i/o baud rate settings */
     struct termios options = {};
     tcgetattr( m_descriptor, &options );
@@ -144,7 +153,11 @@ namespace VX {
 
   bool Serial::write( const std::string &_data ) const {
 
+#ifdef _WIN32
+    int numBytesWritten = _write( m_descriptor, _data.c_str(), _data.size() );
+#else
     ssize_t numBytesWritten = ::write( m_descriptor, _data.c_str(), _data.size() );
+#endif
     if ( numBytesWritten < 0 ) {
 
 #ifdef DEBUG
@@ -158,7 +171,11 @@ namespace VX {
   std::string Serial::read() const {
 
     std::vector<char> buffer( bufferSize );
+#ifdef _WIN32
+    int numBytesRead = _read( m_descriptor, buffer.data(), buffer.size() );
+#else
     ssize_t numBytesRead = ::read( m_descriptor, buffer.data(), buffer.size() );
+#endif
     if ( numBytesRead < 0 ) {
 
 #ifdef DEBUG
@@ -173,7 +190,11 @@ namespace VX {
 
     if ( m_isOpen ) {
 
+#ifdef _WIN32
+      _close( m_descriptor );
+#else
       ::close( m_descriptor );
+#endif
       m_descriptor = -1;
     }
   }