Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
argo
containers
Commits
7852bc27
Commit
7852bc27
authored
Dec 13, 2017
by
Kamil Iskra
Browse files
Fix compiler warnings
parent
e423dadd
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/container_manager.cpp
View file @
7852bc27
...
...
@@ -275,7 +275,7 @@ void Container_manager::create_root_cgroups()
void
Container_manager
::
migrate_service_os
()
{
system
(
"for t in `cat /sys/fs/cgroup/cpuset/tasks`; do /bin/echo $t > /sys/fs/cgroup/cpuset/argo/service_os/tasks; done 2>/dev/null"
);
int
n
=
system
(
"for t in `cat /sys/fs/cgroup/cpuset/tasks`; do /bin/echo $t > /sys/fs/cgroup/cpuset/argo/service_os/tasks; done 2>/dev/null"
);
return
;
vector
<
int
>
sos_tasks
;
retrieve_from_file
<
int
>
(
_cgroup_root
+
"cpuset/tasks"
,
...
...
@@ -375,6 +375,9 @@ void Container_manager::load_existing_containers_as_root()
Container_manager
::~
Container_manager
()
#if __cplusplus >= 201103L
noexcept
(
false
)
#endif
{
std
::
ofstream
ownership_map_file
;
ownership_map_file
.
open
(
OWNERSHIP_MAP
);
...
...
@@ -853,7 +856,7 @@ void Container_manager::reset()
clean_config
(
""
);
/*Temporary ugly brutal hack [JZ] (\_/)*/
system
(
"rmdir /sys/fs/cgroup/cpuset/argo/argo_containers/ && rmdir /sys/fs/cgroup/cpuset/argo/"
);
int
n
=
system
(
"rmdir /sys/fs/cgroup/cpuset/argo/argo_containers/ && rmdir /sys/fs/cgroup/cpuset/argo/"
);
}
void
Container_manager
::
attach_to_container
(
string
command
)
...
...
src/container_manager.hpp
View file @
7852bc27
...
...
@@ -223,7 +223,11 @@ class Container_manager
Container_manager
(
ILogger
*
logger
,
Error_behavior
error_behavior
,
string
cgroup_root
=
DEFAULT_CGROUP_ROOT
);
~
Container_manager
();
~
Container_manager
()
#if __cplusplus >= 201103L
noexcept
(
false
)
#endif
;
inline
const
string
*
const
get_argo_argo_container_root
()
const
{
return
&
_cgroup_root
;}
inline
Error_behavior
get_error_behaviour
()
const
{
return
_error_behavior
;}
...
...
src/syslogger.cpp
View file @
7852bc27
...
...
@@ -39,5 +39,5 @@ void Syslogger::log(Log_type type, const string& message, int errnum)
{
string
msg_out
;
if
(
prepare_log
(
type
,
message
,
msg_out
,
errnum
))
syslog
(
log_type_to_priority
(
type
),
msg_out
.
c_str
());
syslog
(
log_type_to_priority
(
type
),
"%s"
,
msg_out
.
c_str
());
}
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