[i-g-t,2/2] Revert "lib/igt_aux: Make procps optional"

Commit Message

Arkadiusz Hiler Sept. 13, 2017, 10:43 a.m. UTC

This reverts commit d7d3f4e87b827152f00bdf89a67871736672b492
and gets rid of the config option from the meson.build.

It was needed only for the Android support.

Signed-off-by: Arkadiusz Hiler <[e-mail]>
---
 configure.ac  |  6 +-----
 lib/igt_aux.c | 35 +++--------------------------------
 meson.build   |  5 +----
 3 files changed, 5 insertions(+), 41 deletions(-)

Patch

diff --git a/configure.ac b/configure.ac
index c78f5194..2dc03eb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,11 +123,7 @@  AC_SUBST(ASSEMBLER_WARN_CFLAGS)
 PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.82])
 PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
 PKG_CHECK_MODULES(KMOD, [libkmod])
-PKG_CHECK_MODULES(PROCPS, [libprocps], [procps=yes], [procps=no])
-AM_CONDITIONAL(HAVE_PROCPS, [test "x$procps" = xyes])
-if test x"$procps" = xyes; then
-	AC_DEFINE(HAVE_PROCPS,1,[Enable process managment without shelling out])
-fi
+PKG_CHECK_MODULES(PROCPS, [libprocps])
 PKG_CHECK_MODULES(VALGRIND, [valgrind], [have_valgrind=yes], [have_valgrind=no])
 
 if test x$have_valgrind = xyes; then
diff --git a/lib/igt_aux.c b/lib/igt_aux.c
index 295e435c..76b2e52a 100644
--- a/lib/igt_aux.c
+++ b/lib/igt_aux.c
@@ -48,7 +48,9 @@ 
 #include <sys/utsname.h>
 #include <termios.h>
 #include <assert.h>
-#include <linux/limits.h>
+
+#include <proc/readproc.h>
+
 #include "drmtest.h"
 #include "i915_drm.h"
 #include "intel_chipset.h"
@@ -68,10 +70,6 @@ 
 #include <libgen.h>   /* for dirname() */
 #endif
 
-#ifdef HAVE_PROCPS
-#include <proc/readproc.h>
-#endif
-
 /**
  * SECTION:igt_aux
  * @short_description: Auxiliary libraries and support functions
@@ -1242,7 +1240,6 @@  void igt_set_module_param_int(const char *name, int val)
  * This function sends the signal @sig for a process found in process table
  * with name @comm.
  */
-#ifdef HAVE_PROCPS
 int igt_terminate_process(int sig, const char *comm)
 {
 	PROCTAB *proc;
@@ -1267,19 +1264,7 @@  int igt_terminate_process(int sig, const char *comm)
 	closeproc(proc);
 	return err;
 }
-#else
-#warning "No procps, using naive implementation of igt_terminate_process"
 
-int igt_terminate_process(int sig, const char *comm)
-{
-	char pkill_cmd[NAME_MAX];
-
-	snprintf(pkill_cmd, sizeof(pkill_cmd), "pkill -x -%d %s", sig, comm);
-	return system(pkill_cmd);
-}
-#endif
-
-#ifdef HAVE_PROCPS
 struct pinfo {
 	pid_t pid;
 	const char *comm;
@@ -1461,7 +1446,6 @@  __igt_lsof(const char *dir)
 
 	closeproc(proc);
 }
-#endif
 
 /**
  * igt_lsof: Lists information about files opened by processes.
@@ -1470,7 +1454,6 @@  __igt_lsof(const char *dir)
  * This function mimics (a restrictive form of) lsof(8), but also shows
  * information about opened fds.
  */
-#ifdef HAVE_PROCPS
 void
 igt_lsof(const char *dpath)
 {
@@ -1495,18 +1478,6 @@  igt_lsof(const char *dpath)
 
 	free(sanitized);
 }
-#else
-#warning "No procps, using naive implementation of igt_lsof"
-
-void
-igt_lsof(const char *dpath)
-{
-	char lsof_cmd[NAME_MAX];
-
-	snprintf(lsof_cmd, sizeof(lsof_cmd), "lsof +d %s", dpath);
-	system(lsof_cmd);
-}
-#endif
 
 static struct igt_siglatency {
 	timer_t timer;
diff --git a/meson.build b/meson.build
index 0858354f..8f077602 100644
--- a/meson.build
+++ b/meson.build
@@ -38,10 +38,7 @@  libdrm_amdgpu = dependency('libdrm_amdgpu', required : false)
 
 pciaccess = dependency('pciaccess', version : '>=0.10')
 libkmod = dependency('libkmod')
-libprocps = dependency('libprocps', required : false)
-if libprocps.found()
-	config_h.set('HAVE_PROCPS', 1)
-endif
+libprocps = dependency('libprocps', required : true)
 
 valgrind = dependency('valgrind', required : false)
 if valgrind.found()