From 55494c2443df23ddd48d375b423f6dd546ab8061 Mon Sep 17 00:00:00 2001 From: Edwin Smith Date: Fri, 2 Aug 2013 18:15:33 -0700 Subject: [PATCH] Rename files in runtime/base, part 6 Differential Revision: D913699 --- hphp/compiler/analysis/analysis_result.cpp | 2 +- hphp/compiler/analysis/emitter.cpp | 4 +- hphp/compiler/builtin_symbols.cpp | 2 +- hphp/compiler/compiler.cpp | 2 +- hphp/hhvm/main.cpp | 2 +- hphp/hhvm/process_init.cpp | 4 +- hphp/runtime/base/array_data.cpp | 2 +- hphp/runtime/base/array_init.cpp | 2 +- hphp/runtime/base/array_iterator.cpp | 2 +- hphp/runtime/base/array_util.cpp | 2 +- hphp/runtime/base/builtin_functions.cpp | 2 +- hphp/runtime/base/builtin_functions.h | 8 +- hphp/runtime/base/complex_types.h | 2 +- hphp/runtime/base/concurrent_shared_store.h | 2 +- hphp/runtime/base/crash_reporter.cpp | 2 +- hphp/runtime/base/curl_tls_workarounds.cpp | 4 +- hphp/runtime/base/dateinterval.cpp | 2 +- hphp/runtime/base/datetime.cpp | 2 +- hphp/runtime/base/datetime.h | 2 +- hphp/runtime/base/exceptions.cpp | 2 +- hphp/runtime/base/execution_context.cpp | 6 +- hphp/runtime/base/extended_logger.cpp | 2 +- hphp/runtime/base/file-repository.cpp | 2 +- hphp/runtime/base/file-repository.h | 2 +- hphp/runtime/base/file-stream-wrapper.cpp | 2 +- hphp/runtime/base/file.cpp | 4 +- hphp/runtime/base/file.h | 2 +- hphp/runtime/base/hardware_counter.cpp | 2 +- hphp/runtime/base/hphp_array.cpp | 4 +- hphp/runtime/base/hphp_system.cpp | 2 +- hphp/runtime/base/http-stream-wrapper.cpp | 2 +- hphp/runtime/base/http_client.cpp | 2 +- hphp/runtime/base/ini_setting.cpp | 2 +- hphp/runtime/base/intercept.cpp | 2 +- hphp/runtime/base/libevent_http_client.cpp | 2 +- hphp/runtime/base/mem-file.cpp | 2 +- .../{memory_manager.cpp => memory-manager.cpp} | 6 +- .../base/{memory_manager.h => memory-manager.h} | 2 +- .../{memory_profile.cpp => memory-profile.cpp} | 2 +- .../base/{memory_profile.h => memory-profile.h} | 4 +- .../{memory_usage_stats.h => memory-usage-stats.h} | 0 .../base/{object_data.cpp => object-data.cpp} | 4 +- hphp/runtime/base/{object_data.h => object-data.h} | 0 hphp/runtime/base/output-file.cpp | 2 +- hphp/runtime/base/php-stream-wrapper.cpp | 2 +- hphp/runtime/base/plain-file.cpp | 2 +- .../base/{pprof_server.cpp => pprof-server.cpp} | 2 +- .../base/{pprof_server.h => pprof-server.h} | 2 +- hphp/runtime/base/preg.cpp | 4 +- .../base/{profile_dump.cpp => profile-dump.cpp} | 2 +- .../base/{profile_dump.h => profile-dump.h} | 0 ...program_functions.cpp => program-functions.cpp} | 9 ++- hphp/runtime/base/program-functions.h | 94 ++++++++++++++++++++++ hphp/runtime/base/{ref_data.cpp => ref-data.cpp} | 0 hphp/runtime/base/{ref_data.h => ref-data.h} | 0 .../base/{request_local.h => request-local.h} | 0 .../base/{resource_data.cpp => resource-data.cpp} | 0 .../base/{resource_data.h => resource-data.h} | 0 .../base/{runtime_error.cpp => runtime-error.cpp} | 4 +- .../base/{runtime_error.h => runtime-error.h} | 0 .../{runtime_option.cpp => runtime-option.cpp} | 2 +- .../base/{runtime_option.h => runtime-option.h} | 0 hphp/runtime/base/shared-map.cpp | 4 +- hphp/runtime/base/shared-store-base.cpp | 2 +- hphp/runtime/base/shared-store-stats.cpp | 2 +- hphp/runtime/base/shared-variant.cpp | 2 +- hphp/runtime/base/simple-counter.h | 2 +- hphp/runtime/base/smart-allocator.cpp | 4 +- hphp/runtime/base/smart-allocator.h | 2 +- hphp/runtime/base/smart-containers.h | 2 +- hphp/runtime/base/socket.cpp | 4 +- hphp/runtime/base/ssl-socket.cpp | 2 +- hphp/runtime/base/stat-cache.cpp | 2 +- hphp/runtime/base/stream-wrapper-registry.cpp | 2 +- hphp/runtime/base/string-data.cpp | 4 +- hphp/runtime/base/string-util.cpp | 2 +- hphp/runtime/base/sweepable.cpp | 2 +- hphp/runtime/base/temp-file.cpp | 2 +- hphp/runtime/base/timezone.cpp | 2 +- hphp/runtime/base/tv-arith.cpp | 2 +- hphp/runtime/base/type-array.cpp | 2 +- hphp/runtime/base/type-object.h | 2 +- hphp/runtime/base/type-resource.h | 2 +- hphp/runtime/base/type-variant.cpp | 2 +- hphp/runtime/base/types.h | 2 +- hphp/runtime/base/url-file.cpp | 2 +- hphp/runtime/base/variable-serializer.cpp | 4 +- hphp/runtime/base/zend-collator.cpp | 2 +- hphp/runtime/base/zend-collator.h | 2 +- hphp/runtime/base/zend-string.cpp | 2 +- hphp/runtime/base/zip-file.cpp | 2 +- hphp/runtime/debugger/cmd/cmd_heaptrace.cpp | 2 +- hphp/runtime/debugger/cmd/cmd_machine.cpp | 2 +- hphp/runtime/debugger/debugger.h | 2 +- hphp/runtime/debugger/debugger_client.cpp | 2 +- hphp/runtime/debugger/debugger_proxy.cpp | 2 +- hphp/runtime/debugger/debugger_server.cpp | 2 +- hphp/runtime/debugger/dummy_sandbox.cpp | 2 +- hphp/runtime/ext/ext_apache.cpp | 2 +- hphp/runtime/ext/ext_apc.cpp | 4 +- hphp/runtime/ext/ext_array.cpp | 2 +- hphp/runtime/ext/ext_curl.cpp | 2 +- hphp/runtime/ext/ext_domdocument.cpp | 2 +- hphp/runtime/ext/ext_fb.cpp | 2 +- hphp/runtime/ext/ext_file.cpp | 6 +- hphp/runtime/ext/ext_hotprofiler.cpp | 4 +- hphp/runtime/ext/ext_iconv.cpp | 2 +- hphp/runtime/ext/ext_image.cpp | 4 +- hphp/runtime/ext/ext_intl.cpp | 2 +- hphp/runtime/ext/ext_mailparse.cpp | 4 +- hphp/runtime/ext/ext_mb.cpp | 2 +- hphp/runtime/ext/ext_memcache.cpp | 2 +- hphp/runtime/ext/ext_misc.cpp | 2 +- hphp/runtime/ext/ext_mysql.cpp | 4 +- hphp/runtime/ext/ext_network.cpp | 2 +- hphp/runtime/ext/ext_options.cpp | 8 +- hphp/runtime/ext/ext_output.cpp | 2 +- hphp/runtime/ext/ext_pdo.cpp | 2 +- hphp/runtime/ext/ext_preg.cpp | 2 +- hphp/runtime/ext/ext_process.cpp | 2 +- hphp/runtime/ext/ext_reflection.cpp | 2 +- hphp/runtime/ext/ext_server.cpp | 2 +- hphp/runtime/ext/ext_session.cpp | 2 +- hphp/runtime/ext/ext_simplexml.cpp | 2 +- hphp/runtime/ext/ext_string.cpp | 2 +- hphp/runtime/ext/ext_thread.cpp | 2 +- hphp/runtime/ext/mailparse/mime.cpp | 2 +- hphp/runtime/ext/mailparse/rfc822.cpp | 2 +- hphp/runtime/ext/soap/soap.h | 2 +- hphp/runtime/ext/thrift/compact.cpp | 2 +- hphp/runtime/server/access_log.cpp | 2 +- hphp/runtime/server/admin_request_handler.cpp | 6 +- hphp/runtime/server/http_protocol.cpp | 4 +- hphp/runtime/server/http_request_handler.cpp | 4 +- hphp/runtime/server/http_server.cpp | 6 +- hphp/runtime/server/libevent_server.cpp | 4 +- hphp/runtime/server/libevent_transport.cpp | 2 +- hphp/runtime/server/pagelet_server.cpp | 2 +- hphp/runtime/server/request_uri.cpp | 2 +- hphp/runtime/server/rpc_request_handler.cpp | 4 +- hphp/runtime/server/satellite_server.cpp | 2 +- hphp/runtime/server/server_name_indication.cpp | 2 +- hphp/runtime/server/server_note.cpp | 2 +- hphp/runtime/server/server_stats.cpp | 6 +- hphp/runtime/server/service_thread.cpp | 2 +- hphp/runtime/server/source_root_info.cpp | 2 +- hphp/runtime/server/static_content_cache.cpp | 2 +- hphp/runtime/server/transport.cpp | 2 +- hphp/runtime/server/transport.h | 2 +- hphp/runtime/server/upload.cpp | 6 +- hphp/runtime/server/virtual_host.cpp | 2 +- hphp/runtime/server/xbox_server.cpp | 2 +- hphp/runtime/server/xbox_server.h | 2 +- hphp/runtime/vm/backup-gc.cpp | 4 +- hphp/runtime/vm/bytecode.cpp | 4 +- hphp/runtime/vm/debug/elfwriter.cpp | 2 +- hphp/runtime/vm/funcdict.cpp | 4 +- hphp/runtime/vm/jit/code-gen.cpp | 2 +- hphp/runtime/vm/jit/ir-factory.h | 2 +- hphp/runtime/vm/jit/ir-translator.cpp | 2 +- hphp/runtime/vm/jit/region-selection.cpp | 2 +- hphp/runtime/vm/jit/translator-x64.cpp | 2 +- hphp/runtime/vm/jit/translator.cpp | 2 +- hphp/runtime/vm/name-value-table-wrapper.cpp | 2 +- hphp/runtime/vm/object-allocator-sizes.cpp | 2 +- hphp/runtime/vm/type-profile.cpp | 2 +- hphp/runtime/vm/unit.h | 2 +- hphp/test/ext/main.cpp | 2 +- hphp/test/ext/test_code_run.cpp | 2 +- hphp/test/ext/test_cpp_base.cpp | 4 +- hphp/test/ext/test_cpp_ext.h | 2 +- hphp/test/ext/test_ext_mysql.cpp | 2 +- hphp/test/ext/test_ext_server.cpp | 2 +- hphp/test/ext/test_server.cpp | 2 +- hphp/util/asm-x64.cpp | 2 +- 175 files changed, 309 insertions(+), 214 deletions(-) rename hphp/runtime/base/{memory_manager.cpp => memory-manager.cpp} (99%) rename hphp/runtime/base/{memory_manager.h => memory-manager.h} (99%) rename hphp/runtime/base/{memory_profile.cpp => memory-profile.cpp} (98%) rename hphp/runtime/base/{memory_profile.h => memory-profile.h} (97%) rename hphp/runtime/base/{memory_usage_stats.h => memory-usage-stats.h} (100%) rename hphp/runtime/base/{object_data.cpp => object-data.cpp} (99%) rename hphp/runtime/base/{object_data.h => object-data.h} (100%) rename hphp/runtime/base/{pprof_server.cpp => pprof-server.cpp} (99%) rename hphp/runtime/base/{pprof_server.h => pprof-server.h} (97%) rename hphp/runtime/base/{profile_dump.cpp => profile-dump.cpp} (99%) rename hphp/runtime/base/{profile_dump.h => profile-dump.h} (100%) rename hphp/runtime/base/{program_functions.cpp => program-functions.cpp} (99%) create mode 100644 hphp/runtime/base/program-functions.h rename hphp/runtime/base/{ref_data.cpp => ref-data.cpp} (100%) rename hphp/runtime/base/{ref_data.h => ref-data.h} (100%) rename hphp/runtime/base/{request_local.h => request-local.h} (100%) rename hphp/runtime/base/{resource_data.cpp => resource-data.cpp} (100%) rename hphp/runtime/base/{resource_data.h => resource-data.h} (100%) rename hphp/runtime/base/{runtime_error.cpp => runtime-error.cpp} (98%) rename hphp/runtime/base/{runtime_error.h => runtime-error.h} (100%) rename hphp/runtime/base/{runtime_option.cpp => runtime-option.cpp} (99%) rename hphp/runtime/base/{runtime_option.h => runtime-option.h} (100%) diff --git a/hphp/compiler/analysis/analysis_result.cpp b/hphp/compiler/analysis/analysis_result.cpp index 59be0ea4c08..6344af491f9 100644 --- a/hphp/compiler/analysis/analysis_result.cpp +++ b/hphp/compiler/analysis/analysis_result.cpp @@ -47,7 +47,7 @@ #include "hphp/compiler/expression/simple_function_call.h" #include "hphp/runtime/ext/ext_json.h" #include "hphp/runtime/base/zend-printf.h" -#include "hphp/runtime/base/program_functions.h" +#include "hphp/runtime/base/program-functions.h" #include "hphp/util/atomic.h" #include "hphp/util/logger.h" #include "hphp/util/util.h" diff --git a/hphp/compiler/analysis/emitter.cpp b/hphp/compiler/analysis/emitter.cpp index 387a55e1efe..3225e5e719b 100644 --- a/hphp/compiler/analysis/emitter.cpp +++ b/hphp/compiler/analysis/emitter.cpp @@ -83,12 +83,12 @@ #include "hphp/runtime/vm/repo.h" #include "hphp/runtime/vm/as.h" #include "hphp/runtime/base/stats.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/zend-string.h" #include "hphp/runtime/base/type-conversions.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/variable-serializer.h" -#include "hphp/runtime/base/program_functions.h" +#include "hphp/runtime/base/program-functions.h" #include "hphp/runtime/base/file-repository.h" #include "hphp/runtime/ext_hhvm/ext_hhvm.h" #include "hphp/runtime/vm/preclass-emit.h" diff --git a/hphp/compiler/builtin_symbols.cpp b/hphp/compiler/builtin_symbols.cpp index 026f0c59050..b12e48affdb 100644 --- a/hphp/compiler/builtin_symbols.cpp +++ b/hphp/compiler/builtin_symbols.cpp @@ -29,7 +29,7 @@ #include "hphp/compiler/analysis/constant_table.h" #include "hphp/util/parser/hphp.tab.hpp" #include "hphp/runtime/base/class_info.h" -#include "hphp/runtime/base/program_functions.h" +#include "hphp/runtime/base/program-functions.h" #include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/thread-init-fini.h" diff --git a/hphp/compiler/compiler.cpp b/hphp/compiler/compiler.cpp index 6c127359c56..b2e9562717b 100644 --- a/hphp/compiler/compiler.cpp +++ b/hphp/compiler/compiler.cpp @@ -35,7 +35,7 @@ #include "hphp/util/hdf.h" #include "hphp/util/async_func.h" #include "hphp/util/current_executable.h" -#include "hphp/runtime/base/program_functions.h" +#include "hphp/runtime/base/program-functions.h" #include "hphp/runtime/base/smart-allocator.h" #include "hphp/runtime/base/externals.h" #include "hphp/runtime/base/thread-init-fini.h" diff --git a/hphp/hhvm/main.cpp b/hphp/hhvm/main.cpp index e4db4e95b06..d31521b43cb 100644 --- a/hphp/hhvm/main.cpp +++ b/hphp/hhvm/main.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/program_functions.h" +#include "hphp/runtime/base/program-functions.h" #include "hphp/hhvm/process_init.h" #include "hphp/compiler/compiler.h" diff --git a/hphp/hhvm/process_init.cpp b/hphp/hhvm/process_init.cpp index f8fb9c58206..621298cccdd 100644 --- a/hphp/hhvm/process_init.cpp +++ b/hphp/hhvm/process_init.cpp @@ -15,9 +15,9 @@ */ #include "hphp/compiler/analysis/emitter.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/execution_context.h" -#include "hphp/runtime/base/program_functions.h" +#include "hphp/runtime/base/program-functions.h" #include "hphp/runtime/ext/ext.h" #include "hphp/runtime/vm/unit.h" #include "hphp/runtime/vm/bytecode.h" diff --git a/hphp/runtime/base/array_data.cpp b/hphp/runtime/base/array_data.cpp index d3690a25e12..ba744f3cbe8 100644 --- a/hphp/runtime/base/array_data.cpp +++ b/hphp/runtime/base/array_data.cpp @@ -24,7 +24,7 @@ #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/variable-serializer.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/macros.h" #include "hphp/runtime/base/shared-map.h" #include "hphp/runtime/base/policy_array.h" diff --git a/hphp/runtime/base/array_init.cpp b/hphp/runtime/base/array_init.cpp index c6ea892e8ac..d2487903a75 100644 --- a/hphp/runtime/base/array_init.cpp +++ b/hphp/runtime/base/array_init.cpp @@ -16,7 +16,7 @@ #include "hphp/runtime/base/array_init.h" #include "hphp/runtime/base/policy_array.h" #include "hphp/runtime/base/hphp_array.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/array_iterator.cpp b/hphp/runtime/base/array_iterator.cpp index b7fbc4cca34..49f5d0f38fa 100644 --- a/hphp/runtime/base/array_iterator.cpp +++ b/hphp/runtime/base/array_iterator.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/base/array_data.h" #include "hphp/runtime/base/hphp_array.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/object_data.h" +#include "hphp/runtime/base/object-data.h" #include "hphp/runtime/ext/ext_collections.h" // inline methods of HphpArray. diff --git a/hphp/runtime/base/array_util.cpp b/hphp/runtime/base/array_util.cpp index a74ac52ecca..424e108d017 100644 --- a/hphp/runtime/base/array_util.cpp +++ b/hphp/runtime/base/array_util.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/string-util.h" #include "hphp/runtime/base/builtin_functions.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-error.h" #include "hphp/runtime/ext/ext_math.h" #include "hphp/runtime/ext/ext_json.h" diff --git a/hphp/runtime/base/builtin_functions.cpp b/hphp/runtime/base/builtin_functions.cpp index 4914a02483c..30505e9ca29 100644 --- a/hphp/runtime/base/builtin_functions.cpp +++ b/hphp/runtime/base/builtin_functions.cpp @@ -21,7 +21,7 @@ #include "hphp/runtime/base/externals.h" #include "hphp/runtime/base/variable-serializer.h" #include "hphp/runtime/base/variable-unserializer.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/strings.h" #include "hphp/runtime/base/file-repository.h" diff --git a/hphp/runtime/base/builtin_functions.h b/hphp/runtime/base/builtin_functions.h index c4cb354d662..4ffc7a75e68 100644 --- a/hphp/runtime/base/builtin_functions.h +++ b/hphp/runtime/base/builtin_functions.h @@ -21,10 +21,10 @@ #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/intercept.h" -#include "hphp/runtime/base/runtime_error.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-error.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/variable-unserializer.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include "hphp/runtime/base/strings.h" #include "hphp/util/case_insensitive.h" #include "hphp/runtime/base/type-conversions.h" @@ -267,7 +267,7 @@ void throw_wrong_arguments_nr(const char *fn, int count, int cmin, int cmax, * Handler for exceptions thrown from user functions that we don't * allow exception propagation from. E.g., object destructors or * certain callback hooks (user profiler). Implemented in - * program_functions.cpp. + * program-functions.cpp. */ void handle_destructor_exception(const char* situation = "Destructor"); diff --git a/hphp/runtime/base/complex_types.h b/hphp/runtime/base/complex_types.h index 500a2a4fbbc..9ef6a7b6bb3 100644 --- a/hphp/runtime/base/complex_types.h +++ b/hphp/runtime/base/complex_types.h @@ -24,7 +24,7 @@ #include "hphp/runtime/base/type-array.h" #include "hphp/runtime/base/type-object.h" #include "hphp/runtime/base/type-resource.h" -#include "hphp/runtime/base/ref_data.h" +#include "hphp/runtime/base/ref-data.h" #include "hphp/runtime/base/tv-helpers.h" #include "hphp/runtime/base/type-variant.h" #include "hphp/runtime/base/array_data-defs.h" diff --git a/hphp/runtime/base/concurrent_shared_store.h b/hphp/runtime/base/concurrent_shared_store.h index 5982060394b..0f5994a3d07 100644 --- a/hphp/runtime/base/concurrent_shared_store.h +++ b/hphp/runtime/base/concurrent_shared_store.h @@ -22,7 +22,7 @@ #include "hphp/runtime/base/shared-store-base.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/shared-variant.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/type-conversions.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/server/server_stats.h" diff --git a/hphp/runtime/base/crash_reporter.cpp b/hphp/runtime/base/crash_reporter.cpp index 68dabc78103..ccf40d351e8 100644 --- a/hphp/runtime/base/crash_reporter.cpp +++ b/hphp/runtime/base/crash_reporter.cpp @@ -18,7 +18,7 @@ #include "hphp/util/light_process.h" #include "hphp/util/logger.h" -#include "hphp/runtime/base/program_functions.h" +#include "hphp/runtime/base/program-functions.h" #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/ext/ext_error.h" #include "hphp/runtime/debugger/debugger.h" diff --git a/hphp/runtime/base/curl_tls_workarounds.cpp b/hphp/runtime/base/curl_tls_workarounds.cpp index 1b7e3c54504..97c1b18a9aa 100644 --- a/hphp/runtime/base/curl_tls_workarounds.cpp +++ b/hphp/runtime/base/curl_tls_workarounds.cpp @@ -18,8 +18,8 @@ #include "curl/curl.h" #include "curl/easy.h" #include "openssl/ssl.h" -#include "hphp/runtime/base/runtime_error.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-error.h" +#include "hphp/runtime/base/runtime-option.h" namespace HPHP { diff --git a/hphp/runtime/base/dateinterval.cpp b/hphp/runtime/base/dateinterval.cpp index 1cc8146c3b9..f2b60a74d1c 100644 --- a/hphp/runtime/base/dateinterval.cpp +++ b/hphp/runtime/base/dateinterval.cpp @@ -20,7 +20,7 @@ #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/type-conversions.h" #include "hphp/runtime/base/builtin_functions.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-error.h" #include "hphp/util/logger.h" namespace HPHP { diff --git a/hphp/runtime/base/datetime.cpp b/hphp/runtime/base/datetime.cpp index 0566a9b642d..c910666439f 100644 --- a/hphp/runtime/base/datetime.cpp +++ b/hphp/runtime/base/datetime.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/base/dateinterval.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/string-buffer.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-error.h" #include "hphp/runtime/base/type-conversions.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/array_init.h" diff --git a/hphp/runtime/base/datetime.h b/hphp/runtime/base/datetime.h index 7341a6a38fb..2964e7b8956 100644 --- a/hphp/runtime/base/datetime.h +++ b/hphp/runtime/base/datetime.h @@ -21,7 +21,7 @@ #include "hphp/runtime/base/smart-object.h" #include "hphp/runtime/base/timezone.h" #include "hphp/runtime/base/dateinterval.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/exceptions.cpp b/hphp/runtime/base/exceptions.cpp index 84f08be8624..a176738a7aa 100644 --- a/hphp/runtime/base/exceptions.cpp +++ b/hphp/runtime/base/exceptions.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ #include "hphp/runtime/base/exceptions.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/execution_context.h" diff --git a/hphp/runtime/base/execution_context.cpp b/hphp/runtime/base/execution_context.cpp index 80a17f54e24..e765db25e10 100644 --- a/hphp/runtime/base/execution_context.cpp +++ b/hphp/runtime/base/execution_context.cpp @@ -25,15 +25,15 @@ #include "hphp/util/text_color.h" #include "hphp/runtime/base/array_init.h" #include "hphp/runtime/base/array_iterator.h" -#include "hphp/runtime/base/memory_manager.h" +#include "hphp/runtime/base/memory-manager.h" #include "hphp/runtime/base/sweepable.h" #include "hphp/runtime/server/server_stats.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/comparisons.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/externals.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/type-conversions.h" #include "hphp/runtime/debugger/debugger.h" #include "hphp/runtime/base/file-repository.h" diff --git a/hphp/runtime/base/extended_logger.cpp b/hphp/runtime/base/extended_logger.cpp index 418c47db961..d0feef2293f 100644 --- a/hphp/runtime/base/extended_logger.cpp +++ b/hphp/runtime/base/extended_logger.cpp @@ -16,7 +16,7 @@ #include "hphp/runtime/base/extended_logger.h" #include "hphp/runtime/base/execution_context.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/array_iterator.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/file-repository.cpp b/hphp/runtime/base/file-repository.cpp index f35c7c506fa..06fe558f8aa 100644 --- a/hphp/runtime/base/file-repository.cpp +++ b/hphp/runtime/base/file-repository.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/base/file-repository.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/zend-string.h" #include "hphp/util/process.h" #include "hphp/util/trace.h" diff --git a/hphp/runtime/base/file-repository.h b/hphp/runtime/base/file-repository.h index dfc58195634..f9f20b1144b 100644 --- a/hphp/runtime/base/file-repository.h +++ b/hphp/runtime/base/file-repository.h @@ -21,7 +21,7 @@ #include #include "hphp/util/lock.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/md5.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/string-util.h" diff --git a/hphp/runtime/base/file-stream-wrapper.cpp b/hphp/runtime/base/file-stream-wrapper.cpp index 359056b9ff6..7fae164cb36 100644 --- a/hphp/runtime/base/file-stream-wrapper.cpp +++ b/hphp/runtime/base/file-stream-wrapper.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/base/file-stream-wrapper.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-error.h" #include "hphp/runtime/base/plain-file.h" #include "hphp/runtime/server/static_content_cache.h" #include diff --git a/hphp/runtime/base/file.cpp b/hphp/runtime/base/file.cpp index 9cd03aeaef1..c96213925c2 100644 --- a/hphp/runtime/base/file.cpp +++ b/hphp/runtime/base/file.cpp @@ -21,8 +21,8 @@ #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/server/static_content_cache.h" #include "hphp/runtime/server/virtual_host.h" -#include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-option.h" +#include "hphp/runtime/base/runtime-error.h" #include "hphp/runtime/base/array_init.h" #include "hphp/util/logger.h" #include "hphp/util/process.h" diff --git a/hphp/runtime/base/file.h b/hphp/runtime/base/file.h index 36be5526b1f..759e2f982a8 100644 --- a/hphp/runtime/base/file.h +++ b/hphp/runtime/base/file.h @@ -19,7 +19,7 @@ #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/hardware_counter.cpp b/hphp/runtime/base/hardware_counter.cpp index d66de011ff0..c574291ee4e 100644 --- a/hphp/runtime/base/hardware_counter.cpp +++ b/hphp/runtime/base/hardware_counter.cpp @@ -35,7 +35,7 @@ #include "linux/perf_event.h" #include "hphp/runtime/base/string-data.h" #include "hphp/runtime/base/zend-url.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/vm/jit/translator-x64.h" namespace HPHP { diff --git a/hphp/runtime/base/hphp_array.cpp b/hphp/runtime/base/hphp_array.cpp index f74fdfa9de8..e3729a188fb 100644 --- a/hphp/runtime/base/hphp_array.cpp +++ b/hphp/runtime/base/hphp_array.cpp @@ -20,8 +20,8 @@ #include "hphp/runtime/base/array_init.h" #include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-option.h" +#include "hphp/runtime/base/runtime-error.h" #include "hphp/runtime/base/variable-serializer.h" #include "hphp/runtime/base/shared-map.h" #include "hphp/util/hash.h" diff --git a/hphp/runtime/base/hphp_system.cpp b/hphp/runtime/base/hphp_system.cpp index def80df789a..daea6bb1e84 100644 --- a/hphp/runtime/base/hphp_system.cpp +++ b/hphp/runtime/base/hphp_system.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ #include "hphp/runtime/base/hphp_system.h" -#include "hphp/runtime/base/program_functions.h" +#include "hphp/runtime/base/program-functions.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/http-stream-wrapper.cpp b/hphp/runtime/base/http-stream-wrapper.cpp index 30b4e114d4a..e6af15185e8 100644 --- a/hphp/runtime/base/http-stream-wrapper.cpp +++ b/hphp/runtime/base/http-stream-wrapper.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/base/http-stream-wrapper.h" #include "hphp/runtime/base/string-util.h" #include "hphp/runtime/base/url-file.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/ext/ext_stream.h" #include diff --git a/hphp/runtime/base/http_client.cpp b/hphp/runtime/base/http_client.cpp index d7e6a7ec018..cba81c971dd 100644 --- a/hphp/runtime/base/http_client.cpp +++ b/hphp/runtime/base/http_client.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/base/http_client.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/server/server_stats.h" #include "hphp/runtime/base/curl_tls_workarounds.h" #include "hphp/util/timer.h" diff --git a/hphp/runtime/base/ini_setting.cpp b/hphp/runtime/base/ini_setting.cpp index a60f9e2606f..57f0cbed07a 100644 --- a/hphp/runtime/base/ini_setting.cpp +++ b/hphp/runtime/base/ini_setting.cpp @@ -23,7 +23,7 @@ #include "hphp/runtime/base/type-conversions.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/hphp_system.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/ext/extension.h" #include "hphp/util/lock.h" diff --git a/hphp/runtime/base/intercept.cpp b/hphp/runtime/base/intercept.cpp index 8770340aeee..dd9b4f0cbcc 100644 --- a/hphp/runtime/base/intercept.cpp +++ b/hphp/runtime/base/intercept.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ #include "hphp/runtime/base/intercept.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include "hphp/runtime/base/array_init.h" #include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/type-conversions.h" diff --git a/hphp/runtime/base/libevent_http_client.cpp b/hphp/runtime/base/libevent_http_client.cpp index 85bda0e290d..33e8837918a 100644 --- a/hphp/runtime/base/libevent_http_client.cpp +++ b/hphp/runtime/base/libevent_http_client.cpp @@ -16,7 +16,7 @@ #include "hphp/runtime/base/libevent_http_client.h" #include "hphp/runtime/server/server_stats.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/util/compression.h" #include "hphp/util/logger.h" #include "hphp/util/timer.h" diff --git a/hphp/runtime/base/mem-file.cpp b/hphp/runtime/base/mem-file.cpp index 2af046b4818..9397bafd070 100644 --- a/hphp/runtime/base/mem-file.cpp +++ b/hphp/runtime/base/mem-file.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/http_client.h" #include "hphp/runtime/server/static_content_cache.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/util/compression.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/base/memory_manager.cpp b/hphp/runtime/base/memory-manager.cpp similarity index 99% rename from hphp/runtime/base/memory_manager.cpp rename to hphp/runtime/base/memory-manager.cpp index 6fb18e8173d..cb53e91a9f4 100644 --- a/hphp/runtime/base/memory_manager.cpp +++ b/hphp/runtime/base/memory-manager.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/memory_manager.h" +#include "hphp/runtime/base/memory-manager.h" // Get SIZE_MAX definition. Do this before including any other files, to make // sure that this is the first place that stdint.h is included. @@ -25,9 +25,9 @@ #include "hphp/runtime/base/smart-allocator.h" #include "hphp/runtime/base/sweepable.h" -#include "hphp/runtime/base/memory_profile.h" +#include "hphp/runtime/base/memory-profile.h" #include "hphp/runtime/base/builtin_functions.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/server/http_server.h" #include "hphp/util/alloc.h" #include "hphp/util/process.h" diff --git a/hphp/runtime/base/memory_manager.h b/hphp/runtime/base/memory-manager.h similarity index 99% rename from hphp/runtime/base/memory_manager.h rename to hphp/runtime/base/memory-manager.h index 3bfe270ba98..fbdc278fad4 100644 --- a/hphp/runtime/base/memory_manager.h +++ b/hphp/runtime/base/memory-manager.h @@ -22,7 +22,7 @@ #include "folly/Memory.h" #include "hphp/util/thread_local.h" -#include "hphp/runtime/base/memory_usage_stats.h" +#include "hphp/runtime/base/memory-usage-stats.h" #include #include diff --git a/hphp/runtime/base/memory_profile.cpp b/hphp/runtime/base/memory-profile.cpp similarity index 98% rename from hphp/runtime/base/memory_profile.cpp rename to hphp/runtime/base/memory-profile.cpp index c9433214a05..94e7c4987b3 100644 --- a/hphp/runtime/base/memory_profile.cpp +++ b/hphp/runtime/base/memory-profile.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/memory_profile.h" +#include "hphp/runtime/base/memory-profile.h" #include "hphp/runtime/base/hphp_value.h" #include "hphp/runtime/vm/jit/translator-inline.h" diff --git a/hphp/runtime/base/memory_profile.h b/hphp/runtime/base/memory-profile.h similarity index 97% rename from hphp/runtime/base/memory_profile.h rename to hphp/runtime/base/memory-profile.h index 6ec39901b03..e7e96940f57 100644 --- a/hphp/runtime/base/memory_profile.h +++ b/hphp/runtime/base/memory-profile.h @@ -17,8 +17,8 @@ #ifndef incl_HPHP_MEMORY_PROFILE_H_ #define incl_HPHP_MEMORY_PROFILE_H_ -#include "hphp/runtime/base/memory_profile.h" -#include "hphp/runtime/base/profile_dump.h" +#include "hphp/runtime/base/memory-profile.h" +#include "hphp/runtime/base/profile-dump.h" #include "hphp/util/thread_local.h" namespace HPHP { diff --git a/hphp/runtime/base/memory_usage_stats.h b/hphp/runtime/base/memory-usage-stats.h similarity index 100% rename from hphp/runtime/base/memory_usage_stats.h rename to hphp/runtime/base/memory-usage-stats.h diff --git a/hphp/runtime/base/object_data.cpp b/hphp/runtime/base/object-data.cpp similarity index 99% rename from hphp/runtime/base/object_data.cpp rename to hphp/runtime/base/object-data.cpp index 9678177ec20..1308679ac6f 100644 --- a/hphp/runtime/base/object_data.cpp +++ b/hphp/runtime/base/object-data.cpp @@ -20,8 +20,8 @@ #include "hphp/runtime/base/externals.h" #include "hphp/runtime/base/variable-serializer.h" #include "hphp/runtime/base/execution_context.h" -#include "hphp/runtime/base/runtime_error.h" -#include "hphp/runtime/base/memory_profile.h" +#include "hphp/runtime/base/runtime-error.h" +#include "hphp/runtime/base/memory-profile.h" #include "hphp/util/lock.h" #include "hphp/runtime/base/class_info.h" #include "hphp/runtime/ext/ext_closure.h" diff --git a/hphp/runtime/base/object_data.h b/hphp/runtime/base/object-data.h similarity index 100% rename from hphp/runtime/base/object_data.h rename to hphp/runtime/base/object-data.h diff --git a/hphp/runtime/base/output-file.cpp b/hphp/runtime/base/output-file.cpp index 6995063bc17..6639959bfb6 100644 --- a/hphp/runtime/base/output-file.cpp +++ b/hphp/runtime/base/output-file.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/base/output-file.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/execution_context.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-error.h" namespace HPHP { diff --git a/hphp/runtime/base/php-stream-wrapper.cpp b/hphp/runtime/base/php-stream-wrapper.cpp index b71fe0a1d61..15e5aaf6769 100644 --- a/hphp/runtime/base/php-stream-wrapper.cpp +++ b/hphp/runtime/base/php-stream-wrapper.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/base/php-stream-wrapper.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-error.h" #include "hphp/runtime/base/plain-file.h" #include "hphp/runtime/base/temp-file.h" #include "hphp/runtime/base/mem-file.h" diff --git a/hphp/runtime/base/plain-file.cpp b/hphp/runtime/base/plain-file.cpp index 6fd51b428ed..970e6408635 100644 --- a/hphp/runtime/base/plain-file.cpp +++ b/hphp/runtime/base/plain-file.cpp @@ -16,7 +16,7 @@ #include "hphp/runtime/base/plain-file.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include namespace HPHP { diff --git a/hphp/runtime/base/pprof_server.cpp b/hphp/runtime/base/pprof-server.cpp similarity index 99% rename from hphp/runtime/base/pprof_server.cpp rename to hphp/runtime/base/pprof-server.cpp index 8532d5d5720..9a7a526f953 100644 --- a/hphp/runtime/base/pprof_server.cpp +++ b/hphp/runtime/base/pprof-server.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/pprof_server.h" +#include "hphp/runtime/base/pprof-server.h" #include "hphp/util/current_executable.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/base/pprof_server.h b/hphp/runtime/base/pprof-server.h similarity index 97% rename from hphp/runtime/base/pprof_server.h rename to hphp/runtime/base/pprof-server.h index bf6f5195d05..4eb9a4c589e 100644 --- a/hphp/runtime/base/pprof_server.h +++ b/hphp/runtime/base/pprof-server.h @@ -18,7 +18,7 @@ #define incl_HPHP_PPROF_HEAP_SERVER_H_ #include "hphp/runtime/server/server.h" -#include "hphp/runtime/base/profile_dump.h" +#include "hphp/runtime/base/profile-dump.h" namespace HPHP { diff --git a/hphp/runtime/base/preg.cpp b/hphp/runtime/base/preg.cpp index 579079b1de4..ee15ed00d28 100644 --- a/hphp/runtime/base/preg.cpp +++ b/hphp/runtime/base/preg.cpp @@ -14,12 +14,12 @@ +----------------------------------------------------------------------+ */ #include "hphp/runtime/base/string-util.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include "hphp/util/lock.h" #include "hphp/util/logger.h" #include #include -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/zend-functions.h" #include "hphp/runtime/base/array_iterator.h" diff --git a/hphp/runtime/base/profile_dump.cpp b/hphp/runtime/base/profile-dump.cpp similarity index 99% rename from hphp/runtime/base/profile_dump.cpp rename to hphp/runtime/base/profile-dump.cpp index db5823ce278..a8a25b7685a 100644 --- a/hphp/runtime/base/profile_dump.cpp +++ b/hphp/runtime/base/profile-dump.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/profile_dump.h" +#include "hphp/runtime/base/profile-dump.h" #include "folly/Format.h" #include "folly/Conv.h" diff --git a/hphp/runtime/base/profile_dump.h b/hphp/runtime/base/profile-dump.h similarity index 100% rename from hphp/runtime/base/profile_dump.h rename to hphp/runtime/base/profile-dump.h diff --git a/hphp/runtime/base/program_functions.cpp b/hphp/runtime/base/program-functions.cpp similarity index 99% rename from hphp/runtime/base/program_functions.cpp rename to hphp/runtime/base/program-functions.cpp index 1fc45828ece..83a076da2bf 100644 --- a/hphp/runtime/base/program_functions.cpp +++ b/hphp/runtime/base/program-functions.cpp @@ -13,7 +13,7 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/program_functions.h" +#include "hphp/runtime/base/program-functions.h" #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/type-conversions.h" @@ -21,8 +21,8 @@ #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/thread-init-fini.h" #include "hphp/runtime/base/code_coverage.h" -#include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/pprof_server.h" +#include "hphp/runtime/base/runtime-option.h" +#include "hphp/runtime/base/pprof-server.h" #include "hphp/util/shared_memory_allocator.h" #include "hphp/runtime/server/pagelet_server.h" #include "hphp/runtime/server/xbox_server.h" @@ -31,8 +31,9 @@ #include "hphp/runtime/server/http_request_handler.h" #include "hphp/runtime/server/admin_request_handler.h" #include "hphp/runtime/server/server_stats.h" +#include "hphp/runtime/server/server_name_indication.h" #include "hphp/runtime/server/server_note.h" -#include "hphp/runtime/base/memory_manager.h" +#include "hphp/runtime/base/memory-manager.h" #include "hphp/util/process.h" #include "hphp/util/capability.h" #include "hphp/util/embedded_data.h" diff --git a/hphp/runtime/base/program-functions.h b/hphp/runtime/base/program-functions.h new file mode 100644 index 00000000000..1f4b731de7d --- /dev/null +++ b/hphp/runtime/base/program-functions.h @@ -0,0 +1,94 @@ +/* + +----------------------------------------------------------------------+ + | HipHop for PHP | + +----------------------------------------------------------------------+ + | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ +*/ + +#ifndef incl_HPHP_PROGRAM_FUNCTIONS_H_ +#define incl_HPHP_PROGRAM_FUNCTIONS_H_ + +#include "hphp/util/base.h" +#include "hphp/runtime/base/types.h" + +namespace HPHP { +/////////////////////////////////////////////////////////////////////////////// + +/** + * Main entry point of the entire program. + */ +int execute_program(int argc, char **argv); +void execute_command_line_begin(int argc, char **argv, int xhprof); +void execute_command_line_end(int xhprof, bool coverage, const char *program); + +/** + * Setting up environment variables. + */ +void process_env_variables(Variant &variables); + +/** + * Inserting a variable into specified symbol table. + * + * "overwrite" parameter is only for cookies: + * According to rfc2965, more specific paths are listed above the less + * specific ones. If we encounter a duplicate cookie name, we should + * skip it, since it is not possible to have the same (plain text) + * cookie name for the same path and we should not overwrite more + * specific cookies with the less specific ones. + */ +void register_variable(Variant &variables, char *name, CVarRef value, + bool overwrite = true); + +String canonicalize_path(CStrRef path, const char* root, int rootLen); + +/** + * Translate hex encode stack into both C++ and PHP frames. + */ +std::string translate_stack(const char *hexencoded, + bool with_frame_numbers = true); + +time_t start_time(); + +/////////////////////////////////////////////////////////////////////////////// +// C++ ffi + +class ExecutionContext; + +void pcre_init(); +void pcre_reinit(); +void hphp_process_init() ATTRIBUTE_COLD; +void hphp_session_init(); + +ExecutionContext* hphp_context_init(); +bool hphp_invoke_simple(const std::string &filename, bool warmupOnly = false); +bool hphp_invoke(ExecutionContext *context, const std::string &cmd, + bool func, CArrRef funcParams, VRefParam funcRet, + const std::string &reqInitFunc, const std::string &reqInitDoc, + bool &error, std::string &errorMsg, + bool once = true, bool warmupOnly = false, + bool richErrorMsg = false); +void hphp_context_exit(ExecutionContext *context, bool psp, + bool shutdown = true, const char *program = nullptr); + +void hphp_thread_exit(); +void hphp_session_exit(); +void hphp_process_exit() ATTRIBUTE_COLD; +bool hphp_is_warmup_enabled(); +std::string get_systemlib(std::string* hhas = nullptr); + +// Generated by hphp/util/generate_buildinfo.sh. +extern const char* const kCompilerId; + +/////////////////////////////////////////////////////////////////////////////// +} + +#endif // incl_HPHP_PROGRAM_FUNCTIONS_H_ diff --git a/hphp/runtime/base/ref_data.cpp b/hphp/runtime/base/ref-data.cpp similarity index 100% rename from hphp/runtime/base/ref_data.cpp rename to hphp/runtime/base/ref-data.cpp diff --git a/hphp/runtime/base/ref_data.h b/hphp/runtime/base/ref-data.h similarity index 100% rename from hphp/runtime/base/ref_data.h rename to hphp/runtime/base/ref-data.h diff --git a/hphp/runtime/base/request_local.h b/hphp/runtime/base/request-local.h similarity index 100% rename from hphp/runtime/base/request_local.h rename to hphp/runtime/base/request-local.h diff --git a/hphp/runtime/base/resource_data.cpp b/hphp/runtime/base/resource-data.cpp similarity index 100% rename from hphp/runtime/base/resource_data.cpp rename to hphp/runtime/base/resource-data.cpp diff --git a/hphp/runtime/base/resource_data.h b/hphp/runtime/base/resource-data.h similarity index 100% rename from hphp/runtime/base/resource_data.h rename to hphp/runtime/base/resource-data.h diff --git a/hphp/runtime/base/runtime_error.cpp b/hphp/runtime/base/runtime-error.cpp similarity index 98% rename from hphp/runtime/base/runtime_error.cpp rename to hphp/runtime/base/runtime-error.cpp index c564f399a38..95c521de371 100644 --- a/hphp/runtime/base/runtime_error.cpp +++ b/hphp/runtime/base/runtime-error.cpp @@ -14,9 +14,9 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-error.h" #include "hphp/runtime/base/execution_context.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/util/logger.h" namespace HPHP { diff --git a/hphp/runtime/base/runtime_error.h b/hphp/runtime/base/runtime-error.h similarity index 100% rename from hphp/runtime/base/runtime_error.h rename to hphp/runtime/base/runtime-error.h diff --git a/hphp/runtime/base/runtime_option.cpp b/hphp/runtime/base/runtime-option.cpp similarity index 99% rename from hphp/runtime/base/runtime_option.cpp rename to hphp/runtime/base/runtime-option.cpp index 2c167534cc7..8377f4602c7 100644 --- a/hphp/runtime/base/runtime_option.cpp +++ b/hphp/runtime/base/runtime-option.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" // Get SIZE_MAX definition. Do this before including any more files, to make // sure that this is the first place that stdint.h is included. diff --git a/hphp/runtime/base/runtime_option.h b/hphp/runtime/base/runtime-option.h similarity index 100% rename from hphp/runtime/base/runtime_option.h rename to hphp/runtime/base/runtime-option.h diff --git a/hphp/runtime/base/shared-map.cpp b/hphp/runtime/base/shared-map.cpp index a3a7d0e2449..e2d1bcc1b62 100644 --- a/hphp/runtime/base/shared-map.cpp +++ b/hphp/runtime/base/shared-map.cpp @@ -18,8 +18,8 @@ #include "hphp/runtime/base/type-conversions.h" #include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/array_init.h" -#include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-option.h" +#include "hphp/runtime/base/runtime-error.h" namespace HPHP { diff --git a/hphp/runtime/base/shared-store-base.cpp b/hphp/runtime/base/shared-store-base.cpp index a9530492540..932874fa0cd 100644 --- a/hphp/runtime/base/shared-store-base.cpp +++ b/hphp/runtime/base/shared-store-base.cpp @@ -16,7 +16,7 @@ #include "hphp/runtime/base/shared-store-base.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/type-conversions.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/server/server_stats.h" diff --git a/hphp/runtime/base/shared-store-stats.cpp b/hphp/runtime/base/shared-store-stats.cpp index f7abab36fcd..9e239122c68 100644 --- a/hphp/runtime/base/shared-store-stats.cpp +++ b/hphp/runtime/base/shared-store-stats.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/base/shared-store-stats.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/util/json.h" #include diff --git a/hphp/runtime/base/shared-variant.cpp b/hphp/runtime/base/shared-variant.cpp index 5abf33ed21d..cf874210e1c 100644 --- a/hphp/runtime/base/shared-variant.cpp +++ b/hphp/runtime/base/shared-variant.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/ext/ext_variable.h" #include "hphp/runtime/ext/ext_apc.h" #include "hphp/runtime/base/shared-map.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/simple-counter.h b/hphp/runtime/base/simple-counter.h index 64f9acbe0f5..2f07ca0e8d5 100644 --- a/hphp/runtime/base/simple-counter.h +++ b/hphp/runtime/base/simple-counter.h @@ -16,7 +16,7 @@ #ifndef incl_HPHP_SIMPLE_COUNTER_H_ #define incl_HPHP_SIMPLE_COUNTER_H_ -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include "hphp/util/stack_trace.h" #include #include diff --git a/hphp/runtime/base/smart-allocator.cpp b/hphp/runtime/base/smart-allocator.cpp index 5e06fb97680..502cfac1975 100644 --- a/hphp/runtime/base/smart-allocator.cpp +++ b/hphp/runtime/base/smart-allocator.cpp @@ -15,10 +15,10 @@ */ #include "hphp/runtime/base/smart-allocator.h" -#include "hphp/runtime/base/memory_manager.h" +#include "hphp/runtime/base/memory-manager.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/server/server_stats.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/util/logger.h" #include "hphp/util/trace.h" diff --git a/hphp/runtime/base/smart-allocator.h b/hphp/runtime/base/smart-allocator.h index 530b79f577c..a4c8eb3b7fc 100644 --- a/hphp/runtime/base/smart-allocator.h +++ b/hphp/runtime/base/smart-allocator.h @@ -26,7 +26,7 @@ #include "hphp/util/lock.h" #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/countable.h" -#include "hphp/runtime/base/memory_usage_stats.h" +#include "hphp/runtime/base/memory-usage-stats.h" #include "hphp/util/trace.h" #include diff --git a/hphp/runtime/base/smart-containers.h b/hphp/runtime/base/smart-containers.h index 36d344a57ea..df69834e390 100644 --- a/hphp/runtime/base/smart-containers.h +++ b/hphp/runtime/base/smart-containers.h @@ -18,7 +18,7 @@ #include -#include "hphp/runtime/base/memory_manager.h" +#include "hphp/runtime/base/memory-manager.h" namespace HPHP { namespace smart { diff --git a/hphp/runtime/base/socket.cpp b/hphp/runtime/base/socket.cpp index a94711b4610..deb286c7996 100644 --- a/hphp/runtime/base/socket.cpp +++ b/hphp/runtime/base/socket.cpp @@ -16,10 +16,10 @@ #include "hphp/runtime/base/socket.h" #include "hphp/runtime/base/exceptions.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/server/server_stats.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include "hphp/util/logger.h" #include #include diff --git a/hphp/runtime/base/ssl-socket.cpp b/hphp/runtime/base/ssl-socket.cpp index b7c13b92bd2..3d941c57a0f 100644 --- a/hphp/runtime/base/ssl-socket.cpp +++ b/hphp/runtime/base/ssl-socket.cpp @@ -16,7 +16,7 @@ #include "hphp/runtime/base/ssl-socket.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-error.h" #include "hphp/util/util.h" #include diff --git a/hphp/runtime/base/stat-cache.cpp b/hphp/runtime/base/stat-cache.cpp index dcf621bfddd..08f87c789a0 100644 --- a/hphp/runtime/base/stat-cache.cpp +++ b/hphp/runtime/base/stat-cache.cpp @@ -23,7 +23,7 @@ #include "hphp/util/trace.h" #include "hphp/util/logger.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/vm/jit/hooks.h" namespace HPHP { diff --git a/hphp/runtime/base/stream-wrapper-registry.cpp b/hphp/runtime/base/stream-wrapper-registry.cpp index 37ec0459733..6e67f332c6e 100644 --- a/hphp/runtime/base/stream-wrapper-registry.cpp +++ b/hphp/runtime/base/stream-wrapper-registry.cpp @@ -20,7 +20,7 @@ #include "hphp/runtime/base/file-stream-wrapper.h" #include "hphp/runtime/base/php-stream-wrapper.h" #include "hphp/runtime/base/http-stream-wrapper.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include #include diff --git a/hphp/runtime/base/string-data.cpp b/hphp/runtime/base/string-data.cpp index 82bcd9c964d..c44109296d2 100644 --- a/hphp/runtime/base/string-data.cpp +++ b/hphp/runtime/base/string-data.cpp @@ -24,8 +24,8 @@ #include "hphp/runtime/base/zend-string.h" #include "hphp/runtime/base/zend-strtod.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-option.h" +#include "hphp/runtime/base/runtime-error.h" #include "hphp/runtime/base/type-conversions.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/vm/jit/target-cache.h" diff --git a/hphp/runtime/base/string-util.cpp b/hphp/runtime/base/string-util.cpp index c2c21892f9d..fb912fe9973 100644 --- a/hphp/runtime/base/string-util.cpp +++ b/hphp/runtime/base/string-util.cpp @@ -18,7 +18,7 @@ #include "hphp/util/zend/zend_html.h" #include "hphp/runtime/base/zend-string.h" #include "hphp/runtime/base/zend-url.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-error.h" #include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/builtin_functions.h" diff --git a/hphp/runtime/base/sweepable.cpp b/hphp/runtime/base/sweepable.cpp index 76e789e944c..6dc48e35bda 100644 --- a/hphp/runtime/base/sweepable.cpp +++ b/hphp/runtime/base/sweepable.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/base/sweepable.h" -#include "hphp/runtime/base/memory_manager.h" +#include "hphp/runtime/base/memory-manager.h" #include "hphp/util/logger.h" namespace HPHP { diff --git a/hphp/runtime/base/temp-file.cpp b/hphp/runtime/base/temp-file.cpp index 0556db8df0f..7ed6b89dc7b 100644 --- a/hphp/runtime/base/temp-file.cpp +++ b/hphp/runtime/base/temp-file.cpp @@ -16,7 +16,7 @@ #include "hphp/runtime/base/temp-file.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-error.h" namespace HPHP { diff --git a/hphp/runtime/base/timezone.cpp b/hphp/runtime/base/timezone.cpp index 7091bc26e70..debd433c9b7 100644 --- a/hphp/runtime/base/timezone.cpp +++ b/hphp/runtime/base/timezone.cpp @@ -20,7 +20,7 @@ #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/type-conversions.h" #include "hphp/runtime/base/builtin_functions.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-error.h" #include "hphp/runtime/base/array_init.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/base/tv-arith.cpp b/hphp/runtime/base/tv-arith.cpp index 9fc2c896c50..6fdbe197a23 100644 --- a/hphp/runtime/base/tv-arith.cpp +++ b/hphp/runtime/base/tv-arith.cpp @@ -19,7 +19,7 @@ #include #include -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-error.h" #include "hphp/runtime/base/tv-conversions.h" namespace HPHP { diff --git a/hphp/runtime/base/type-array.cpp b/hphp/runtime/base/type-array.cpp index a55d3d15de3..684763e69e0 100644 --- a/hphp/runtime/base/type-array.cpp +++ b/hphp/runtime/base/type-array.cpp @@ -26,7 +26,7 @@ #include "hphp/runtime/base/zend-qsort.h" #include "hphp/runtime/base/zend-printf.h" #include "hphp/runtime/base/array_util.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/ext/ext_iconv.h" #include "unicode/coll.h" // icu #include "hphp/util/parser/hphp.tab.hpp" diff --git a/hphp/runtime/base/type-object.h b/hphp/runtime/base/type-object.h index 95e3991de57..6446ec277eb 100644 --- a/hphp/runtime/base/type-object.h +++ b/hphp/runtime/base/type-object.h @@ -23,7 +23,7 @@ #endif #include "hphp/runtime/base/smart-ptr.h" -#include "hphp/runtime/base/object_data.h" +#include "hphp/runtime/base/object-data.h" #include "hphp/runtime/base/type-string.h" #include "hphp/runtime/base/hphp_value.h" diff --git a/hphp/runtime/base/type-resource.h b/hphp/runtime/base/type-resource.h index 090bec4a7eb..1c5226aa1fa 100644 --- a/hphp/runtime/base/type-resource.h +++ b/hphp/runtime/base/type-resource.h @@ -23,7 +23,7 @@ #endif #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/resource_data.h" +#include "hphp/runtime/base/resource-data.h" #include "hphp/runtime/base/sweepable.h" namespace HPHP { diff --git a/hphp/runtime/base/type-variant.cpp b/hphp/runtime/base/type-variant.cpp index 352d3883776..bb4a679c048 100644 --- a/hphp/runtime/base/type-variant.cpp +++ b/hphp/runtime/base/type-variant.cpp @@ -21,7 +21,7 @@ #include "hphp/runtime/base/externals.h" #include "hphp/runtime/base/strings.h" #include "hphp/runtime/ext/ext_variable.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/zend-string.h" #include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/dummy_resource.h" diff --git a/hphp/runtime/base/types.h b/hphp/runtime/base/types.h index c39c9880135..f1b7a0b5e65 100644 --- a/hphp/runtime/base/types.h +++ b/hphp/runtime/base/types.h @@ -23,7 +23,7 @@ #include "hphp/util/mutex.h" #include "hphp/util/case_insensitive.h" #include "hphp/runtime/base/macros.h" -#include "hphp/runtime/base/memory_manager.h" +#include "hphp/runtime/base/memory-manager.h" #include #include diff --git a/hphp/runtime/base/url-file.cpp b/hphp/runtime/base/url-file.cpp index f69a2fc459e..f559ecabe77 100644 --- a/hphp/runtime/base/url-file.cpp +++ b/hphp/runtime/base/url-file.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/base/url-file.h" #include "hphp/runtime/base/hphp_system.h" #include "hphp/runtime/base/http_client.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-error.h" namespace HPHP { diff --git a/hphp/runtime/base/variable-serializer.cpp b/hphp/runtime/base/variable-serializer.cpp index 25fa2922fd2..20725692bba 100644 --- a/hphp/runtime/base/variable-serializer.cpp +++ b/hphp/runtime/base/variable-serializer.cpp @@ -23,9 +23,9 @@ #include "hphp/runtime/base/zend-string.h" #include #include -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/array_iterator.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include "hphp/runtime/ext/ext_json.h" #include "hphp/runtime/ext/ext_collections.h" diff --git a/hphp/runtime/base/zend-collator.cpp b/hphp/runtime/base/zend-collator.cpp index c605f8810d6..453a9e6ba11 100644 --- a/hphp/runtime/base/zend-collator.cpp +++ b/hphp/runtime/base/zend-collator.cpp @@ -21,7 +21,7 @@ #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-error.h" #include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/comparisons.h" diff --git a/hphp/runtime/base/zend-collator.h b/hphp/runtime/base/zend-collator.h index 3b93ccbb016..5f0ecad84ab 100644 --- a/hphp/runtime/base/zend-collator.h +++ b/hphp/runtime/base/zend-collator.h @@ -19,7 +19,7 @@ #define incl_HPHP_ZEND_COLLATOR_H_ #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include "unicode/coll.h" // icu namespace HPHP { diff --git a/hphp/runtime/base/zend-string.cpp b/hphp/runtime/base/zend-string.cpp index 7314eaaad54..b85131b6f20 100644 --- a/hphp/runtime/base/zend-string.cpp +++ b/hphp/runtime/base/zend-string.cpp @@ -27,7 +27,7 @@ #include "hphp/runtime/base/exceptions.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/string-buffer.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-error.h" #include "hphp/runtime/base/type-conversions.h" #include "hphp/runtime/base/builtin_functions.h" diff --git a/hphp/runtime/base/zip-file.cpp b/hphp/runtime/base/zip-file.cpp index ce491aa73bc..f93af562a54 100644 --- a/hphp/runtime/base/zip-file.cpp +++ b/hphp/runtime/base/zip-file.cpp @@ -16,7 +16,7 @@ #include "hphp/runtime/base/zip-file.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-error.h" namespace HPHP { diff --git a/hphp/runtime/debugger/cmd/cmd_heaptrace.cpp b/hphp/runtime/debugger/cmd/cmd_heaptrace.cpp index 6878f474340..e9d595b3d26 100644 --- a/hphp/runtime/debugger/cmd/cmd_heaptrace.cpp +++ b/hphp/runtime/debugger/cmd/cmd_heaptrace.cpp @@ -16,7 +16,7 @@ #include "hphp/runtime/debugger/cmd/cmd_heaptrace.h" -#include "hphp/runtime/base/memory_profile.h" +#include "hphp/runtime/base/memory-profile.h" #include "hphp/runtime/vm/unit.h" namespace HPHP { namespace Eval { diff --git a/hphp/runtime/debugger/cmd/cmd_machine.cpp b/hphp/runtime/debugger/cmd/cmd_machine.cpp index 558c5ef5f6a..095df87223c 100644 --- a/hphp/runtime/debugger/cmd/cmd_machine.cpp +++ b/hphp/runtime/debugger/cmd/cmd_machine.cpp @@ -16,7 +16,7 @@ #include "hphp/runtime/debugger/cmd/cmd_machine.h" #include "hphp/runtime/debugger/cmd/cmd_signal.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/intercept.h" #include "hphp/runtime/base/array_init.h" #include "hphp/runtime/base/libevent_http_client.h" diff --git a/hphp/runtime/debugger/debugger.h b/hphp/runtime/debugger/debugger.h index 692aa34bc56..4991cdbcdce 100644 --- a/hphp/runtime/debugger/debugger.h +++ b/hphp/runtime/debugger/debugger.h @@ -19,7 +19,7 @@ #include "hphp/util/lock.h" #include "hphp/runtime/debugger/debugger_proxy.h" -#include "hphp/runtime/base/program_functions.h" +#include "hphp/runtime/base/program-functions.h" #include "tbb/concurrent_hash_map.h" #include "tbb/concurrent_queue.h" diff --git a/hphp/runtime/debugger/debugger_client.cpp b/hphp/runtime/debugger/debugger_client.cpp index 73b02466592..769d01d9e9f 100644 --- a/hphp/runtime/debugger/debugger_client.cpp +++ b/hphp/runtime/debugger/debugger_client.cpp @@ -55,7 +55,7 @@ static DebuggerClient& getStaticDebuggerClient() { * global mutexes have been initialized before we enter the * constructor. * - * This initialization is thread-safe because program_functions.cpp + * This initialization is thread-safe because program-functions.cpp * must call Debugger::StartClient (which ends up here) before any * additional threads are created. */ diff --git a/hphp/runtime/debugger/debugger_proxy.cpp b/hphp/runtime/debugger/debugger_proxy.cpp index b484f9ab5e1..3661f3867e7 100644 --- a/hphp/runtime/debugger/debugger_proxy.cpp +++ b/hphp/runtime/debugger/debugger_proxy.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/debugger/cmd/cmd_signal.h" #include "hphp/runtime/debugger/cmd/cmd_machine.h" #include "hphp/runtime/debugger/debugger.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/ext/ext_socket.h" #include "hphp/runtime/vm/debugger-hook.h" #include "hphp/util/process.h" diff --git a/hphp/runtime/debugger/debugger_server.cpp b/hphp/runtime/debugger/debugger_server.cpp index 3293e066de1..f1834d37e47 100644 --- a/hphp/runtime/debugger/debugger_server.cpp +++ b/hphp/runtime/debugger/debugger_server.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/debugger/debugger_server.h" #include "hphp/runtime/debugger/debugger_client.h" #include "hphp/runtime/debugger/debugger.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/util/network.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/debugger/dummy_sandbox.cpp b/hphp/runtime/debugger/dummy_sandbox.cpp index 199b302469a..b3b588945a5 100644 --- a/hphp/runtime/debugger/dummy_sandbox.cpp +++ b/hphp/runtime/debugger/dummy_sandbox.cpp @@ -20,7 +20,7 @@ #include "hphp/runtime/debugger/debugger.h" #include "hphp/runtime/debugger/cmd/cmd_signal.h" -#include "hphp/runtime/base/program_functions.h" +#include "hphp/runtime/base/program-functions.h" #include "hphp/runtime/server/source_root_info.h" #include "hphp/runtime/base/externals.h" #include "hphp/runtime/base/hphp_system.h" diff --git a/hphp/runtime/ext/ext_apache.cpp b/hphp/runtime/ext/ext_apache.cpp index 97abff2895a..08c743303b5 100644 --- a/hphp/runtime/ext/ext_apache.cpp +++ b/hphp/runtime/ext/ext_apache.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/ext/ext_apache.h" #include "hphp/runtime/server/http_server.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/server/server_note.h" #include "hphp/runtime/server/transport.h" diff --git a/hphp/runtime/ext/ext_apc.cpp b/hphp/runtime/ext/ext_apc.cpp index 3dff50640a2..7c376e93c6b 100644 --- a/hphp/runtime/ext/ext_apc.cpp +++ b/hphp/runtime/ext/ext_apc.cpp @@ -18,11 +18,11 @@ #include "hphp/runtime/ext/ext_apc.h" #include "hphp/runtime/ext/ext_variable.h" #include "hphp/runtime/ext/ext_fb.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/util/async_job.h" #include "hphp/util/timer.h" #include -#include "hphp/runtime/base/program_functions.h" +#include "hphp/runtime/base/program-functions.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/variable-serializer.h" #include "hphp/util/alloc.h" diff --git a/hphp/runtime/ext/ext_array.cpp b/hphp/runtime/ext/ext_array.cpp index 50f365bc425..9e60bf794b8 100644 --- a/hphp/runtime/ext/ext_array.cpp +++ b/hphp/runtime/ext/ext_array.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/ext/ext_function.h" #include "hphp/runtime/ext/ext_continuation.h" #include "hphp/runtime/ext/ext_collections.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include "hphp/runtime/base/zend-collator.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/sort-flags.h" diff --git a/hphp/runtime/ext/ext_curl.cpp b/hphp/runtime/ext/ext_curl.cpp index 0f5cb13d15a..b9569162287 100644 --- a/hphp/runtime/ext/ext_curl.cpp +++ b/hphp/runtime/ext/ext_curl.cpp @@ -20,7 +20,7 @@ #include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/base/libevent_http_client.h" #include "hphp/runtime/base/curl_tls_workarounds.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/server/server_stats.h" #include "hphp/runtime/vm/jit/translator-inline.h" #include "openssl/ssl.h" diff --git a/hphp/runtime/ext/ext_domdocument.cpp b/hphp/runtime/ext/ext_domdocument.cpp index 42ea7404b59..a274f390e58 100644 --- a/hphp/runtime/ext/ext_domdocument.cpp +++ b/hphp/runtime/ext/ext_domdocument.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/ext/ext_domdocument.h" #include "hphp/runtime/ext/ext_file.h" #include "hphp/runtime/ext/ext_class.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-error.h" #include "hphp/runtime/ext/ext_function.h" #include "hphp/runtime/ext/ext_simplexml.h" #include "hphp/runtime/vm/jit/translator-inline.h" diff --git a/hphp/runtime/ext/ext_fb.cpp b/hphp/runtime/ext/ext_fb.cpp index 01220746534..55bb28575c4 100644 --- a/hphp/runtime/ext/ext_fb.cpp +++ b/hphp/runtime/ext/ext_fb.cpp @@ -26,7 +26,7 @@ #include "hphp/runtime/base/string-util.h" #include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/base/code_coverage.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/intercept.h" #include "hphp/runtime/vm/backup-gc.h" #include "hphp/runtime/vm/unwind.h" diff --git a/hphp/runtime/ext/ext_file.cpp b/hphp/runtime/ext/ext_file.cpp index fea383f7b24..d9879e7513b 100644 --- a/hphp/runtime/ext/ext_file.cpp +++ b/hphp/runtime/ext/ext_file.cpp @@ -20,12 +20,12 @@ #include "hphp/runtime/ext/ext_stream.h" #include "hphp/runtime/ext/ext_options.h" #include "hphp/runtime/ext/ext_hash.h" -#include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-option.h" +#include "hphp/runtime/base/runtime-error.h" #include "hphp/runtime/base/ini_setting.h" #include "hphp/runtime/base/array_util.h" #include "hphp/runtime/base/http_client.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include "hphp/runtime/server/static_content_cache.h" #include "hphp/runtime/base/zend-scanf.h" #include "hphp/runtime/base/pipe.h" diff --git a/hphp/runtime/ext/ext_hotprofiler.cpp b/hphp/runtime/ext/ext_hotprofiler.cpp index 191f98dddfd..d8409d6675e 100644 --- a/hphp/runtime/ext/ext_hotprofiler.cpp +++ b/hphp/runtime/ext/ext_hotprofiler.cpp @@ -16,8 +16,8 @@ */ #include "hphp/runtime/ext/ext_fb.h" -#include "hphp/runtime/base/memory_manager.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/memory-manager.h" +#include "hphp/runtime/base/request-local.h" #include "hphp/runtime/base/zend-math.h" #include "hphp/runtime/server/server_stats.h" #include "hphp/runtime/base/ini_setting.h" diff --git a/hphp/runtime/ext/ext_iconv.cpp b/hphp/runtime/ext/ext_iconv.cpp index 0d601aeec5d..7a621d1e9e7 100644 --- a/hphp/runtime/ext/ext_iconv.cpp +++ b/hphp/runtime/ext/ext_iconv.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/ext/ext_iconv.h" #include "hphp/runtime/base/string-buffer.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include "hphp/runtime/base/zend-functions.h" #include "hphp/runtime/base/zend-string.h" diff --git a/hphp/runtime/ext/ext_image.cpp b/hphp/runtime/ext/ext_image.cpp index 1ed6f5fbf66..d36641f1783 100644 --- a/hphp/runtime/ext/ext_image.cpp +++ b/hphp/runtime/ext/ext_image.cpp @@ -18,8 +18,8 @@ #include "hphp/runtime/ext/ext_file.h" #include "hphp/runtime/base/zend-printf.h" #include "hphp/runtime/base/zend-string.h" -#include "hphp/runtime/base/request_local.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/request-local.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/util/min_max_macros.h" #include /* 1 Tiny font */ diff --git a/hphp/runtime/ext/ext_intl.cpp b/hphp/runtime/ext/ext_intl.cpp index c2939a78137..bd6e9416bfb 100644 --- a/hphp/runtime/ext/ext_intl.cpp +++ b/hphp/runtime/ext/ext_intl.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/ext/ext_intl.h" #include "hphp/runtime/ext/ext_array.h" // for throw_bad_array_exception -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include "hphp/runtime/base/intl_convert.h" #include "hphp/runtime/base/zend-collator.h" #include "hphp/runtime/base/zend-qsort.h" diff --git a/hphp/runtime/ext/ext_mailparse.cpp b/hphp/runtime/ext/ext_mailparse.cpp index d0bc0a0610c..37a0bf39bd3 100644 --- a/hphp/runtime/ext/ext_mailparse.cpp +++ b/hphp/runtime/ext/ext_mailparse.cpp @@ -16,8 +16,8 @@ */ #include "hphp/runtime/ext/ext_mailparse.h" -#include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-option.h" +#include "hphp/runtime/base/runtime-error.h" #include "hphp/runtime/base/temp-file.h" #include "hphp/runtime/ext/ext_process.h" #include "hphp/runtime/ext/mailparse/mime.h" diff --git a/hphp/runtime/ext/ext_mb.cpp b/hphp/runtime/ext/ext_mb.cpp index be2ea042d87..347b0da237d 100644 --- a/hphp/runtime/ext/ext_mb.cpp +++ b/hphp/runtime/ext/ext_mb.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/ext/ext_mb.h" #include "hphp/runtime/base/string-buffer.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include "hphp/runtime/ext/php_unicode.h" #include "hphp/runtime/ext/unicode_data.h" #include "hphp/runtime/ext/ext_process.h" diff --git a/hphp/runtime/ext/ext_memcache.cpp b/hphp/runtime/ext/ext_memcache.cpp index 4c4ad8a20a1..9395b975b73 100644 --- a/hphp/runtime/ext/ext_memcache.cpp +++ b/hphp/runtime/ext/ext_memcache.cpp @@ -16,7 +16,7 @@ */ #include "hphp/runtime/ext/ext_memcache.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include "hphp/runtime/base/ini_setting.h" #include "hphp/system/systemlib.h" diff --git a/hphp/runtime/ext/ext_misc.cpp b/hphp/runtime/ext/ext_misc.cpp index 1fee1c4a3ce..3569b58fefb 100644 --- a/hphp/runtime/ext/ext_misc.cpp +++ b/hphp/runtime/ext/ext_misc.cpp @@ -21,7 +21,7 @@ #include "hphp/runtime/base/exceptions.h" #include "hphp/runtime/base/zend-pack.h" #include "hphp/runtime/base/hphp_system.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/strings.h" #include "hphp/runtime/ext/ext_class.h" #include "hphp/runtime/ext/ext_math.h" diff --git a/hphp/runtime/ext/ext_mysql.cpp b/hphp/runtime/ext/ext_mysql.cpp index d2514542ea9..a67acd45345 100644 --- a/hphp/runtime/ext/ext_mysql.cpp +++ b/hphp/runtime/ext/ext_mysql.cpp @@ -22,9 +22,9 @@ #include "hphp/runtime/ext/ext_network.h" #include "hphp/runtime/ext/mysql_stats.h" #include "hphp/runtime/base/socket.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/server/server_stats.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include "hphp/runtime/base/extended_logger.h" #include "hphp/util/timer.h" #include "hphp/util/db_mysql.h" diff --git a/hphp/runtime/ext/ext_network.cpp b/hphp/runtime/ext/ext_network.cpp index bd07121c841..2ff5f0384b9 100644 --- a/hphp/runtime/ext/ext_network.cpp +++ b/hphp/runtime/ext/ext_network.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/ext/ext_network.h" #include "hphp/runtime/ext/ext_apc.h" #include "hphp/runtime/ext/ext_string.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/server/server_stats.h" #include "hphp/util/lock.h" #include "hphp/runtime/base/file.h" diff --git a/hphp/runtime/ext/ext_options.cpp b/hphp/runtime/ext/ext_options.cpp index 6767da300a8..408a04e99a2 100644 --- a/hphp/runtime/ext/ext_options.cpp +++ b/hphp/runtime/ext/ext_options.cpp @@ -22,11 +22,11 @@ #include "hphp/runtime/ext/ext_error.h" #include "hphp/runtime/ext/ext_function.h" #include "hphp/runtime/ext/extension.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/ini_setting.h" -#include "hphp/runtime/base/memory_manager.h" -#include "hphp/runtime/base/request_local.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/memory-manager.h" +#include "hphp/runtime/base/request-local.h" +#include "hphp/runtime/base/runtime-error.h" #include "hphp/runtime/base/zend-functions.h" #include "hphp/runtime/base/zend-string.h" #include "hphp/runtime/vm/jit/translator-inline.h" diff --git a/hphp/runtime/ext/ext_output.cpp b/hphp/runtime/ext/ext_output.cpp index 2b551b61743..9c34466e2ea 100644 --- a/hphp/runtime/ext/ext_output.cpp +++ b/hphp/runtime/ext/ext_output.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/ext/ext_output.h" #include "hphp/runtime/ext/ext_json.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/hardware_counter.h" #include "hphp/util/lock.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/ext/ext_pdo.cpp b/hphp/runtime/ext/ext_pdo.cpp index 6bb2895fd81..eba680047aa 100644 --- a/hphp/runtime/ext/ext_pdo.cpp +++ b/hphp/runtime/ext/ext_pdo.cpp @@ -24,7 +24,7 @@ #include "hphp/runtime/base/class_info.h" #include "hphp/runtime/base/ini_setting.h" #include "hphp/runtime/base/string-buffer.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include "hphp/runtime/base/macros.h" #include "hphp/system/systemlib.h" diff --git a/hphp/runtime/ext/ext_preg.cpp b/hphp/runtime/ext/ext_preg.cpp index 53ac0fad9a8..a018d08242f 100644 --- a/hphp/runtime/ext/ext_preg.cpp +++ b/hphp/runtime/ext/ext_preg.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/ext/ext_mb.h" #include "hphp/runtime/ext/ext_string.h" #include "hphp/runtime/base/ini_setting.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" namespace HPHP { IMPLEMENT_DEFAULT_EXTENSION(pcre); diff --git a/hphp/runtime/ext/ext_process.cpp b/hphp/runtime/ext/ext_process.cpp index 66cad091901..ed142cc7818 100644 --- a/hphp/runtime/ext/ext_process.cpp +++ b/hphp/runtime/ext/ext_process.cpp @@ -28,7 +28,7 @@ #include "hphp/runtime/base/plain-file.h" #include "hphp/util/light_process.h" #include "hphp/util/logger.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include "hphp/runtime/vm/repo.h" #if !defined(_NSIG) && defined(NSIG) diff --git a/hphp/runtime/ext/ext_reflection.cpp b/hphp/runtime/ext/ext_reflection.cpp index 54e2fbcec00..bfc5761b43b 100644 --- a/hphp/runtime/ext/ext_reflection.cpp +++ b/hphp/runtime/ext/ext_reflection.cpp @@ -20,7 +20,7 @@ #include "hphp/runtime/ext/ext_misc.h" #include "hphp/runtime/base/externals.h" #include "hphp/runtime/base/class_info.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/string-util.h" #include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/util/parser/parser.h" diff --git a/hphp/runtime/ext/ext_server.cpp b/hphp/runtime/ext/ext_server.cpp index cd67b1ccf27..2f9017e33d3 100644 --- a/hphp/runtime/ext/ext_server.cpp +++ b/hphp/runtime/ext/ext_server.cpp @@ -20,7 +20,7 @@ #include "hphp/runtime/server/pagelet_server.h" #include "hphp/runtime/server/xbox_server.h" #include "hphp/runtime/server/http_protocol.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/server/rpc_request_handler.h" diff --git a/hphp/runtime/ext/ext_session.cpp b/hphp/runtime/ext/ext_session.cpp index 33658fc1c0b..49b55924ff9 100644 --- a/hphp/runtime/ext/ext_session.cpp +++ b/hphp/runtime/ext/ext_session.cpp @@ -22,7 +22,7 @@ #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/zend-math.h" #include "hphp/runtime/base/string-buffer.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include "hphp/runtime/base/ini_setting.h" #include "hphp/runtime/base/datetime.h" #include "hphp/runtime/base/variable-unserializer.h" diff --git a/hphp/runtime/ext/ext_simplexml.cpp b/hphp/runtime/ext/ext_simplexml.cpp index 386f6c1faed..92fcd077c24 100644 --- a/hphp/runtime/ext/ext_simplexml.cpp +++ b/hphp/runtime/ext/ext_simplexml.cpp @@ -20,7 +20,7 @@ #include "hphp/runtime/ext/ext_class.h" #include "hphp/runtime/ext/ext_domdocument.h" #include "hphp/runtime/base/class_info.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include "hphp/system/systemlib.h" #ifndef LIBXML2_NEW_BUFFER diff --git a/hphp/runtime/ext/ext_string.cpp b/hphp/runtime/ext/ext_string.cpp index df71969e48e..dc844e8d21a 100644 --- a/hphp/runtime/ext/ext_string.cpp +++ b/hphp/runtime/ext/ext_string.cpp @@ -22,7 +22,7 @@ #include "hphp/runtime/base/zend-printf.h" #include "hphp/runtime/base/zend-scanf.h" #include "hphp/runtime/base/bstring.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include "hphp/util/lock.h" #include #include "hphp/runtime/server/http_request_handler.h" diff --git a/hphp/runtime/ext/ext_thread.cpp b/hphp/runtime/ext/ext_thread.cpp index ac834b45a0e..46a56363714 100644 --- a/hphp/runtime/ext/ext_thread.cpp +++ b/hphp/runtime/ext/ext_thread.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/ext/ext_thread.h" #include "hphp/runtime/server/service_thread.h" #include "hphp/runtime/server/http_server.h" -#include "hphp/runtime/base/program_functions.h" +#include "hphp/runtime/base/program-functions.h" #include "hphp/util/process.h" namespace HPHP { diff --git a/hphp/runtime/ext/mailparse/mime.cpp b/hphp/runtime/ext/mailparse/mime.cpp index 1dc2da41837..5339b65be71 100644 --- a/hphp/runtime/ext/mailparse/mime.cpp +++ b/hphp/runtime/ext/mailparse/mime.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/ext/mailparse/mime.h" #include "hphp/runtime/ext/ext_stream.h" #include "hphp/runtime/base/mem-file.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-error.h" #define MAXLEVELS 20 #define MAXPARTS 300 diff --git a/hphp/runtime/ext/mailparse/rfc822.cpp b/hphp/runtime/ext/mailparse/rfc822.cpp index 202d27876d2..ef6905228b9 100644 --- a/hphp/runtime/ext/mailparse/rfc822.cpp +++ b/hphp/runtime/ext/mailparse/rfc822.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/ext/mailparse/rfc822.h" #include "hphp/runtime/base/string-buffer.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-error.h" #define YYFILL(n) if (YYCURSOR == YYLIMIT) goto stop #define YYCTYPE unsigned char diff --git a/hphp/runtime/ext/soap/soap.h b/hphp/runtime/ext/soap/soap.h index 65d258e68c0..33888414807 100644 --- a/hphp/runtime/ext/soap/soap.h +++ b/hphp/runtime/ext/soap/soap.h @@ -20,7 +20,7 @@ #include "hphp/runtime/base/base_includes.h" #include "hphp/runtime/ext/soap/sdl.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include "hphp/runtime/base/exceptions.h" #include "hphp/runtime/base/http_client.h" #include "hphp/util/lock.h" diff --git a/hphp/runtime/ext/thrift/compact.cpp b/hphp/runtime/ext/thrift/compact.cpp index 8b3fc35c92f..81eee35ed1f 100644 --- a/hphp/runtime/ext/thrift/compact.cpp +++ b/hphp/runtime/ext/thrift/compact.cpp @@ -15,7 +15,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include "hphp/runtime/ext/thrift/transport.h" #include "hphp/runtime/ext/ext_reflection.h" #include "hphp/runtime/ext/ext_thrift.h" diff --git a/hphp/runtime/server/access_log.cpp b/hphp/runtime/server/access_log.cpp index a7c9fc48ecc..56a011fee11 100644 --- a/hphp/runtime/server/access_log.cpp +++ b/hphp/runtime/server/access_log.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/base/datetime.h" #include "hphp/runtime/base/timestamp.h" #include -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/server/server_note.h" #include "hphp/runtime/server/server_stats.h" #include "hphp/runtime/server/request_uri.h" diff --git a/hphp/runtime/server/admin_request_handler.cpp b/hphp/runtime/server/admin_request_handler.cpp index d2dbf209f78..2847d3b74de 100644 --- a/hphp/runtime/server/admin_request_handler.cpp +++ b/hphp/runtime/server/admin_request_handler.cpp @@ -20,15 +20,15 @@ #include "hphp/runtime/server/pagelet_server.h" #include "hphp/runtime/base/http_client.h" #include "hphp/runtime/server/server_stats.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/preg.h" #include "hphp/util/process.h" #include "hphp/util/logger.h" #include "hphp/util/util.h" #include "hphp/util/mutex.h" #include "hphp/runtime/base/datetime.h" -#include "hphp/runtime/base/memory_manager.h" -#include "hphp/runtime/base/program_functions.h" +#include "hphp/runtime/base/memory-manager.h" +#include "hphp/runtime/base/program-functions.h" #include "hphp/runtime/base/shared-store-base.h" #include "hphp/runtime/ext/mysql_stats.h" #include "hphp/runtime/base/shared-store-stats.h" diff --git a/hphp/runtime/server/http_protocol.cpp b/hphp/runtime/server/http_protocol.cpp index 3bc57c07953..968cf2e769e 100644 --- a/hphp/runtime/server/http_protocol.cpp +++ b/hphp/runtime/server/http_protocol.cpp @@ -18,8 +18,8 @@ #include "hphp/runtime/base/hphp_system.h" #include "hphp/runtime/base/zend-url.h" #include "hphp/runtime/base/zend-string.h" -#include "hphp/runtime/base/program_functions.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/program-functions.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/server/source_root_info.h" #include "hphp/runtime/server/request_uri.h" #include "hphp/runtime/server/transport.h" diff --git a/hphp/runtime/server/http_request_handler.cpp b/hphp/runtime/server/http_request_handler.cpp index b0586a18ae6..d31f04a98cb 100644 --- a/hphp/runtime/server/http_request_handler.cpp +++ b/hphp/runtime/server/http_request_handler.cpp @@ -15,9 +15,9 @@ */ #include "hphp/runtime/server/http_request_handler.h" -#include "hphp/runtime/base/program_functions.h" +#include "hphp/runtime/base/program-functions.h" #include "hphp/runtime/base/execution_context.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/util/timer.h" #include "hphp/runtime/server/static_content_cache.h" #include "hphp/runtime/server/dynamic_content_cache.h" diff --git a/hphp/runtime/server/http_server.cpp b/hphp/runtime/server/http_server.cpp index 78d29bcab02..00c8bbd0cd4 100644 --- a/hphp/runtime/server/http_server.cpp +++ b/hphp/runtime/server/http_server.cpp @@ -19,9 +19,9 @@ #include "hphp/runtime/base/class_info.h" #include "hphp/runtime/base/externals.h" #include "hphp/runtime/base/http_client.h" -#include "hphp/runtime/base/memory_manager.h" -#include "hphp/runtime/base/program_functions.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/memory-manager.h" +#include "hphp/runtime/base/program-functions.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/thread-init-fini.h" #include "hphp/runtime/debugger/debugger.h" #include "hphp/runtime/ext/ext_apc.h" diff --git a/hphp/runtime/server/libevent_server.cpp b/hphp/runtime/server/libevent_server.cpp index c6c3180849e..014fb1eda1a 100644 --- a/hphp/runtime/server/libevent_server.cpp +++ b/hphp/runtime/server/libevent_server.cpp @@ -16,8 +16,8 @@ #include "hphp/runtime/server/libevent_server.h" -#include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/memory_manager.h" +#include "hphp/runtime/base/runtime-option.h" +#include "hphp/runtime/base/memory-manager.h" #include "hphp/runtime/base/crash_reporter.h" #include "hphp/runtime/base/url.h" #include "hphp/runtime/server/http_protocol.h" diff --git a/hphp/runtime/server/libevent_transport.cpp b/hphp/runtime/server/libevent_transport.cpp index e476cb1e802..01c0e4b5dbe 100644 --- a/hphp/runtime/server/libevent_transport.cpp +++ b/hphp/runtime/server/libevent_transport.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/server/libevent_transport.h" #include "hphp/runtime/server/libevent_server.h" #include "hphp/runtime/server/server.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/util/util.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/server/pagelet_server.cpp b/hphp/runtime/server/pagelet_server.cpp index 2ad50dd2156..f7a2f445356 100644 --- a/hphp/runtime/server/pagelet_server.cpp +++ b/hphp/runtime/server/pagelet_server.cpp @@ -20,7 +20,7 @@ #include "hphp/runtime/server/upload.h" #include "hphp/runtime/server/job_queue_vm_stack.h" #include "hphp/runtime/base/string-buffer.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/ext/ext_server.h" #include "hphp/util/job_queue.h" diff --git a/hphp/runtime/server/request_uri.cpp b/hphp/runtime/server/request_uri.cpp index 49750360f67..c2d719a50d9 100644 --- a/hphp/runtime/server/request_uri.cpp +++ b/hphp/runtime/server/request_uri.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/server/request_uri.h" #include "hphp/runtime/server/virtual_host.h" #include "hphp/runtime/server/transport.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/server/static_content_cache.h" #include "hphp/runtime/base/string-util.h" diff --git a/hphp/runtime/server/rpc_request_handler.cpp b/hphp/runtime/server/rpc_request_handler.cpp index 094419b66fa..e50be658910 100644 --- a/hphp/runtime/server/rpc_request_handler.cpp +++ b/hphp/runtime/server/rpc_request_handler.cpp @@ -17,8 +17,8 @@ #include "hphp/runtime/server/rpc_request_handler.h" #include "hphp/runtime/server/http_request_handler.h" -#include "hphp/runtime/base/program_functions.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/program-functions.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/server/server_stats.h" #include "hphp/runtime/server/http_protocol.h" #include "hphp/runtime/server/access_log.h" diff --git a/hphp/runtime/server/satellite_server.cpp b/hphp/runtime/server/satellite_server.cpp index b405ada759f..95bfeeb7213 100644 --- a/hphp/runtime/server/satellite_server.cpp +++ b/hphp/runtime/server/satellite_server.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/server/http_request_handler.h" #include "hphp/runtime/server/rpc_request_handler.h" #include "hphp/runtime/server/virtual_host.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/preg.h" #include "hphp/util/util.h" #include "folly/Memory.h" diff --git a/hphp/runtime/server/server_name_indication.cpp b/hphp/runtime/server/server_name_indication.cpp index 5157655a9fa..0c60667a913 100644 --- a/hphp/runtime/server/server_name_indication.cpp +++ b/hphp/runtime/server/server_name_indication.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/server/server_name_indication.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/extended_logger.h" #include "hphp/util/util.h" #include "openssl/ssl.h" diff --git a/hphp/runtime/server/server_note.cpp b/hphp/runtime/server/server_note.cpp index 5e0497a573d..0ecdcb4305e 100644 --- a/hphp/runtime/server/server_note.cpp +++ b/hphp/runtime/server/server_note.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ #include "hphp/runtime/server/server_note.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/server/server_stats.cpp b/hphp/runtime/server/server_stats.cpp index 89a6264bcbd..384bbcee329 100644 --- a/hphp/runtime/server/server_stats.cpp +++ b/hphp/runtime/server/server_stats.cpp @@ -16,9 +16,9 @@ #include "hphp/runtime/server/server_stats.h" #include "hphp/runtime/server/http_server.h" -#include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/program_functions.h" -#include "hphp/runtime/base/memory_manager.h" +#include "hphp/runtime/base/runtime-option.h" +#include "hphp/runtime/base/program-functions.h" +#include "hphp/runtime/base/memory-manager.h" #include "hphp/runtime/base/preg.h" #include "hphp/runtime/base/comparisons.h" #include "hphp/runtime/base/datetime.h" diff --git a/hphp/runtime/server/service_thread.cpp b/hphp/runtime/server/service_thread.cpp index 5299d4a14de..8486df1eae0 100644 --- a/hphp/runtime/server/service_thread.cpp +++ b/hphp/runtime/server/service_thread.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/server/service_thread.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/util/thread_local.h" #include "hphp/util/hdf.h" #include "hphp/runtime/server/replay_transport.h" diff --git a/hphp/runtime/server/source_root_info.cpp b/hphp/runtime/server/source_root_info.cpp index 721d673c88b..65e95eb7f7d 100644 --- a/hphp/runtime/server/source_root_info.cpp +++ b/hphp/runtime/server/source_root_info.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/server/source_root_info.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/preg.h" #include "hphp/runtime/server/http_request_handler.h" #include "hphp/runtime/server/transport.h" diff --git a/hphp/runtime/server/static_content_cache.cpp b/hphp/runtime/server/static_content_cache.cpp index b910d2d564b..54ea4723004 100644 --- a/hphp/runtime/server/static_content_cache.cpp +++ b/hphp/runtime/server/static_content_cache.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/server/static_content_cache.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/util/timer.h" #include "hphp/util/logger.h" #include "hphp/util/process.h" diff --git a/hphp/runtime/server/transport.cpp b/hphp/runtime/server/transport.cpp index 55bdfc7b320..4442af9c1fd 100644 --- a/hphp/runtime/server/transport.cpp +++ b/hphp/runtime/server/transport.cpp @@ -21,7 +21,7 @@ #include "hphp/runtime/base/file.h" #include "hphp/runtime/base/string-util.h" #include "hphp/runtime/base/datetime.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/url.h" #include "hphp/runtime/base/zend-url.h" #include "hphp/runtime/server/access_log.h" diff --git a/hphp/runtime/server/transport.h b/hphp/runtime/server/transport.h index 56cd3d2e12d..1f388f2f7ca 100644 --- a/hphp/runtime/server/transport.h +++ b/hphp/runtime/server/transport.h @@ -22,7 +22,7 @@ #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/debuggable.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/server/upload.cpp b/hphp/runtime/server/upload.cpp index e63de4f3e2c..448f641eaac 100644 --- a/hphp/runtime/server/upload.cpp +++ b/hphp/runtime/server/upload.cpp @@ -16,10 +16,10 @@ */ #include "hphp/runtime/server/upload.h" -#include "hphp/runtime/base/program_functions.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/program-functions.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/hphp_system.h" -#include "hphp/runtime/base/request_local.h" +#include "hphp/runtime/base/request-local.h" #include "hphp/runtime/base/zend-printf.h" #include "hphp/runtime/ext/ext_apc.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/server/virtual_host.cpp b/hphp/runtime/server/virtual_host.cpp index 9c91f1abe99..d029262a066 100644 --- a/hphp/runtime/server/virtual_host.cpp +++ b/hphp/runtime/server/virtual_host.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/base/comparisons.h" #include "hphp/runtime/base/preg.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/comparisons.h" #include "hphp/runtime/base/string-util.h" #include "hphp/util/util.h" diff --git a/hphp/runtime/server/xbox_server.cpp b/hphp/runtime/server/xbox_server.cpp index 1985fb52991..4ae579c73e6 100644 --- a/hphp/runtime/server/xbox_server.cpp +++ b/hphp/runtime/server/xbox_server.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/server/xbox_server.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/server/rpc_request_handler.h" #include "hphp/runtime/server/satellite_server.h" #include "hphp/runtime/base/libevent_http_client.h" diff --git a/hphp/runtime/server/xbox_server.h b/hphp/runtime/server/xbox_server.h index 271498d73f5..851e83677f8 100644 --- a/hphp/runtime/server/xbox_server.h +++ b/hphp/runtime/server/xbox_server.h @@ -18,7 +18,7 @@ #define incl_HPHP_XBOX_SERVER_H_ #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/server/satellite_server.h" namespace HPHP { diff --git a/hphp/runtime/vm/backup-gc.cpp b/hphp/runtime/vm/backup-gc.cpp index c62eee6a810..c89438ca895 100644 --- a/hphp/runtime/vm/backup-gc.cpp +++ b/hphp/runtime/vm/backup-gc.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ #include "hphp/runtime/vm/backup-gc.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-error.h" #include #include @@ -27,7 +27,7 @@ #include "hphp/util/trace.h" #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/smart-allocator.h" -#include "hphp/runtime/base/memory_manager.h" +#include "hphp/runtime/base/memory-manager.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/hphp_array.h" #include "hphp/runtime/vm/class.h" diff --git a/hphp/runtime/vm/bytecode.cpp b/hphp/runtime/vm/bytecode.cpp index f85b60101d1..6a27a68386c 100644 --- a/hphp/runtime/vm/bytecode.cpp +++ b/hphp/runtime/vm/bytecode.cpp @@ -35,7 +35,7 @@ #include "hphp/runtime/base/file-repository.h" #include "hphp/runtime/base/base_includes.h" #include "hphp/runtime/base/execution_context.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/hphp_array.h" #include "hphp/runtime/base/strings.h" #include "hphp/util/util.h" @@ -64,7 +64,7 @@ #include "hphp/runtime/server/source_root_info.h" #include "hphp/runtime/base/extended_logger.h" #include "hphp/runtime/base/tracer.h" -#include "hphp/runtime/base/memory_profile.h" +#include "hphp/runtime/base/memory-profile.h" #include "hphp/system/systemlib.h" #include "hphp/runtime/ext/ext_collections.h" diff --git a/hphp/runtime/vm/debug/elfwriter.cpp b/hphp/runtime/vm/debug/elfwriter.cpp index dc1545bba0a..d9b1c07b1a3 100644 --- a/hphp/runtime/vm/debug/elfwriter.cpp +++ b/hphp/runtime/vm/debug/elfwriter.cpp @@ -26,7 +26,7 @@ #include "hphp/util/trace.h" #include "hphp/util/asm-x64.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/vm/jit/translator-x64.h" using namespace HPHP::Transl; diff --git a/hphp/runtime/vm/funcdict.cpp b/hphp/runtime/vm/funcdict.cpp index 8c7e6f258b6..e67c9bd1286 100644 --- a/hphp/runtime/vm/funcdict.cpp +++ b/hphp/runtime/vm/funcdict.cpp @@ -16,11 +16,11 @@ #include "hphp/runtime/vm/funcdict.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/util/base.h" #include "hphp/runtime/base/execution_context.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-error.h" #include "hphp/runtime/ext_hhvm/ext_hhvm.h" #include "hphp/runtime/vm/jit/translator.h" #include "hphp/runtime/vm/jit/target-cache.h" diff --git a/hphp/runtime/vm/jit/code-gen.cpp b/hphp/runtime/vm/jit/code-gen.cpp index 4f94784a264..211a25a0a45 100755 --- a/hphp/runtime/vm/jit/code-gen.cpp +++ b/hphp/runtime/vm/jit/code-gen.cpp @@ -27,7 +27,7 @@ #include "hphp/runtime/base/hphp_array.h" #include "hphp/runtime/base/comparisons.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/string-data.h" #include "hphp/runtime/base/types.h" #include "hphp/runtime/ext/ext_closure.h" diff --git a/hphp/runtime/vm/jit/ir-factory.h b/hphp/runtime/vm/jit/ir-factory.h index a7585e03644..221c09381c4 100644 --- a/hphp/runtime/vm/jit/ir-factory.h +++ b/hphp/runtime/vm/jit/ir-factory.h @@ -24,7 +24,7 @@ #include "hphp/util/arena.h" #include "hphp/runtime/vm/jit/ir.h" #include "hphp/runtime/vm/jit/cse.h" -#include "hphp/runtime/base/memory_manager.h" +#include "hphp/runtime/base/memory-manager.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/jit/ir-translator.cpp b/hphp/runtime/vm/jit/ir-translator.cpp index dc563e06731..d47ac472dbd 100644 --- a/hphp/runtime/vm/jit/ir-translator.cpp +++ b/hphp/runtime/vm/jit/ir-translator.cpp @@ -28,7 +28,7 @@ #include "hphp/runtime/vm/bytecode.h" #include "hphp/runtime/vm/runtime.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/vm/jit/target-cache.h" #include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/runtime/vm/jit/translator-x64.h" diff --git a/hphp/runtime/vm/jit/region-selection.cpp b/hphp/runtime/vm/jit/region-selection.cpp index be9ab9ed9ae..ee35faaac53 100644 --- a/hphp/runtime/vm/jit/region-selection.cpp +++ b/hphp/runtime/vm/jit/region-selection.cpp @@ -23,7 +23,7 @@ #include "hphp/util/assertions.h" #include "hphp/util/map_walker.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/vm/jit/normalized-instruction.h" #include "hphp/runtime/vm/jit/tracelet.h" #include "hphp/runtime/vm/jit/translator.h" diff --git a/hphp/runtime/vm/jit/translator-x64.cpp b/hphp/runtime/vm/jit/translator-x64.cpp index b838a4fece2..eb26d86328b 100644 --- a/hphp/runtime/vm/jit/translator-x64.cpp +++ b/hphp/runtime/vm/jit/translator-x64.cpp @@ -72,7 +72,7 @@ #include "hphp/runtime/vm/runtime.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/execution_context.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/strings.h" #include "hphp/runtime/base/strings.h" #include "hphp/runtime/server/source_root_info.h" diff --git a/hphp/runtime/vm/jit/translator.cpp b/hphp/runtime/vm/jit/translator.cpp index b94d392f178..717ca4ca8fd 100755 --- a/hphp/runtime/vm/jit/translator.cpp +++ b/hphp/runtime/vm/jit/translator.cpp @@ -32,7 +32,7 @@ #include "hphp/util/biased_coin.h" #include "hphp/util/map_walker.h" #include "hphp/runtime/base/file-repository.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/stats.h" #include "hphp/runtime/base/types.h" #include "hphp/runtime/ext/ext_continuation.h" diff --git a/hphp/runtime/vm/name-value-table-wrapper.cpp b/hphp/runtime/vm/name-value-table-wrapper.cpp index fb43a85b9db..6d7ef79939d 100644 --- a/hphp/runtime/vm/name-value-table-wrapper.cpp +++ b/hphp/runtime/vm/name-value-table-wrapper.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/vm/name-value-table-wrapper.h" -#include "hphp/runtime/base/runtime_error.h" +#include "hphp/runtime/base/runtime-error.h" #include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/array_init.h" diff --git a/hphp/runtime/vm/object-allocator-sizes.cpp b/hphp/runtime/vm/object-allocator-sizes.cpp index 0ba866f6312..5d2c71e859c 100644 --- a/hphp/runtime/vm/object-allocator-sizes.cpp +++ b/hphp/runtime/vm/object-allocator-sizes.cpp @@ -16,7 +16,7 @@ #include "hphp/runtime/vm/object-allocator-sizes.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/object_data.h" +#include "hphp/runtime/base/object-data.h" #include "hphp/runtime/base/smart-allocator.h" namespace HPHP { diff --git a/hphp/runtime/vm/type-profile.cpp b/hphp/runtime/vm/type-profile.cpp index 5e81ff29396..24415f7c78f 100644 --- a/hphp/runtime/vm/type-profile.cpp +++ b/hphp/runtime/vm/type-profile.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ #include "hphp/runtime/vm/type-profile.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/stats.h" #include "hphp/runtime/vm/jit/translator.h" #include "hphp/util/trace.h" diff --git a/hphp/runtime/vm/unit.h b/hphp/runtime/vm/unit.h index 79baf7c24f8..810aef7c341 100644 --- a/hphp/runtime/vm/unit.h +++ b/hphp/runtime/vm/unit.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_VM_UNIT_H_ #define incl_HPHP_VM_UNIT_H_ -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/vm/hhbc.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/vm/repo-helpers.h" diff --git a/hphp/test/ext/main.cpp b/hphp/test/ext/main.cpp index 9e2792f70ce..dc2bcd9e82d 100644 --- a/hphp/test/ext/main.cpp +++ b/hphp/test/ext/main.cpp @@ -16,7 +16,7 @@ #include "hphp/test/ext/test.h" #include "hphp/util/logger.h" -#include "hphp/runtime/base/program_functions.h" +#include "hphp/runtime/base/program-functions.h" #include #include "hphp/hhvm/process_init.h" diff --git a/hphp/test/ext/test_code_run.cpp b/hphp/test/ext/test_code_run.cpp index c0511f2ab06..2d2756614a6 100644 --- a/hphp/test/ext/test_code_run.cpp +++ b/hphp/test/ext/test_code_run.cpp @@ -23,7 +23,7 @@ #include "hphp/util/util.h" #include "hphp/util/process.h" #include "hphp/compiler/option.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include #include "hphp/test/ext/test_mysql_info.h" #include "hphp/runtime/ext/ext_file.h" diff --git a/hphp/test/ext/test_cpp_base.cpp b/hphp/test/ext/test_cpp_base.cpp index 7733730d5bc..57f1d958adf 100644 --- a/hphp/test/ext/test_cpp_base.cpp +++ b/hphp/test/ext/test_cpp_base.cpp @@ -17,14 +17,14 @@ #include "hphp/test/ext/test_cpp_base.h" #include "hphp/runtime/base/base_includes.h" #include "hphp/util/logger.h" -#include "hphp/runtime/base/memory_manager.h" +#include "hphp/runtime/base/memory-manager.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/ext/ext_variable.h" #include "hphp/runtime/ext/ext_apc.h" #include "hphp/runtime/ext/ext_mysql.h" #include "hphp/runtime/ext/ext_curl.h" #include "hphp/runtime/base/shared-store-base.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/server/ip_block_map.h" #include "hphp/test/ext/test_mysql_info.h" #include "hphp/system/systemlib.h" diff --git a/hphp/test/ext/test_cpp_ext.h b/hphp/test/ext/test_cpp_ext.h index eb4b5f630da..9fe594f518b 100644 --- a/hphp/test/ext/test_cpp_ext.h +++ b/hphp/test/ext/test_cpp_ext.h @@ -19,7 +19,7 @@ #include "hphp/test/ext/test_cpp_base.h" #include "hphp/runtime/ext/ext_variable.h" // we frequently need to call f_var_dump() -#include "hphp/runtime/base/program_functions.h" +#include "hphp/runtime/base/program-functions.h" #include "hphp/runtime/ext/ext_misc.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/ext/test_ext_mysql.cpp b/hphp/test/ext/test_ext_mysql.cpp index 8e7d3c40c20..4dec40bb813 100644 --- a/hphp/test/ext/test_ext_mysql.cpp +++ b/hphp/test/ext/test_ext_mysql.cpp @@ -16,7 +16,7 @@ #include "hphp/test/ext/test_ext_mysql.h" #include "hphp/runtime/ext/ext_mysql.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/test/ext/test_mysql_info.h" #include "errmsg.h" diff --git a/hphp/test/ext/test_ext_server.cpp b/hphp/test/ext/test_ext_server.cpp index c4848d976d0..92967ae8c4c 100644 --- a/hphp/test/ext/test_ext_server.cpp +++ b/hphp/test/ext/test_ext_server.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/ext/ext_server.h" #include "hphp/runtime/server/pagelet_server.h" #include "hphp/runtime/server/xbox_server.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/ext/ext_file.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/ext/test_server.cpp b/hphp/test/ext/test_server.cpp index dd9c61b0a73..6a1c0fb38c8 100644 --- a/hphp/test/ext/test_server.cpp +++ b/hphp/test/ext/test_server.cpp @@ -27,7 +27,7 @@ #include "hphp/runtime/ext/ext_options.h" #include "hphp/runtime/server/http_request_handler.h" #include "hphp/runtime/base/http_client.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/server/libevent_server.h" #include diff --git a/hphp/util/asm-x64.cpp b/hphp/util/asm-x64.cpp index 3bbcb05d208..d69f29b9cbb 100644 --- a/hphp/util/asm-x64.cpp +++ b/hphp/util/asm-x64.cpp @@ -27,7 +27,7 @@ #include "hphp/util/assertions.h" #include "hphp/util/maphuge.h" -#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/runtime-option.h" namespace HPHP { namespace Transl { -- 2.11.4.GIT