Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
FORMUS3IC_LAS3
/
embb
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
d2c1f41d
authored
Feb 22, 2016
by
Marcus Winter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed vc11 build problem
parent
a56b5166
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
+11
-11
base_c/include/embb/base/c/log.h
+8
-0
base_cpp/src/log.cc
+0
-8
mtapi_c/src/embb_mtapi_scheduler_t.c
+2
-2
mtapi_c/src/embb_mtapi_task_context_t.c
+1
-1
No files found.
base_c/include/embb/base/c/log.h
View file @
d2c1f41d
...
@@ -28,6 +28,7 @@
...
@@ -28,6 +28,7 @@
#define EMBB_BASE_C_LOG_H_
#define EMBB_BASE_C_LOG_H_
#include <embb/base/c/internal/config.h>
#include <embb/base/c/internal/config.h>
#include <stdarg.h>
/**
/**
* \defgroup C_LOG Logging
* \defgroup C_LOG Logging
...
@@ -197,6 +198,13 @@ void embb_log_error(
...
@@ -197,6 +198,13 @@ void embb_log_error(
\c message */
\c message */
);
);
/* function for internal use only */
void
embb_log_write_internal
(
char
const
*
channel
,
embb_log_level_t
log_level
,
char
const
*
message
,
va_list
argp
);
#ifdef __cplusplus
#ifdef __cplusplus
}
}
#endif
#endif
...
...
base_cpp/src/log.cc
View file @
d2c1f41d
...
@@ -27,14 +27,6 @@
...
@@ -27,14 +27,6 @@
#include <embb/base/log.h>
#include <embb/base/log.h>
#include <embb/base/c/internal/unused.h>
#include <embb/base/c/internal/unused.h>
#include <cstdarg>
extern
"C"
void
embb_log_write_internal
(
char
const
*
channel
,
embb_log_level_t
log_level
,
char
const
*
message
,
va_list
argp
);
namespace
embb
{
namespace
embb
{
namespace
base
{
namespace
base
{
...
...
mtapi_c/src/embb_mtapi_scheduler_t.c
View file @
d2c1f41d
...
@@ -398,7 +398,7 @@ mtapi_boolean_t embb_mtapi_scheduler_wait_for_task(
...
@@ -398,7 +398,7 @@ mtapi_boolean_t embb_mtapi_scheduler_wait_for_task(
node
->
scheduler
);
node
->
scheduler
);
/* now wait and schedule new tasks if we are on a worker */
/* now wait and schedule new tasks if we are on a worker */
mtapi_task_state_t
task_state
=
embb_atomic_load_int
(
&
task
->
state
);
mtapi_task_state_t
task_state
=
(
mtapi_task_state_t
)
embb_atomic_load_int
(
&
task
->
state
);
while
(
while
(
(
MTAPI_TASK_SCHEDULED
==
task_state
)
||
(
MTAPI_TASK_SCHEDULED
==
task_state
)
||
(
MTAPI_TASK_RUNNING
==
task_state
)
||
(
MTAPI_TASK_RUNNING
==
task_state
)
||
...
@@ -418,7 +418,7 @@ mtapi_boolean_t embb_mtapi_scheduler_wait_for_task(
...
@@ -418,7 +418,7 @@ mtapi_boolean_t embb_mtapi_scheduler_wait_for_task(
node
,
node
,
context
);
context
);
task_state
=
embb_atomic_load_int
(
&
task
->
state
);
task_state
=
(
mtapi_task_state_t
)
embb_atomic_load_int
(
&
task
->
state
);
}
}
return
MTAPI_TRUE
;
return
MTAPI_TRUE
;
...
...
mtapi_c/src/embb_mtapi_task_context_t.c
View file @
d2c1f41d
...
@@ -187,7 +187,7 @@ mtapi_task_state_t mtapi_context_taskstate_get(
...
@@ -187,7 +187,7 @@ mtapi_task_state_t mtapi_context_taskstate_get(
&
(
task_context
->
thread_context
->
tss_id
));
&
(
task_context
->
thread_context
->
tss_id
));
if
(
local_context
==
task_context
->
thread_context
)
{
if
(
local_context
==
task_context
->
thread_context
)
{
task_state
=
embb_atomic_load_int
(
&
task_context
->
task
->
state
);
task_state
=
(
mtapi_task_state_t
)
embb_atomic_load_int
(
&
task_context
->
task
->
state
);
local_status
=
MTAPI_SUCCESS
;
local_status
=
MTAPI_SUCCESS
;
}
else
{
}
else
{
local_status
=
MTAPI_ERR_CONTEXT_OUTOFCONTEXT
;
local_status
=
MTAPI_ERR_CONTEXT_OUTOFCONTEXT
;
...
...
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