Merge pull request #1182 from vojtechtrefny/master_lvm-json

Switch to JSON-based output parsing for LVM commands

Author: vojtechtrefny

configure.ac

@@ -226,7 +226,8 @@ AS_IF([test "x$with_dm" != "xno" -o "x$with_lvm" != "xno" -o "x$with_lvm_dbus" !
       [])
 
 AS_IF([test "x$with_lvm" != "xno" -o "x$with_lvm_dbus" != "xno"],
-      [LIBBLOCKDEV_PKG_CHECK_MODULES([YAML], [yaml-0.1])],
+      [LIBBLOCKDEV_PKG_CHECK_MODULES([YAML], [yaml-0.1])
+       LIBBLOCKDEV_PKG_CHECK_MODULES([JSON_GLIB], [json-glib-1.0])],
       [])
 
 AS_IF([test "x$with_part" != "xno"],

scripts/boilerplate_generator.py

@@ -198,7 +198,7 @@ def get_loading_func(fn_infos, module_name):
     ret += '    char *error = NULL;\n'
     ret += '    gboolean (*init_fn) (void) = NULL;\n\n'
 
-    ret += '    handle = dlopen(so_name, RTLD_LAZY);\n'
+    ret += '    handle = dlopen(so_name, RTLD_LAZY | RTLD_NODELETE);\n'
     ret += '    if (!handle) {\n'
     ret += '        bd_utils_log_format (BD_UTILS_LOG_WARNING, "failed to load module {0}: %s", dlerror());\n'.format(module_name)
     ret += '        return NULL;\n'

src/plugins/btrfs.c

@@ -150,7 +150,8 @@ gboolean bd_btrfs_init (void) {
  *
  */
 void bd_btrfs_close (void) {
-    /* nothing to do here */
+    g_atomic_int_set (&avail_deps, 0);
+    g_atomic_int_set (&avail_module_deps, 0);
 }
 
 

src/plugins/dm.c

@@ -89,6 +89,7 @@ gboolean bd_dm_init (void) {
 void bd_dm_close (void) {
     dm_log_with_errno_init (NULL);
     dm_log_init_verbose (0);
+    g_atomic_int_set (&avail_deps, 0);
 }
 
 /**

src/plugins/fs.c

@@ -22,6 +22,7 @@
 
 #include <check_deps.h>
 #include "fs.h"
+#include "fs/common.h"
 
 /**
  * SECTION: fs
@@ -72,7 +73,15 @@ gboolean bd_fs_init (void) {
  *
  */
 void bd_fs_close (void) {
-    /* nothing to do here */
+    _fs_ext_reset_avail_deps ();
+    _fs_xfs_reset_avail_deps ();
+    _fs_vfat_reset_avail_deps ();
+    _fs_ntfs_reset_avail_deps ();
+    _fs_exfat_reset_avail_deps ();
+    _fs_btrfs_reset_avail_deps ();
+    _fs_udf_reset_avail_deps ();
+    _fs_f2fs_reset_avail_deps ();
+    _fs_nilfs_reset_avail_deps ();
 }
 
 /**

src/plugins/fs/btrfs.c

@@ -28,6 +28,11 @@
 static volatile guint avail_deps = 0;
 static GMutex deps_check_lock;
 
+G_GNUC_INTERNAL
+void _fs_btrfs_reset_avail_deps (void) {
+    g_atomic_int_set (&avail_deps, 0);
+}
+
 #define DEPS_MKFSBTRFS 0
 #define DEPS_MKFSBTRFS_MASK (1 << DEPS_MKFSBTRFS)
 #define DEPS_BTRFSCK 1

src/plugins/fs/common.h

@@ -11,4 +11,14 @@ gint synced_close (gint fd);
 gboolean get_uuid_label (const gchar *device, gchar **uuid, gchar **label, GError **error);
 gboolean check_uuid (const gchar *uuid, GError **error);
 
+void _fs_ext_reset_avail_deps (void);
+void _fs_xfs_reset_avail_deps (void);
+void _fs_vfat_reset_avail_deps (void);
+void _fs_ntfs_reset_avail_deps (void);
+void _fs_exfat_reset_avail_deps (void);
+void _fs_btrfs_reset_avail_deps (void);
+void _fs_udf_reset_avail_deps (void);
+void _fs_f2fs_reset_avail_deps (void);
+void _fs_nilfs_reset_avail_deps (void);
+
 #endif  /* BD_FS_COMMON */

src/plugins/fs/exfat.c

@@ -27,6 +27,11 @@
 static volatile guint avail_deps = 0;
 static GMutex deps_check_lock;
 
+G_GNUC_INTERNAL
+void _fs_exfat_reset_avail_deps (void) {
+    g_atomic_int_set (&avail_deps, 0);
+}
+
 #define DEPS_MKEXFAT 0
 #define DEPS_MKEXFAT_MASK (1 << DEPS_MKEXFAT)
 #define DEPS_FSCKEXFAT 1

src/plugins/fs/ext.c

@@ -34,6 +34,11 @@
 static volatile guint avail_deps = 0;
 static GMutex deps_check_lock;
 
+G_GNUC_INTERNAL
+void _fs_ext_reset_avail_deps (void) {
+    g_atomic_int_set (&avail_deps, 0);
+}
+
 #define DEPS_MKE2FS 0
 #define DEPS_MKE2FS_MASK (1 << DEPS_MKE2FS)
 #define DEPS_E2FSCK 1

src/plugins/fs/f2fs.c

@@ -28,6 +28,12 @@ static volatile guint avail_deps = 0;
 static volatile guint avail_shrink_deps = 0;
 static GMutex deps_check_lock;
 
+G_GNUC_INTERNAL
+void _fs_f2fs_reset_avail_deps (void) {
+    g_atomic_int_set (&avail_deps, 0);
+    g_atomic_int_set (&avail_shrink_deps, 0);
+}
+
 #define DEPS_MKFSF2FS 0
 #define DEPS_MKFSF2FS_MASK (1 << DEPS_MKFSF2FS)
 #define DEPS_CHECKF2FS 1