posix-timer: Add protobuf message and rename to protobuf/timer.proto

Signed-off-by: Pavel Tikhomirov <snorcht@gmail.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

cr-restore.c

@@ -62,7 +62,7 @@
 
 #include "protobuf.h"
 #include "protobuf/sa.pb-c.h"
-#include "protobuf/itimer.pb-c.h"
+#include "protobuf/timer.pb-c.h"
 #include "protobuf/vma.pb-c.h"
 #include "protobuf/rlimit.pb-c.h"
 #include "protobuf/pagemap.pb-c.h"

cr-show.c

@@ -37,7 +37,7 @@
 #include "protobuf/pipe.pb-c.h"
 #include "protobuf/pipe-data.pb-c.h"
 #include "protobuf/sa.pb-c.h"
-#include "protobuf/itimer.pb-c.h"
+#include "protobuf/timer.pb-c.h"
 #include "protobuf/mm.pb-c.h"
 #include "protobuf/vma.pb-c.h"
 #include "protobuf/creds.pb-c.h"

include/protobuf-desc.h

@@ -13,6 +13,7 @@ enum {
 	PB_VMAS,
 	PB_SIGACT,
 	PB_ITIMERS,
+	PB_POSIX_TIMERS,
 	PB_CREDS,
 	PB_FS,
 	PB_UTSNS,

parasite-syscall.c

@@ -7,7 +7,7 @@
 
 #include "protobuf.h"
 #include "protobuf/sa.pb-c.h"
-#include "protobuf/itimer.pb-c.h"
+#include "protobuf/timer.pb-c.h"
 #include "protobuf/creds.pb-c.h"
 #include "protobuf/core.pb-c.h"
 #include "protobuf/pagemap.pb-c.h"

protobuf-desc.c

@@ -36,7 +36,7 @@
 #include "protobuf/packet-sock.pb-c.h"
 #include "protobuf/sk-packet.pb-c.h"
 #include "protobuf/creds.pb-c.h"
-#include "protobuf/itimer.pb-c.h"
+#include "protobuf/timer.pb-c.h"
 #include "protobuf/utsns.pb-c.h"
 #include "protobuf/ipc-var.pb-c.h"
 #include "protobuf/ipc-shm.pb-c.h"
@@ -109,6 +109,7 @@ void cr_pb_init(void)
 	CR_PB_DESC(INETSK,		InetSk,		inet_sk);
 	CR_PB_DESC(SK_QUEUES,		SkPacket,	sk_packet);
 	CR_PB_DESC(ITIMERS,		Itimer,		itimer);
+	CR_PB_DESC(POSIX_TIMERS,	PosixTimer,	posix_timer);
 	CR_PB_DESC(CREDS,		Creds,		creds);
 	CR_PB_DESC(UTSNS,		Utsns,		utsns);
 	CR_PB_DESC(IPCNS_VAR,		IpcVar,		ipc_var);

protobuf/Makefile

@@ -34,7 +34,7 @@ proto-obj-y	+= sk-packet.o
 proto-obj-y	+= mnt.o
 proto-obj-y	+= pipe-data.o
 proto-obj-y	+= sa.o
-proto-obj-y	+= itimer.o
+proto-obj-y	+= timer.o
 proto-obj-y	+= mm.o
 proto-obj-y	+= sk-opts.o
 proto-obj-y	+= sk-unix.o

protobuf/itimer.proto

-message itimer_entry {
-	required uint64		isec		= 1;
-	required uint64		iusec		= 2;
-	required uint64		vsec		= 3;
-	required uint64		vusec		= 4;
-}

protobuf/timer.proto

+message itimer_entry {
+	required uint64		isec		= 1;
+	required uint64		iusec		= 2;
+	required uint64		vsec		= 3;
+	required uint64		vusec		= 4;
+}
+
+message posix_timer_entry {
+	required uint32 	it_id 		= 1;
+	required uint32		clock_id	= 2;
+	required uint32 	si_signo	= 3;
+	required uint32		it_sigev_notify = 4;
+	required uint64		sival_ptr	= 5;
+	required uint32		overrun		= 6;
+
+	required uint64		isec		= 7;
+	required uint64		insec		= 8;
+	required uint64		vsec		= 9;
+	required uint64		vnsec		= 10;
+}