Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
emper
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lehrstuhl für Informatik 4 (Systemsoftware)
manycore
emper
Commits
932ded46
Commit
932ded46
authored
3 years ago
by
Florian Schmaus
Browse files
Options
Downloads
Patches
Plain Diff
Optionally build with libc++
parent
6a186f37
No related branches found
Branches containing commit
No related tags found
1 merge request
!307
Optionally build with libc++
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+20
-1
20 additions, 1 deletion
.gitlab-ci.yml
Makefile
+9
-0
9 additions, 0 deletions
Makefile
emper/log/log.cpp
+6
-2
6 additions, 2 deletions
emper/log/log.cpp
with
35 additions
and
3 deletions
.gitlab-ci.yml
+
20
−
1
View file @
932ded46
image
:
"
flowdalic/debian-testing-dev:1.1
7
"
image
:
"
flowdalic/debian-testing-dev:1.1
9
"
before_script
:
before_script
:
-
ulimit -a
-
ulimit -a
...
@@ -97,6 +97,14 @@ clang-tidy:
...
@@ -97,6 +97,14 @@ clang-tidy:
CC
:
clang
CC
:
clang
CXX
:
clang++
CXX
:
clang++
.libc++
:
extends
:
-
.clang
variables
:
EMPER_USE_BUNDLED_DEPS
:
"
always"
EMPER_CPP_ARGS
:
"
-stdlib=libc++"
EMPER_CPP_LINK_ARGS
:
"
-stdlib=libc++"
.emper-ws-scheduling
:
.emper-ws-scheduling
:
variables
:
variables
:
EMPER_DEFAULT_SCHEDULING_STRATEGY
:
"
work_stealing"
EMPER_DEFAULT_SCHEDULING_STRATEGY
:
"
work_stealing"
...
@@ -253,6 +261,17 @@ test-clang-debug:
...
@@ -253,6 +261,17 @@ test-clang-debug:
-
test-clang
-
test-clang
-
.debug-build
-
.debug-build
smoke-test-libc++
:
stage
:
smoke-test
extends
:
-
.fast-variant-check
-
.libc++
test-libc++
:
extends
:
-
.test
-
.libc++
test-worker-no-sleep
:
test-worker-no-sleep
:
extends
:
extends
:
-
.test
-
.test
...
...
This diff is collapsed.
Click to expand it.
Makefile
+
9
−
0
View file @
932ded46
...
@@ -34,6 +34,15 @@ debug:
...
@@ -34,6 +34,15 @@ debug:
rm
-f
build
rm
-f
build
$(
MAKE
)
build
BUILDTYPE
=
$@
$(
MAKE
)
build
BUILDTYPE
=
$@
libc++
:
rm
-f
build
$(
MAKE
)
build
\
CC
=
clang
CXX
=
clang++
\
EMPER_CPP_ARGS
=
"-stdlib=libc++"
\
EMPER_CPP_LINK_ARGS
=
"-stdlib=libc++"
\
EMPER_USE_BUNDLED_DEPS
=
"always"
\
BUILDDIR
=
"build-libc++"
.PHONY
:
fast-static-analysis
.PHONY
:
fast-static-analysis
fast-static-analysis
:
all check-format check-license doc
fast-static-analysis
:
all check-format check-license doc
...
...
This diff is collapsed.
Click to expand it.
emper/log/log.cpp
+
6
−
2
View file @
932ded46
...
@@ -21,11 +21,12 @@
...
@@ -21,11 +21,12 @@
using
emper
::
io
::
GlobalIoContext
;
using
emper
::
io
::
GlobalIoContext
;
static
const
long
NanosInAMinute
=
60L
*
1000
*
1000
*
1000
;
namespace
emper
::
log
{
namespace
emper
::
log
{
static
void
add_timestamp_to
(
std
::
ostringstream
&
logMessage
)
{
static
void
add_timestamp_to
(
std
::
ostringstream
&
logMessage
)
{
#if defined __GLIBCXX__
static
const
long
NanosInAMinute
=
60L
*
1000
*
1000
*
1000
;
auto
now
=
std
::
chrono
::
high_resolution_clock
::
now
();
auto
now
=
std
::
chrono
::
high_resolution_clock
::
now
();
auto
now_time_t
=
std
::
chrono
::
high_resolution_clock
::
to_time_t
(
now
);
auto
now_time_t
=
std
::
chrono
::
high_resolution_clock
::
to_time_t
(
now
);
...
@@ -53,6 +54,9 @@ static void add_timestamp_to(std::ostringstream& logMessage) {
...
@@ -53,6 +54,9 @@ static void add_timestamp_to(std::ostringstream& logMessage) {
long
remaining_nanos
=
time_since_epoch_long
%
NanosInAMinute
;
long
remaining_nanos
=
time_since_epoch_long
%
NanosInAMinute
;
logMessage
<<
remaining_nanos
;
logMessage
<<
remaining_nanos
;
#else
logMessage
<<
"UNKN_TIME"
;
#endif
}
}
static
std
::
mutex
log_mutex
;
static
std
::
mutex
log_mutex
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment