discover/sysinfo: Add system_info_reinit()

Currently over reinit events the system info is not affected. However
network and block device information can change over reinit, so clear
this information.

Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>

diff --git a/discover/device-handler.c b/discover/device-handler.c
index ec1eee344802a24e3c9f4febdd69d1c6f6fdc6c4..a0c21b71b906e5eea8c3d986a6bb9c4d3f9fc921 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -1407,6 +1407,8 @@ static void device_handler_reinit_sources(struct device_handler *handler)
                return;
        }
 
                return;
        }
 

+       system_info_reinit();
+

        udev_reinit(handler->udev);
 
        network_shutdown(handler->network);
        udev_reinit(handler->udev);
 
        network_shutdown(handler->network);

diff --git a/discover/sysinfo.c b/discover/sysinfo.c
index 0ac29c1ead35adddd7f9a52acbe6c8fbd8f811c5..e8e6d52bce971452ebff7f6d714c2005ccd58715 100644 (file)
--- a/discover/sysinfo.c
+++ b/discover/sysinfo.c
@@ -139,3 +139,21 @@ void system_info_init(struct discover_server *s)
        sysinfo = talloc_zero(server, struct system_info);
        platform_get_sysinfo(sysinfo);
 }
        sysinfo = talloc_zero(server, struct system_info);
        platform_get_sysinfo(sysinfo);
 }

+
+/* Only reset device information. Platform information is static */
+void system_info_reinit(void)
+{
+       unsigned int i;
+
+       for (i = 0; i < sysinfo->n_blockdevs; i++)
+               talloc_free(sysinfo->blockdevs[i]);
+       talloc_free(sysinfo->blockdevs);
+       sysinfo->blockdevs = NULL;
+       sysinfo->n_blockdevs = 0;
+
+       for (i = 0; i < sysinfo->n_interfaces; i++)
+               talloc_free(sysinfo->interfaces[i]);
+       talloc_free(sysinfo->interfaces);
+       sysinfo->interfaces = NULL;
+       sysinfo->n_interfaces = 0;
+}

diff --git a/discover/sysinfo.h b/discover/sysinfo.h
index 19ed95077d247917eceff5875e4d1b751361e74f..c570951db312e3c3385d5d66ce91ff7c9ff165c3 100644 (file)
--- a/discover/sysinfo.h
+++ b/discover/sysinfo.h
@@ -15,6 +15,7 @@ void system_info_register_blockdev(const char *name, const char *uuid,
                const char *mountpoint);
 
 void system_info_init(struct discover_server *server);
                const char *mountpoint);
 
 void system_info_init(struct discover_server *server);

+void system_info_reinit(void);

 
 #endif /* SYSINFO_H */
 
 
 #endif /* SYSINFO_H */