Skip to content
This repository was archived by the owner on Jan 9, 2020. It is now read-only.

Fix some type bugs with latest rust language #52

Open
leonwanghui wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix some type bugs with latest rust language #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ target
Cargo.lock
railcar
.wercker
**/.vscode
2 changes: 1 addition & 1 deletion build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ fn main() {
let mut f = File::open("libseccomp/config.log").unwrap();
let mut result = String::new();
f.read_to_string(&mut result).unwrap();
println!{"{}", &result};
println! {"{}", &result};
std::process::exit(1);
}

Expand Down
42 changes: 21 additions & 21 deletions src/cgroups.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pub fn apply(
continue;
};
// ensure cgroup dir
debug!{"creating cgroup dir {}", &dir};
debug! {"creating cgroup dir {}", &dir};
let chain = || format!("create cgroup dir {} failed", &dir);
create_dir_all(&dir).chain_err(chain)?;
// enter cgroups
Expand All @@ -55,7 +55,7 @@ pub fn remove(cgroups_path: &str) -> Result<()> {
} else {
continue;
};
debug!{"removing cgroup dir {}", &dir};
debug! {"removing cgroup dir {}", &dir};
// remove cgroup dir
let chain = || format!("remove cgroup dir {} failed", &dir);
remove_dir(&dir).chain_err(chain)?;
Expand Down Expand Up @@ -90,7 +90,7 @@ fn try_wrnz<T: ToString + Zero>(
match wrnz(dir, key, value) {
Err(Error(ErrorKind::Io(e), x)) => {
if e.kind() == ::std::io::ErrorKind::PermissionDenied {
warn!{"setting cgroup value {} is not supported", key}
warn! {"setting cgroup value {} is not supported", key}
Ok(())
} else {
Err(Error(ErrorKind::Io(e), x))
Expand All @@ -101,19 +101,19 @@ fn try_wrnz<T: ToString + Zero>(
}

pub fn write_file(dir: &str, file: &str, data: &str) -> Result<()> {
let path = format!{"{}/{}", dir, file};
debug!{"writing {} to {}", data, &path};
let path = format! {"{}/{}", dir, file};
debug! {"writing {} to {}", data, &path};
let mut f = File::create(&path)?;
f.write_all(data.as_bytes())?;
Ok(())
}

pub fn read_file(dir: &str, file: &str) -> Result<(String)> {
let path = format!{"{}/{}", dir, file};
let path = format! {"{}/{}", dir, file};
let mut f = File::open(&path)?;
let mut result = String::new();
f.read_to_string(&mut result)?;
debug!{"read {} from {}", &result, &path};
debug! {"read {} from {}", &result, &path};
Ok(result)
}

Expand All @@ -123,20 +123,20 @@ pub fn path(key: &str, cgroups_path: &str) -> Option<String> {
if mount.is_none() || rel.is_none() {
None
} else if rel.unwrap() == "/" {
Some(format!{"{}{}", &mount.unwrap(), cgroups_path})
Some(format! {"{}{}", &mount.unwrap(), cgroups_path})
} else {
Some(format!{"{}{}{}", &mount.unwrap(), &rel.unwrap(), cgroups_path})
Some(format! {"{}{}{}", &mount.unwrap(), &rel.unwrap(), cgroups_path})
}
}

pub fn get_procs(key: &str, cgroups_path: &str) -> Vec<Pid> {
let mut result = Vec::new();
if let Some(dir) = path(key, cgroups_path) {
let path = format!{"{}/cgroup.procs", dir};
let path = format! {"{}/cgroup.procs", dir};
let f = match File::open(path) {
Ok(f) => f,
Err(e) => {
warn!{"could not cgroup.procs: {}", e};
warn! {"could not cgroup.procs: {}", e};
return result;
}
};
Expand All @@ -162,7 +162,7 @@ lazy_static! {
let f = match File::open("/proc/self/cgroup") {
Ok(f) => f,
Err(e) => {
warn!{"could not load cgroup info: {}", e};
warn! {"could not load cgroup info: {}", e};
return result;
}
};
Expand Down Expand Up @@ -193,7 +193,7 @@ lazy_static! {
let f = match File::open("/proc/self/mountinfo") {
Ok(f) => f,
Err(e) => {
warn!{"could not load mount info: {}", e};
warn! {"could not load mount info: {}", e};
return result;
}
};
Expand Down Expand Up @@ -319,7 +319,7 @@ fn copy_parent(dir: &str, file: &str) -> Result<()> {
let parent = if let Some(o) = dir.rfind('/') {
&dir[..o]
} else {
bail!{"failed to find {} in parent cgroups", file};
bail! {"failed to find {} in parent cgroups", file};
};
match read_file(parent, file) {
Err(Error(ErrorKind::Io(e), _)) => {
Expand Down Expand Up @@ -390,7 +390,7 @@ fn memory_apply(r: &LinuxResources, dir: &str) -> Result<()> {
if s <= 100 {
wrnz(dir, "memory.swappiness", memory.swappiness)?;
} else {
warn!{"memory swappiness invalid, working around bug"};
warn! {"memory swappiness invalid, working around bug"};
}
}
if r.disable_oom_killer {
Expand All @@ -402,7 +402,7 @@ fn memory_apply(r: &LinuxResources, dir: &str) -> Result<()> {

#[inline]
fn rate(d: &LinuxThrottleDevice) -> String {
return format!{"{}:{} {}", d.major, d.minor, d.rate};
return format! {"{}:{} {}", d.major, d.minor, d.rate};
}

fn blkio_apply(r: &LinuxResources, dir: &str) -> Result<()> {
Expand All @@ -415,11 +415,11 @@ fn blkio_apply(r: &LinuxResources, dir: &str) -> Result<()> {
// NOTE: runc writes zero values here. This may be a bug, but
// we are duplicating functionality.
if let Some(w) = d.weight {
let weight = format!{"{}:{} {}", d.major, d.minor, w};
let weight = format! {"{}:{} {}", d.major, d.minor, w};
write_file(dir, "blkio.weight_device", &weight)?;
}
if let Some(w) = d.leaf_weight {
let weight = format!{"{}:{} {}", d.major, d.minor, w};
let weight = format! {"{}:{} {}", d.major, d.minor, w};
write_file(dir, "blkio.leaf_weight_device", &weight)?;
}
}
Expand Down Expand Up @@ -460,7 +460,7 @@ fn net_cls_apply(r: &LinuxResources, dir: &str) -> Result<()> {
fn net_prio_apply(r: &LinuxResources, dir: &str) -> Result<()> {
if let Some(network) = r.network.as_ref() {
for p in &network.priorities {
let prio = format!{"{} {}", p.name, p.priority};
let prio = format! {"{} {}", p.name, p.priority};
write_file(dir, "net_prio.ifpriomap", &prio)?;
}
}
Expand All @@ -469,7 +469,7 @@ fn net_prio_apply(r: &LinuxResources, dir: &str) -> Result<()> {

fn hugetlb_apply(r: &LinuxResources, dir: &str) -> Result<()> {
for h in &r.hugepage_limits {
let key = format!{"hugetlb.{}.limit_in_bytes", h.page_size};
let key = format! {"hugetlb.{}.limit_in_bytes", h.page_size};
write_file(dir, &key, &h.limit.to_string())?;
}
Ok(())
Expand Down Expand Up @@ -500,7 +500,7 @@ fn write_device(d: &LinuxDeviceCgroup, dir: &str) -> Result<()> {
} else {
"*".to_string()
};
let val = format!{"{} {}:{} {}", typ, &major, &minor, &d.access};
let val = format! {"{} {}:{} {}", typ, &major, &minor, &d.access};
write_file(dir, key, &val)
}

Expand Down
46 changes: 25 additions & 21 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,11 +563,11 @@ fn load_console_sockets() -> Result<(RawFd, RawFd)> {
}

fn finish_create(id: &str, dir: &str, matches: &ArgMatches) -> Result<()> {
let spec =
Spec::load(CONFIG).chain_err(|| format!("failed to load {}", CONFIG))?;
let spec = Spec::load(CONFIG)
.chain_err(|| format!("failed to load {}", CONFIG))?;

let rootfs = canonicalize(&spec.root.path)
.chain_err(|| format!{"failed to find root path {}", &spec.root.path})?
.chain_err(|| format! {"failed to find root path {}", &spec.root.path})?
.to_string_lossy()
.into_owned();

Expand Down Expand Up @@ -693,8 +693,8 @@ fn cmd_start(id: &str, state_dir: &str) -> Result<()> {
let dir = instance_dir(id, state_dir);
chdir(&*dir).chain_err(|| format!("instance {} doesn't exist", id))?;

let spec =
Spec::load(CONFIG).chain_err(|| format!("failed to load {}", CONFIG))?;
let spec = Spec::load(CONFIG)
.chain_err(|| format!("failed to load {}", CONFIG))?;

let init_pid = get_init_pid()?;

Expand Down Expand Up @@ -729,7 +729,7 @@ fn cmd_start(id: &str, state_dir: &str) -> Result<()> {
}
let linux = spec.linux.as_ref().unwrap();
let cpath = if linux.cgroups_path == "" {
format!{"/{}", id}
format! {"/{}", id}
} else {
linux.cgroups_path.clone()
};
Expand Down Expand Up @@ -900,7 +900,7 @@ fn cmd_delete(id: &str, state_dir: &str, matches: &ArgMatches) -> Result<()> {
if let Ok(spec) = Spec::load(CONFIG) {
let linux = spec.linux.as_ref().unwrap();
let cpath = if linux.cgroups_path == "" {
format!{"/{}", id}
format! {"/{}", id}
} else {
linux.cgroups_path.clone()
};
Expand Down Expand Up @@ -936,8 +936,8 @@ fn cmd_delete(id: &str, state_dir: &str, matches: &ArgMatches) -> Result<()> {
fn cmd_run(id: &str, matches: &ArgMatches) -> Result<()> {
let bundle = matches.value_of("bundle").unwrap();
chdir(&*bundle).chain_err(|| format!("failed to chdir to {}", bundle))?;
let spec =
Spec::load(CONFIG).chain_err(|| format!("failed to load {}", CONFIG))?;
let spec = Spec::load(CONFIG)
.chain_err(|| format!("failed to load {}", CONFIG))?;

let child_pid = safe_run_container(
id,
Expand Down Expand Up @@ -1002,12 +1002,12 @@ fn execute_hook(hook: &oci::Hook, state: &oci::State) -> Result<()> {
}
// a timeout will cause a failure and child will be killed on exit
if let Some(sig) = wait_for_pipe_sig(rfd, timeout)? {
let msg = format!{"hook exited with signal: {:?}", sig};
let msg = format! {"hook exited with signal: {:?}", sig};
return Err(ErrorKind::InvalidHook(msg).into());
}
let (exit_code, _) = wait_for_child(child)?;
if exit_code != 0 {
let msg = format!{"hook exited with exit code: {}", exit_code};
let msg = format! {"hook exited with exit code: {}", exit_code};
return Err(ErrorKind::InvalidHook(msg).into());
}
}
Expand Down Expand Up @@ -1104,7 +1104,7 @@ fn run_container(
}

let cpath = if linux.cgroups_path == "" {
format!{"/{}", id}
format! {"/{}", id}
} else {
linux.cgroups_path.clone()
};
Expand Down Expand Up @@ -1141,7 +1141,8 @@ fn run_container(
mount_fd = fd;
continue;
}
setns(fd, space).chain_err(|| format!("failed to enter {:?}", space))?;
setns(fd, space)
.chain_err(|| format!("failed to enter {:?}", space))?;
close(fd)?;
if space == CloneFlags::CLONE_NEWUSER {
setid(Uid::from_raw(0), Gid::from_raw(0))
Expand Down Expand Up @@ -1188,7 +1189,8 @@ fn run_container(
}

if cf.contains(CloneFlags::CLONE_NEWNS) {
mounts::pivot_rootfs(&*rootfs).chain_err(|| "failed to pivot rootfs")?;
mounts::pivot_rootfs(&*rootfs)
.chain_err(|| "failed to pivot rootfs")?;

// only set sysctls in newns
for (key, value) in &linux.sysctl {
Expand Down Expand Up @@ -1343,7 +1345,7 @@ fn fork_first(

// set rlimits (before entering user ns)
for rlimit in rlimits.iter() {
setrlimit(rlimit.typ as i32, rlimit.soft, rlimit.hard)?;
setrlimit(rlimit.typ as u32, rlimit.soft, rlimit.hard)?;
}

if userns {
Expand All @@ -1366,11 +1368,13 @@ fn fork_first(
write_mappings(
&format!("/proc/{}/uid_map", child),
&linux.uid_mappings,
).chain_err(|| "failed to write uid mappings")?;
)
.chain_err(|| "failed to write uid mappings")?;
write_mappings(
&format!("/proc/{}/gid_map", child),
&linux.gid_mappings,
).chain_err(|| "failed to write gid mappings")?;
)
.chain_err(|| "failed to write gid mappings")?;
}
// setup cgroups
let schild = child.to_string();
Expand Down Expand Up @@ -1550,7 +1554,7 @@ fn write_mappings(path: &str, maps: &[LinuxIDMapping]) -> Result<()> {
}

fn set_sysctl(key: &str, value: &str) -> Result<()> {
let path = format!{"/proc/sys/{}", key.replace(".", "/")};
let path = format! {"/proc/sys/{}", key.replace(".", "/")};
let fd = match open(&*path, OFlag::O_RDWR, Mode::empty()) {
Err(::nix::Error::Sys(errno)) => {
if errno != Errno::ENOENT {
Expand Down Expand Up @@ -1657,7 +1661,7 @@ fn wait_for_pipe_zero(rfd: RawFd, timeout: i32) -> Result<()> {
return Err(ErrorKind::PipeClosed(msg).into());
}
if result[0] != 0 {
let msg = format!{"got {} from pipe instead of 0", result[0]};
let msg = format! {"got {} from pipe instead of 0", result[0]};
return Err(ErrorKind::InvalidValue(msg).into());
}
Ok(())
Expand Down Expand Up @@ -1768,8 +1772,8 @@ fn set_name(name: &str) -> Result<()> {
Ok(_) => (),
};
unsafe {
let init =
std::ffi::CString::new(name).chain_err(|| "invalid process name")?;
let init = std::ffi::CString::new(name)
.chain_err(|| "invalid process name")?;
let len = std::ffi::CStr::from_ptr(*ARGV).to_bytes().len();
// after fork, ARGV points to the thread's local
// copy of arg0.
Expand Down
Loading