? 1
? 2
? 447816-form-error-indicator-v16.patch
? 566940-cleanupcontroller.patch
? 569536_search_twice.patch
? 6.x-extra.patch
? 669794-followup-d7.patch
? 669794-savepoint-reroll-d7_7.patch
? 683988-14.reset_system_list_when_module_moves.patch
? 683988-25.reset_system_list_when_module_moves.patch
? 688294-die_db_is_active_die_for_real3.patch
? 688294-die_db_is_active_die_for_real3.patch.1
? 699440_entity_uri_38.patch
? 699440_entity_uri_57.patch
? 699440_entity_uri_57.patch.1
? 722354fixnewline.patch
? 744258-unique-key.patch
? 760014_27.patch
? 766100-list-themes-d7_1.patch
? 76824-13_0.patch
? Administer | Site-Install_1270876071993.png
? Application | examiner_d7_1269411390030.png
? Garland | Site-Install_1271755366138.png
? Modules | Site-Install_1269789543096.png
? XHProf: Hierarchical Profiler Report_1268801688867.png
? XHProf: Hierarchical Profiler Report_1270101901400.png
? aggregator_21.patch
? amnesty_features.module
? andagain.patch
? array-multisort-1.patch
? attributes_php.txt
? blame
? bogus_user_loads.patch
? bogus_user_loads.patch.1
? bootstrap.patc
? by-module-index.patch
? by-module-index_0.patch
? comment_save.patch
? comment_statistics.patch
? comment_statistics_0.patch
? createtable.patch
? d7_port.patch
? dashboard-652122-48.patch
? dashboard.patch
? dashboard_8.patch
? dashboard_default.patch.1
? data.patch
? data_unpack.patch
? data_unpack.patch.1
? default.png
? die.patch
? diediedie.patch
? disabled_blocks.patch
? disabled_by_default.patch
? disabled_filters.patch
? drupal.block-theme-demo.52.patch
? drupal.path-front-page.9.patch.1
? drupal_static_cleanup_0.patch.1
? drupal_static_fast.patch
? drupal_unpack_1.patch
? drupal_validate_form.patch
? element_static_fast.patch
? empty.txt
? entity_field_bootstrap.patch.1
? entity_info_cache.patch
? entity_revisions.patch.1
? entity_uri.patch
? ex_activity.patch
? examiner_d7_1270691754497.png
? f
? fairies.patch
? field_default_values_empty.patch
? field_exception.patch
? file_notice.patch
? filter_url_6.patch.1
? filters.patch.1
? foo.php
? format_changes.patch
? gut_node_types.patch
? gut_node_types_0.patch
? gut_node_types_1.patch
? gut_node_types_2.patch
? gut_node_types_2.patch.1
? gutgutgut.patch
? hashing.patch
? head.png
? image_field_insert_die.patch
? inbound.patch
? install.png
? link.png
? lock_wait_a_bit_less.patch
? lru.patch
? make_users_crap_cos_profile_module_is_even_crapper.patch
? memory.php
? minimum.png
? ncm.diff
? no-updates-for-you.patch
? node_grants.patch
? node_gutting.patch
? node_save.patch
? node_title.patch
? node_type_gutting-553306-105.patch
? node_type_gutting.patch
? node_type_gutting_1.patch
? node_type_gutting_3.patch
? node_type_gutting_4.patch
? node_type_gutting_4_0.patch
? node_type_gutting_4_0.patch.1
? node_type_gutting_4_0.patch.2
? notices.patch
? notices_with_patch.patch
? parents.patch
? patch.png
? path_inc.patcfh
? path_inc.patchj
? pointless_permission.patch
? remove_drupal_unpack.patch
? remove_duff_loading.patch
? sanitize.patch
? savepoint_revert.patch
? show-hide-descriptions-748976-1.patch
? sites
? speed-up-install-686196-136.patch
? statistics.patch
? summary_length.patch
? summary_length_0.patch
? sysm_list_cache.patch
? system_list_cache.patch
? taxonomy_field_name.patch.1
? taxonomy_field_validate.patch.1
? taxonomy_options.patch
? taxonomy_options.patch.1
? taxonomy_static.patch.1
? taxonomy_term_presave.patch
? taxonomy_term_save.patch
? taxonomy_term_save_2.patch
? taxonomy_term_save_3.patch
? taxonomy_term_save_a_bit_faster.patch
? taxonomy_term_save_a_bit_faster.patch.1
? taxonomy_update.patch
? tf-632172-10.patch
? tf-632172-19.patch
? tick.php
? unpack.patch
? update_registry.patch
? url.php
? user-data-721436-57.patch
? user_data.patch
? user_data_1.patch
? user_data_3.patch
? user_load_cruft.patch
? user_roles_no_op_delete.patch
? user_save.diff
? user_save.patch
? variable_common_inc.patch
? wysiwyg-768706.patch
? includes/drupal_unpack_1.patch
? includes/errors.inc
? modules/forum/.forum.install.swp
? modules/update/update.patch
? modules/user/user_data.patch
Index: includes/lock.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/lock.inc,v
retrieving revision 1.4
diff -u -p -r1.4 lock.inc
--- includes/lock.inc	6 May 2010 15:20:18 -0000	1.4
+++ includes/lock.inc	19 May 2010 05:00:48 -0000
@@ -198,8 +198,9 @@ function lock_wait($name, $delay = 30) {
   while ($delay--) {
     // This function should only be called by a request that failed to get a
     // lock, so we sleep first to give the parallel request a chance to finish
-    // and release the lock.
-    sleep(1);
+    // and release the lock. Use usleep for 100ms, instead of sleep(1),  so that
+    // processes don't wait around too much longer than necessary.
+    usleep(100000);
     if (lock_may_be_available($name)) {
       // No longer need to wait.
       return FALSE;