diff --git a/core/includes/batch.inc b/core/includes/batch.inc index ff0b4cb..86dd0d9 100644 --- a/core/includes/batch.inc +++ b/core/includes/batch.inc @@ -71,6 +71,7 @@ function _batch_page() { } $op = isset($_REQUEST['op']) ? $_REQUEST['op'] : ''; +watchdog('debug', microtime(TRUE) . " JS calls /batch: _batch_page(), op=$op"); $output = NULL; switch ($op) { case 'start': @@ -104,6 +105,7 @@ function _batch_page() { * @see _batch_process() */ function _batch_do() { +watchdog('debug', microtime(TRUE) . ' _batch_do()'); // Perform actual processing. list($percentage, $message) = _batch_process(); @@ -116,6 +118,7 @@ function _batch_do() { * @see _batch_process() */ function _batch_progress_page() { +watchdog('debug', microtime(TRUE) . ' _batch_progress_page()'); $batch = &batch_get(); $current_set = _batch_current_set(); @@ -200,6 +203,7 @@ function _batch_progress_page() { * An array containing a completion value (in percent) and a status message. */ function _batch_process() { +watchdog('debug', microtime(TRUE) . ' _batch_process()'); $batch = &batch_get(); $current_set = &_batch_current_set(); // Indicate that this batch set needs to be initialized. diff --git a/core/modules/locale/locale.batch.inc b/core/modules/locale/locale.batch.inc index 8d87e48..de697c2 100644 --- a/core/modules/locale/locale.batch.inc +++ b/core/modules/locale/locale.batch.inc @@ -29,6 +29,7 @@ * @see locale_translation_batch_status_compare() */ function locale_translation_batch_status_fetch_remote($source, &$context) { +watchdog('debug', microtime(TRUE) . ' locale_translation_batch_status_fetch_remote()'); $t = get_t(); // Check the translation file at the remote server and update the source // data with the remote status. @@ -75,6 +76,7 @@ function locale_translation_batch_status_fetch_remote($source, &$context) { * @see locale_translation_batch_status_compare() */ function locale_translation_batch_status_fetch_local($sources, &$context) { +watchdog('debug', microtime(TRUE) . ' locale_translation_batch_status_fetch_local()'); $t = get_t(); // Get the status of local translation files and store the result data in the // batch results for later processing. @@ -170,6 +172,7 @@ function locale_translation_batch_status_compare(&$context) { * Batch results. */ function locale_translation_batch_status_finished($success, $results) { +watchdog('debug', microtime(TRUE) . ' locale_translation_batch_status_finished()'); $t = get_t(); if ($success) { if (isset($results['failed_files'])) { @@ -213,6 +216,7 @@ function locale_translation_batch_status_finished($success, $results) { * @see locale_translation_batch_status_compare() */ function locale_translation_batch_fetch_sources($projects, $langcodes, &$context) { +watchdog('debug', microtime(TRUE) . ' locale_translation_batch_status_finished()'); $context['results']['input'] = locale_translation_load_sources($projects, $langcodes); // If this batch operation is preceded by the status check operations, the @@ -243,6 +247,7 @@ function locale_translation_batch_fetch_sources($projects, $langcodes, &$context * @see locale_translation_batch_status_compare() */ function locale_translation_batch_fetch_download($project, $langcode, &$context) { +watchdog('debug', microtime(TRUE) . ' locale_translation_batch_status_finished()'); $sources = $context['results']['input']; if (isset($sources[$project . ':' . $langcode])) { $source = $sources[$project . ':' . $langcode]; @@ -286,6 +291,7 @@ function locale_translation_batch_fetch_download($project, $langcode, &$context) * @see locale_translation_batch_status_compare() */ function locale_translation_batch_fetch_import($project, $langcode, $options, &$context) { +watchdog('debug', microtime(TRUE) . ' locale_translation_batch_fetch_import()'); $sources = $context['results']['input']; if (isset($sources[$project . ':' . $langcode])) { $source = $sources[$project . ':' . $langcode]; @@ -383,6 +389,7 @@ function locale_translation_batch_fetch_import($project, $langcode, $options, &$ * @see locale_translation_batch_status_compare() */ function locale_translation_batch_fetch_update_status(&$context) { +watchdog('debug', microtime(TRUE) . ' locale_translation_batch_fetch_update_status()'); $t = get_t(); $results = array(); @@ -424,6 +431,7 @@ function locale_translation_batch_fetch_update_status(&$context) { * Batch results. */ function locale_translation_batch_fetch_finished($success, $results) { +watchdog('debug', microtime(TRUE) . ' locale_translation_batch_fetch_finished()'); module_load_include('bulk.inc', 'locale'); return locale_translate_batch_finished($success, $results); } @@ -442,7 +450,9 @@ function locale_translation_batch_fetch_finished($success, $results) { * FALSE if a fault occured. */ function locale_translation_http_check($uri, $headers = array()) { +watchdog('debug', microtime(TRUE) . ' locale_translation_http_check(): http call started'); $result = drupal_http_request($uri, array('headers' => $headers, 'method' => 'HEAD')); +watchdog('debug', microtime(TRUE) . ' locale_translation_http_check(): http call completed'); if (!isset($result->error)) { if ($result->code == 200) { $result->updated = isset($result->headers['last-modified']) ? strtotime($result->headers['last-modified']) : 0; diff --git a/core/modules/locale/locale.fetch.inc b/core/modules/locale/locale.fetch.inc index d509b69..812c726 100755 --- a/core/modules/locale/locale.fetch.inc +++ b/core/modules/locale/locale.fetch.inc @@ -27,6 +27,7 @@ * Batch definition array. */ function locale_translation_batch_update_build($projects = array(), $langcodes = array(), $options = array()) { +watchdog ('debug', microtime(TRUE) . ' Build batch: locale_translation_batch_update_build()'); module_load_include('compare.inc', 'locale'); $t = get_t(); $projects = $projects ? $projects : array_keys(locale_translation_get_projects());