MDL-15273 basic read/write perf counter in moodle_database

diff --git a/admin/cron.php b/admin/cron.php
index 47c8153a1a6418c6ecf8e6dcd28b11574d6d6661..f5f49bb664d418379c68b7e1f2f04fab2566b7af 100644 (file)
--- a/admin/cron.php
+++ b/admin/cron.php
@@ -110,7 +110,7 @@
                 if (function_exists($cron_function)) {
                     mtrace("Processing module function $cron_function ...", '');
                     $pre_dbqueries = null;
-                    $pre_dbqueries = $DB->perf_get_reads();
+                    $pre_dbqueries = $DB->perf_get_queries();
                     $pre_time      = microtime(1);
                     if ($cron_function()) {
                         if (!$DB->set_field("modules", "lastcron", $timenow, array("id"=>$mod->id))) {
@@ -118,7 +118,7 @@
                         }
                     }
                     if (isset($pre_dbqueries)) {
-                        mtrace("... used " . ($DB->perf_get_reads() - $pre_dbqueries) . " dbqueries");
+                        mtrace("... used " . ($DB->perf_get_queries() - $pre_dbqueries) . " dbqueries");
                         mtrace("... used " . (microtime(1) - $pre_time) . " seconds");
                     }
                 /// Reset possible changes by modules to time_limit. MDL-11597
@@ -171,11 +171,11 @@
             $cronfunction = 'report_'.$report.'_cron';
             mtrace('Processing cron function for '.$report.'...', '');
             $pre_dbqueries = null;
-            $pre_dbqueries = $DB->perf_get_reads();
+            $pre_dbqueries = $DB->perf_get_queries();
             $pre_time      = microtime(true);
             $cronfunction();
             if (isset($pre_dbqueries)) {
-                mtrace("... used " . ($DB->perf_get_reads() - $pre_dbqueries) . " dbqueries");
+                mtrace("... used " . ($DB->perf_get_queries() - $pre_dbqueries) . " dbqueries");
                 mtrace("... used " . round(microtime(true) - $pre_time, 2) . " seconds");
             }
             mtrace('done.');

diff --git a/lib/dml/moodle_database.php b/lib/dml/moodle_database.php
index 27f24a74a4cd9d2293abc461227fee0ef321068b..bd195a43bef2dfbb41613842542d37d00c6d632e 100644 (file)
--- a/lib/dml/moodle_database.php
+++ b/lib/dml/moodle_database.php
@@ -1403,6 +1403,7 @@ abstract class moodle_database {
         return true;
     }
 
+/// performance and logging
     /**
      * Returns number of reads done by this database
      * @return int