Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
60f254eb
Commit
60f254eb
authored
Oct 14, 2016
by
Eric Pederson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Port to Cygwin
parent
b83765b5
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
22 additions
and
8 deletions
+22
-8
.gitignore
.gitignore
+1
-0
CMakeLists.txt
CMakeLists.txt
+4
-2
libcaf_core/CMakeLists.txt
libcaf_core/CMakeLists.txt
+3
-1
libcaf_core/caf/config.hpp
libcaf_core/caf/config.hpp
+3
-1
libcaf_core/caf/scheduler/profiled_coordinator.hpp
libcaf_core/caf/scheduler/profiled_coordinator.hpp
+5
-0
libcaf_core/src/get_mac_addresses.cpp
libcaf_core/src/get_mac_addresses.cpp
+1
-1
libcaf_core/src/get_root_uuid.cpp
libcaf_core/src/get_root_uuid.cpp
+1
-1
libcaf_io/CMakeLists.txt
libcaf_io/CMakeLists.txt
+3
-1
libcaf_io/src/default_multiplexer.cpp
libcaf_io/src/default_multiplexer.cpp
+1
-1
No files found.
.gitignore
View file @
60f254eb
...
@@ -11,6 +11,7 @@ lib/*
...
@@ -11,6 +11,7 @@ lib/*
manual
manual
*.swp
*.swp
bii/*
bii/*
.idea/
libcaf_core/caf/detail/build_config.hpp
libcaf_core/caf/detail/build_config.hpp
.ycm_extra_conf.pyc
.ycm_extra_conf.pyc
blog_release_note.md
blog_release_note.md
...
...
CMakeLists.txt
View file @
60f254eb
cmake_minimum_required
(
VERSION 2.8
)
cmake_minimum_required
(
VERSION 2.8
.4
)
project
(
caf C CXX
)
project
(
caf C CXX
)
# be nice to vim users
# be nice to vim users
...
@@ -266,7 +266,7 @@ endif(CAF_ENABLE_ADDRESS_SANITIZER)
...
@@ -266,7 +266,7 @@ endif(CAF_ENABLE_ADDRESS_SANITIZER)
if
(
NOT APPLE AND NOT WIN32
)
if
(
NOT APPLE AND NOT WIN32
)
set
(
EXTRA_FLAGS
"
${
EXTRA_FLAGS
}
-pthread"
)
set
(
EXTRA_FLAGS
"
${
EXTRA_FLAGS
}
-pthread"
)
endif
()
endif
()
# -fPIC generates warnings on MinGW plus extra setup steps needed on MinGW
# -fPIC generates warnings on MinGW
and Cygwin
plus extra setup steps needed on MinGW
if
(
MINGW
)
if
(
MINGW
)
add_definitions
(
-D_WIN32_WINNT=0x0600
)
add_definitions
(
-D_WIN32_WINNT=0x0600
)
add_definitions
(
-DWIN32
)
add_definitions
(
-DWIN32
)
...
@@ -274,6 +274,8 @@ if(MINGW)
...
@@ -274,6 +274,8 @@ if(MINGW)
set
(
LD_FLAGS
"ws2_32 -liphlpapi"
)
set
(
LD_FLAGS
"ws2_32 -liphlpapi"
)
# build static to avoid runtime dependencies to GCC libraries
# build static to avoid runtime dependencies to GCC libraries
set
(
EXTRA_FLAGS
"
${
EXTRA_FLAGS
}
-static"
)
set
(
EXTRA_FLAGS
"
${
EXTRA_FLAGS
}
-static"
)
elseif
(
CYGWIN
)
set
(
EXTRA_FLAGS
"
${
EXTRA_FLAGS
}
-U__STRICT_ANSI__"
)
else
()
else
()
set
(
EXTRA_FLAGS
"
${
EXTRA_FLAGS
}
-fPIC"
)
set
(
EXTRA_FLAGS
"
${
EXTRA_FLAGS
}
-fPIC"
)
endif
()
endif
()
...
...
libcaf_core/CMakeLists.txt
View file @
60f254eb
...
@@ -106,7 +106,9 @@ if (NOT CAF_BUILD_STATIC_ONLY)
...
@@ -106,7 +106,9 @@ if (NOT CAF_BUILD_STATIC_ONLY)
SOVERSION
${
CAF_VERSION
}
SOVERSION
${
CAF_VERSION
}
VERSION
${
CAF_VERSION
}
VERSION
${
CAF_VERSION
}
OUTPUT_NAME caf_core
)
OUTPUT_NAME caf_core
)
if
(
NOT WIN32
)
if
(
CYGWIN
)
install
(
TARGETS libcaf_core_shared RUNTIME DESTINATION bin
)
elseif
(
NOT WIN32
)
install
(
TARGETS libcaf_core_shared LIBRARY DESTINATION lib
)
install
(
TARGETS libcaf_core_shared LIBRARY DESTINATION lib
)
endif
()
endif
()
add_dependencies
(
libcaf_core_shared libcaf_core
)
add_dependencies
(
libcaf_core_shared libcaf_core
)
...
...
libcaf_core/caf/config.hpp
View file @
60f254eb
...
@@ -170,12 +170,14 @@
...
@@ -170,12 +170,14 @@
# endif
# endif
#elif defined(__FreeBSD__)
#elif defined(__FreeBSD__)
# define CAF_BSD
# define CAF_BSD
#elif defined(__CYGWIN__)
# define CAF_CYGWIN
#elif defined(WIN32) || defined(_WIN32)
#elif defined(WIN32) || defined(_WIN32)
# define CAF_WINDOWS
# define CAF_WINDOWS
#else
#else
# error Platform and/or compiler not supportet
# error Platform and/or compiler not supportet
#endif
#endif
#if defined(CAF_MACOS) || defined(CAF_LINUX) || defined(CAF_BSD)
#if defined(CAF_MACOS) || defined(CAF_LINUX) || defined(CAF_BSD)
|| defined(CAF_CYGWIN)
# define CAF_POSIX
# define CAF_POSIX
#endif
#endif
...
...
libcaf_core/caf/scheduler/profiled_coordinator.hpp
View file @
60f254eb
...
@@ -110,6 +110,11 @@ public:
...
@@ -110,6 +110,11 @@ public:
m
.
mem
=
pmc
.
PeakWorkingSetSize
/
1024
;
m
.
mem
=
pmc
.
PeakWorkingSetSize
/
1024
;
m
.
usr
=
to_usec
(
user_time
);
m
.
usr
=
to_usec
(
user_time
);
m
.
sys
=
to_usec
(
kernel_time
);
m
.
sys
=
to_usec
(
kernel_time
);
# elif defined(CAF_CYGWIN)
// TODO - decide what to do here instead of zeros
m
.
usr
=
usec
::
zero
();
m
.
sys
=
usec
::
zero
();
m
.
mem
=
0
;
# else
# else
::
rusage
ru
;
::
rusage
ru
;
::
getrusage
(
RUSAGE_THREAD
,
&
ru
);
::
getrusage
(
RUSAGE_THREAD
,
&
ru
);
...
...
libcaf_core/src/get_mac_addresses.cpp
View file @
60f254eb
...
@@ -76,7 +76,7 @@ std::vector<iface_info> get_mac_addresses() {
...
@@ -76,7 +76,7 @@ std::vector<iface_info> get_mac_addresses() {
}
// namespace detail
}
// namespace detail
}
// namespace caf
}
// namespace caf
#elif defined(CAF_LINUX) || defined(CAF_ANDROID)
#elif defined(CAF_LINUX) || defined(CAF_ANDROID)
|| defined(CAF_CYGWIN)
#include <vector>
#include <vector>
#include <string>
#include <string>
...
...
libcaf_core/src/get_root_uuid.cpp
View file @
60f254eb
...
@@ -61,7 +61,7 @@ std::string get_root_uuid() {
...
@@ -61,7 +61,7 @@ std::string get_root_uuid() {
}
// namespace detail
}
// namespace detail
}
// namespace caf
}
// namespace caf
#elif defined(CAF_LINUX) || defined(CAF_BSD)
#elif defined(CAF_LINUX) || defined(CAF_BSD)
|| defined(CAF_CYGWIN)
#include <vector>
#include <vector>
#include <string>
#include <string>
...
...
libcaf_io/CMakeLists.txt
View file @
60f254eb
...
@@ -39,7 +39,9 @@ if (NOT CAF_BUILD_STATIC_ONLY)
...
@@ -39,7 +39,9 @@ if (NOT CAF_BUILD_STATIC_ONLY)
SOVERSION
${
CAF_VERSION
}
SOVERSION
${
CAF_VERSION
}
VERSION
${
CAF_VERSION
}
VERSION
${
CAF_VERSION
}
OUTPUT_NAME caf_io
)
OUTPUT_NAME caf_io
)
if
(
NOT WIN32
)
if
(
CYGWIN
)
install
(
TARGETS libcaf_io_shared RUNTIME DESTINATION bin
)
elseif
(
NOT WIN32
)
install
(
TARGETS libcaf_io_shared LIBRARY DESTINATION lib
)
install
(
TARGETS libcaf_io_shared LIBRARY DESTINATION lib
)
endif
()
endif
()
add_dependencies
(
libcaf_io_shared libcaf_io
)
add_dependencies
(
libcaf_io_shared libcaf_io
)
...
...
libcaf_io/src/default_multiplexer.cpp
View file @
60f254eb
...
@@ -135,7 +135,7 @@ expected<uint16_t> remote_port_of_fd(native_socket fd);
...
@@ -135,7 +135,7 @@ expected<uint16_t> remote_port_of_fd(native_socket fd);
}
}
expected
<
void
>
allow_sigpipe
(
native_socket
fd
,
bool
new_value
)
{
expected
<
void
>
allow_sigpipe
(
native_socket
fd
,
bool
new_value
)
{
# if
ndef CAF_LINUX
# if
!defined(CAF_LINUX) && !defined(CAF_CYGWIN)
int
value
=
new_value
?
0
:
1
;
int
value
=
new_value
?
0
:
1
;
CALL_CFUN
(
res
,
cc_zero
,
"setsockopt"
,
CALL_CFUN
(
res
,
cc_zero
,
"setsockopt"
,
setsockopt
(
fd
,
SOL_SOCKET
,
SO_NOSIGPIPE
,
&
value
,
setsockopt
(
fd
,
SOL_SOCKET
,
SO_NOSIGPIPE
,
&
value
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment