From 602a74af5d4d4da82e51cb174c2a37a02a7f34b8 Mon Sep 17 00:00:00 2001 From: Ori Livneh Date: Wed, 23 Sep 2015 01:53:47 -0700 Subject: [PATCH] Compat fix for HHVM on non-Linux OSs RUSAGE_THREAD is not POSIX; it's Linux-specific. HHVM now compiles on OS X, and calling getrusage( 2 ) on OS X explodes with: exception : f_getrusage is not supported: RUSAGE_THREAD is not defined on this sytem [sic] HHVM is being ported to Windows, too, where RUSAGE_THREAD is likewise missing. So check that PHP_OS === 'Linux' before using it. Change-Id: I6eac7d2bb4edfa1e697ae72f89299d0d5ac135f4 --- includes/profiler/ProfilerFunctions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/profiler/ProfilerFunctions.php b/includes/profiler/ProfilerFunctions.php index 6c58453215..50a77ecd9a 100644 --- a/includes/profiler/ProfilerFunctions.php +++ b/includes/profiler/ProfilerFunctions.php @@ -32,7 +32,7 @@ function wfGetRusage() { if ( !function_exists( 'getrusage' ) ) { return false; - } elseif ( defined( 'HHVM_VERSION' ) ) { + } elseif ( defined( 'HHVM_VERSION' ) && PHP_OS === 'Linux' ) { return getrusage( 2 /* RUSAGE_THREAD */ ); } else { return getrusage( 0 /* RUSAGE_SELF */ ); -- 2.20.1