search for: read_line_from

...diff --git a/df/estimate-max-threads.c b/df/estimate-max-threads.c index bbcdd73..7d5b090 100644 --- a/df/estimate-max-threads.c +++ b/df/estimate-max-threads.c @@ -44,7 +44,7 @@ estimate_max_threads (void) /* Choose the number of threads based on the amount of free memory. */ mbytes_str = read_line_from ("LANG=C free -m | " - "grep 'buffers/cache' | awk '{print $NF}'"); + "grep '^Mem' | awk '{print $4+$6+$7}'"); if (mbytes_str == NULL) return 1; -- 1.9.3

...fuse/test-fuse.c | 2 +- p2v/main.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/df/estimate-max-threads.c b/df/estimate-max-threads.c index 7d5b090..ca1fd42 100644 --- a/df/estimate-max-threads.c +++ b/df/estimate-max-threads.c @@ -60,7 +60,7 @@ read_line_from (const char *cmd) { FILE *pp; char *ret = NULL; - size_t allocsize; + size_t allocsize = 0; pp = popen (cmd, "r"); if (pp == NULL) diff --git a/examples/libvirt-auth.c b/examples/libvirt-auth.c index 699dd87..8a5db77 100644 --- a/examples/libvirt-auth.c +++ b/examples/lib...

...n/parallel/estimate-max-threads.c +++ b/common/parallel/estimate-max-threads.c @@ -26,7 +26,7 @@ #include <libintl.h> #include "guestfs.h" -#include "guestfs-internal-frontend.h" +#include "utils.h" #include "estimate-max-threads.h" static char *read_line_from (const char *cmd); diff --git a/common/parallel/parallel.c b/common/parallel/parallel.c index 97b9a3a0c..0e9fadcca 100644 --- a/common/parallel/parallel.c +++ b/common/parallel/parallel.c @@ -47,7 +47,7 @@ #include "getprogname.h" #include "guestfs.h" -#include "guestfs...

...el/estimate-max-threads.c +++ b/common/parallel/estimate-max-threads.c @@ -26,7 +26,7 @@ #include <libintl.h> #include "guestfs.h" -#include "guestfs-internal-frontend.h" +#include "guestfs-utils.h" #include "estimate-max-threads.h" static char *read_line_from (const char *cmd); diff --git a/common/parallel/parallel.c b/common/parallel/parallel.c index 97b9a3a0c..c89bea8b3 100644 --- a/common/parallel/parallel.c +++ b/common/parallel/parallel.c @@ -47,7 +47,7 @@ #include "getprogname.h" #include "guestfs.h" -#include "guestfs...

This is just the utilities part of the patch series from: https://www.redhat.com/archives/libguestfs/2017-June/msg00103.html I believe this addresses everything raised in comments on that patch series. Rich.

This turned out to be rather more involved than I thought. We have lots of utility functions, spread all over the repository, with not a lot of structure. This moves many of them under common/ and structures them so there are clear dependencies. This doesn't complete the job by any means. Other items I had on my to-do list for this change were: - Split up mllib/common_utils into: -

This is a combination of: https://www.redhat.com/archives/libguestfs/2017-June/msg00046.html [PATCH 00/12] Refactor utility functions. plus: https://www.redhat.com/archives/libguestfs/2017-June/msg00023.html [PATCH v3 00/19] Allow APIs to be implemented in OCaml. with the second patches rebased on top of the utility refactoring, and some other adjustments and extensions. This passes

v5: https://www.redhat.com/archives/libguestfs/2017-June/msg00065.html Since v5, this now implements inspection almost completely for Linux and Windows guests. Rich.

v7 was: https://www.redhat.com/archives/libguestfs/2017-June/msg00169.html https://www.redhat.com/archives/libguestfs/2017-June/msg00184.html I believe this addresses all comments received so far. Also it now passes a test where I compared about 100 disk images processed with old and new virt-inspector binaries. The output is identical in all cases except one which is caused by a bug in blkid