[CRIU] [PATCH 2/2] plugin: Rework plugins API

Cyrill Gorcunov gorcunov at openvz.org
Wed Aug 13 10:54:30 PDT 2014


Here we define new api to be used in plugins.

 - Plugin should provide a descriptor with help of
   CR_PLUGIN_REGISTER macro, or in case if plugin require
   no init/exit functions -- with CR_PLUGIN_REGISTER_DUMMY.

 - Plugin should define a plugin hook with help of
   CR_PLUGIN_REGISTER_HOOK macro.

 - Now init/exit functions of plugins takes @stage
   argument which tells plugin which stage of criu
   it's been called on dump/restore. For exit it
   also takes @ret which allows plugin to know if
   something went wrong and it needs to cleanup
   own resources.

The idea behind is to not limit plugins authors with names
of functions they might need to use for particular hook.

Such new API deprecates olds plugins structure but to keep
backward compatibility we will provide a tiny layer of
additional code to support old plugins for at least a couple
of release cycles.

For example a trivial plugin might look like

 | #include <sys/types.h>
 | #include <sys/stat.h>
 | #include <fcntl.h>
 | #include <libgen.h>
 | #include <errno.h>
 |
 | #include <sys/socket.h>
 | #include <linux/un.h>
 |
 | #include <stdio.h>
 | #include <stdlib.h>
 | #include <string.h>
 | #include <unistd.h>
 |
 | #include "criu-plugin.h"
 | #include "criu-log.h"
 |
 | static int dump_ext_file(int fd, int id)
 | {
 |	pr_info("dump_ext_file: fd %d id %d\n", fd, id);
 |	return 0;
 | }
 |
 | CR_PLUGIN_REGISTER_DUMMY("trivial")
 | CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__DUMP_EXT_FILE, dump_ext_file)

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 cr-dump.c             |   4 +-
 cr-restore.c          |   4 +-
 files-ext.c           |   4 +-
 include/criu-plugin.h | 102 +++++++++++++++++--
 include/plugin.h      |  50 +++++++---
 mount.c               |   4 +-
 net.c                 |   2 +-
 plugin.c              | 271 +++++++++++++++++++++++++-------------------------
 sk-unix.c             |   4 +-
 9 files changed, 279 insertions(+), 166 deletions(-)

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-plugin-Rework-plugins-API.patch
Type: text/x-patch
Size: 18145 bytes
Desc: not available
URL: <http://lists.openvz.org/pipermail/criu/attachments/20140813/0f283983/attachment-0001.bin>


More information about the CRIU mailing list