[CRIU] [PATCH] p.haul: use pycriu module

[Ruslan Kuprieiev]

Hi!

What about this one?
It is simple, yet quite useful.

Thanks.

On 01/14/2015 08:12 PM, Ruslan Kuprieiev wrote:
> We have pycriu package merged, so lets use rpc
> and stats modules from it, instead of generating
> them manually.
> It also allows us to delete Makefile and just use
> a soft link to pycriu directory.
>
> Signed-off-by: Ruslan Kuprieiev <kupruser at gmail.com>
> ---
>   Makefile          | 9 ---------
>   criu_api.py       | 4 ++--
>   p_haul_iters.py   | 2 +-
>   p_haul_service.py | 2 +-
>   pycriu            | 1 +
>   rpc.proto         | 1 -
>   stats.proto       | 1 -
>   7 files changed, 5 insertions(+), 15 deletions(-)
>   delete mode 100644 Makefile
>   create mode 120000 pycriu
>   delete mode 120000 rpc.proto
>   delete mode 120000 stats.proto
>
> diff --git a/Makefile b/Makefile
> deleted file mode 100644
> index 6f7bde5..0000000
> --- a/Makefile
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -all: rpc_pb2.py stats_pb2.py
> -
> -.PHONY: all
> -
> -rpc_pb2.py: rpc.proto
> -	protoc --proto_path=. --python_out=. rpc.proto
> -
> -stats_pb2.py: stats.proto
> -	protoc --proto_path=. --python_out=. stats.proto
> diff --git a/criu_api.py b/criu_api.py
> index 146088a..a2f70b7 100644
> --- a/criu_api.py
> +++ b/criu_api.py
> @@ -8,8 +8,8 @@ import struct
>   import os
>   import util
>   import subprocess
> -import rpc_pb2 as cr_rpc
> -import stats_pb2 as crs
> +import pycriu.rpc as cr_rpc
> +import pycriu.images.stats_pb2 as crs
>   
>   criu_binary = "criu"
>   
> diff --git a/p_haul_iters.py b/p_haul_iters.py
> index 9781212..7a898da 100644
> --- a/p_haul_iters.py
> +++ b/p_haul_iters.py
> @@ -5,7 +5,7 @@
>   import images
>   import mstats
>   import xem_rpc
> -import rpc_pb2 as cr_rpc
> +import pycriu.rpc as cr_rpc
>   import criu_api
>   import p_haul_type
>   
> diff --git a/p_haul_service.py b/p_haul_service.py
> index 5587bd7..d3e19ff 100644
> --- a/p_haul_service.py
> +++ b/p_haul_service.py
> @@ -3,7 +3,7 @@
>   #
>   
>   import xem_rpc
> -import rpc_pb2 as cr_rpc
> +import pycriu.rpc as cr_rpc
>   import images
>   import criu_api
>   import p_haul_type
> diff --git a/pycriu b/pycriu
> new file mode 120000
> index 0000000..dc4a8ef
> --- /dev/null
> +++ b/pycriu
> @@ -0,0 +1 @@
> +../criu/pycriu
> \ No newline at end of file
> diff --git a/rpc.proto b/rpc.proto
> deleted file mode 120000
> index 2917b3b..0000000
> --- a/rpc.proto
> +++ /dev/null
> @@ -1 +0,0 @@
> -../criu/protobuf/rpc.proto
> \ No newline at end of file
> diff --git a/stats.proto b/stats.proto
> deleted file mode 120000
> index 08020dc..0000000
> --- a/stats.proto
> +++ /dev/null
> @@ -1 +0,0 @@
> -../criu/protobuf/stats.proto
> \ No newline at end of file