Skip to content

C
criu
Commit 44624667 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Pavel Emelyanov
Browse files
Options

proto: Align members and numbers 

We're aligning members and number in protobuf
files from the very beginning for readability
sake. So fix up newer ones which were not.

Also use /* */ comments, not //.
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 3835ff83
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 88 deletions
protobuf/creds.proto
View file @ 44624667
message creds_entry {
required uint32 uid = 1;
required uint32 gid = 2;
required uint32 euid = 3;
required uint32 egid = 4;
required uint32 suid = 5;
required uint32 sgid = 6;
required uint32 fsuid = 7;
required uint32 fsgid = 8;
required uint32 uid = 1;
required uint32 gid = 2;
required uint32 euid = 3;
required uint32 egid = 4;
required uint32 suid = 5;
required uint32 sgid = 6;
required uint32 fsuid = 7;
required uint32 fsgid = 8;
repeated uint32 cap_inh = 9;
repeated uint32 cap_prm = 10;
repeated uint32 cap_eff = 11;
repeated uint32 cap_bnd = 12;
repeated uint32 cap_inh = 9;
repeated uint32 cap_prm = 10;
repeated uint32 cap_eff = 11;
repeated uint32 cap_bnd = 12;
required uint32 secbits = 13;
required uint32 secbits = 13;
repeated uint32 groups = 14;
}
protobuf/fdinfo.proto
View file @ 44624667
......@@ -19,8 +19,8 @@ enum fd_types {
}
message fdinfo_entry {
required uint32 id = 1;
required uint32 flags = 2;
required fd_types type = 3;
required uint32 fd = 4;
required uint32 id = 1;
required uint32 flags = 2;
required fd_types type = 3;
required uint32 fd = 4;
}
protobuf/fh.proto
View file @ 44624667
......@@ -12,7 +12,7 @@ message fh_entry {
}
message irmap_cache_entry {
required uint32 dev = 1;
required uint64 inode = 2;
required string path = 3;
required uint32 dev = 1;
required uint64 inode = 2;
required string path = 3;
}
protobuf/inventory.proto
View file @ 44624667
import "core.proto";
message inventory_entry {
required uint32 img_version = 1;
optional bool fdinfo_per_id = 2;
optional task_kobj_ids_entry root_ids = 3;
optional bool ns_per_id = 4;
required uint32 img_version = 1;
optional bool fdinfo_per_id = 2;
optional task_kobj_ids_entry root_ids = 3;
optional bool ns_per_id = 4;
}
protobuf/packet-sock.proto
View file @ 44624667
......@@ -19,14 +19,14 @@ message packet_ring {
}
message packet_sock_entry {
required uint32 id = 1;
required uint32 type = 2;
required uint32 protocol = 3;
required uint32 flags = 4;
required uint32 ifindex = 5;
required uint32 id = 1;
required uint32 type = 2;
required uint32 protocol = 3;
required uint32 flags = 4;
required uint32 ifindex = 5;
required fown_entry fown = 6;
required sk_opts_entry opts = 7;
required fown_entry fown = 6;
required sk_opts_entry opts = 7;
required uint32 version = 8;
required uint32 reserve = 9;
......
protobuf/pagemap.proto
View file @ 44624667
message pagemap_head {
required uint32 pages_id = 1;
required uint32 pages_id = 1;
}
message pagemap_entry {
required uint64 vaddr = 1;
required uint32 nr_pages = 2;
optional bool in_parent = 3;
required uint64 vaddr = 1;
required uint32 nr_pages = 2;
optional bool in_parent = 3;
}
protobuf/rpc.proto
View file @ 44624667
message criu_page_server_info {
optional string address = 1;
optional int32 port = 2;
optional int32 pid = 3;
optional string address = 1;
optional int32 port = 2;
optional int32 pid = 3;
}
message criu_opts {
required int32 images_dir_fd = 1;
optional int32 pid = 2; //if not set on dump, will dump requesting process
required int32 images_dir_fd = 1;
optional int32 pid = 2; /* if not set on dump, will dump requesting process */
optional bool leave_running = 3;
optional bool ext_unix_sk = 4;
optional bool tcp_established = 5;
optional bool evasive_devices = 6;
optional bool shell_job = 7;
optional bool file_locks = 8;
optional int32 log_level = 9 [default = 2];
optional string log_file = 10; // No subdirs are allowed. Consider using work-dir
optional bool leave_running = 3;
optional bool ext_unix_sk = 4;
optional bool tcp_established = 5;
optional bool evasive_devices = 6;
optional bool shell_job = 7;
optional bool file_locks = 8;
optional int32 log_level = 9 [default = 2];
optional string log_file = 10; /* No subdirs are allowed. Consider using work-dir */
optional criu_page_server_info ps = 11;
optional criu_page_server_info ps = 11;
optional bool notify_scripts = 12;
optional bool notify_scripts = 12;
optional string root = 13;
optional string parent_img = 14;
optional bool track_mem = 15;
optional string root = 13;
optional string parent_img = 14;
optional bool track_mem = 15;
optional int32 work_dir_fd = 16;
optional int32 work_dir_fd = 16;
}
message criu_dump_resp {
......@@ -57,10 +57,10 @@ enum criu_req_type {
*/
message criu_req {
required criu_req_type type = 1;
required criu_req_type type = 1;
optional criu_opts opts = 2;
optional bool notify_success = 3;
optional criu_opts opts = 2;
optional bool notify_success = 3;
}
/*
......@@ -69,11 +69,11 @@ message criu_req {
*/
message criu_resp {
required criu_req_type type = 1;
required bool success = 2;
required criu_req_type type = 1;
required bool success = 2;
optional criu_dump_resp dump = 3;
optional criu_restore_resp restore = 4;
optional criu_notify notify = 5;
optional criu_page_server_info ps = 6;
optional criu_dump_resp dump = 3;
optional criu_restore_resp restore = 4;
optional criu_notify notify = 5;
optional criu_page_server_info ps = 6;
}
protobuf/stats.proto
View file @ 44624667
// This one contains statistics about dump/restore process
message dump_stats_entry {
required uint32 freezing_time = 1;
required uint32 frozen_time = 2;
required uint32 memdump_time = 3;
required uint32 memwrite_time = 4;
required uint32 freezing_time = 1;
required uint32 frozen_time = 2;
required uint32 memdump_time = 3;
required uint32 memwrite_time = 4;
required uint64 pages_scanned = 5;
required uint64 pages_skipped_parent = 6;
required uint64 pages_written = 7;
required uint64 pages_scanned = 5;
required uint64 pages_skipped_parent = 6;
required uint64 pages_written = 7;
optional uint32 irmap_resolve = 8;
optional uint32 irmap_resolve = 8;
}
message restore_stats_entry {
required uint64 pages_compared = 1;
required uint64 pages_skipped_cow = 2;
required uint64 pages_compared = 1;
required uint64 pages_skipped_cow = 2;
required uint32 forking_time = 3;
required uint32 restore_time = 4;
required uint32 forking_time = 3;
required uint32 restore_time = 4;
optional uint64 pages_restored = 5;
optional uint64 pages_restored = 5;
}
message stats_entry {
optional dump_stats_entry dump = 1;
optional restore_stats_entry restore = 2;
optional dump_stats_entry dump = 1;
optional restore_stats_entry restore = 2;
}
protobuf/tun.proto
View file @ 44624667
......@@ -7,9 +7,9 @@ message tunfile_entry {
};
message tun_link_entry {
required uint32 flags = 1;
required int32 owner = 2;
required int32 group = 3;
required uint32 vnethdr = 4;
required uint32 sndbuf = 5;
required uint32 flags = 1;
required int32 owner = 2;
required int32 group = 3;
required uint32 vnethdr = 4;
required uint32 sndbuf = 5;
};
protobuf/utsns.proto
View file @ 44624667
message utsns_entry {
required string nodename = 1;
required string domainname = 2;
required string nodename = 1;
required string domainname = 2;
}
protobuf/vma.proto
View file @ 44624667
......@@ -6,9 +6,11 @@ message vma_entry {
required uint32 prot = 5;
required uint32 flags = 6;
required uint32 status = 7;
// This fd thing is unused in the image, it was lost
// while switching from execve restore model. It is
// -1 by default.
/*
* This fd thing is unused in the image, it was lost
* while switching from execve restore model. It is
* -1 by default.
*/
required sint64 fd = 8;
/* madvise flags bitmap */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment