From 8eea5f56cd95249d829b07738c8713915eaa605e Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Wed, 21 May 2014 19:55:53 +0200
Subject: [PATCH] More refactorings.
---
src/_h5ai/server/php/inc/setup.php | 1 -
src/_h5ai/server/php/inc/util.php | 38 ++++++++++++++++--------------
src/_h5ai/server/php/index.php | 4 ++--
3 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/src/_h5ai/server/php/inc/setup.php b/src/_h5ai/server/php/inc/setup.php
index 8802ea83..b107e758 100644
--- a/src/_h5ai/server/php/inc/setup.php
+++ b/src/_h5ai/server/php/inc/setup.php
@@ -3,7 +3,6 @@
function setup() {
-
// MISC
putenv("LANG=en_US.UTF-8");
setlocale(LC_CTYPE, "en_US.UTF-8");
diff --git a/src/_h5ai/server/php/inc/util.php b/src/_h5ai/server/php/inc/util.php
index 3f90cd8e..a6476715 100644
--- a/src/_h5ai/server/php/inc/util.php
+++ b/src/_h5ai/server/php/inc/util.php
@@ -24,12 +24,10 @@ function has_request_param($key) {
}
-define("NO_DEFAULT", "__NO_DEFAULT_VALUE__");
-
-function use_request_param($key, $default = NO_DEFAULT) {
+function use_request_param($key, $default = null) {
if (!array_key_exists($key, $_REQUEST)) {
- json_fail(101, "parameter '$key' is missing", $default === NO_DEFAULT);
+ json_fail(101, "parameter '$key' is missing", $default === null);
return $default;
}
@@ -51,18 +49,18 @@ function ends_with($sequence, $tail) {
}
-function load_commented_json($file) {
+function load_commented_json($path) {
- if (!file_exists($file)) {
+ if (!file_exists($path)) {
return array();
}
- $str = file_get_contents($file);
+ $content = file_get_contents($path);
// remove comments to get pure json
- $str = preg_replace("/\/\*.*?\*\/|\/\/.*?(\n|$)/s", "", $str);
+ $content = preg_replace("/\/\*.*?\*\/|\/\/.*?(\n|$)/s", "", $content);
- return json_decode($str, true);
+ return json_decode($content, true);
}
@@ -102,18 +100,22 @@ function scr_log($message, $obj = null) {
}
-global $__TIMER_START, $__TIMER_LAST;
+global $__TIMER_START, $__TIMER_PREV;
$__TIMER_START = microtime(true);
-$__TIMER_LAST = $__TIMER_START;
+$__TIMER_PREV = $__TIMER_START;
+
function time_log($message) {
- global $__TIMER_START, $__TIMER_LAST;
+ global $__TIMER_START, $__TIMER_PREV;
+
$now = microtime(true);
- if ($__TIMER_START === $__TIMER_LAST) {
- error_log("-----------------------------");
- function timer_shutdown() { time_log('ex'); }
- register_shutdown_function('timer_shutdown');
+
+ if ($__TIMER_START === $__TIMER_PREV) {
+ error_log("------------------------------");
+ register_shutdown_function(function () { time_log('ex'); });
}
- error_log($message . " DT " . number_format($now - $__TIMER_LAST, 5) . " TT " . number_format($now - $__TIMER_START, 5));
- $__TIMER_LAST = $now;
+
+ error_log($message . " DT " . number_format($now - $__TIMER_PREV, 5) . " TT " . number_format($now - $__TIMER_START, 5));
+
+ $__TIMER_PREV = $now;
}
diff --git a/src/_h5ai/server/php/index.php b/src/_h5ai/server/php/index.php
index 658a1375..098c04f9 100644
--- a/src/_h5ai/server/php/index.php
+++ b/src/_h5ai/server/php/index.php
@@ -25,9 +25,9 @@ time_log(" 1");
$app = new App();
-// time_log(" 2");
+time_log(" 2");
// err_log('setup', $app->get_setup());
-time_log(" 3");
+// time_log(" 3");
if (has_request_param("action")) {