From da017bab0e11db9f2611916da7f77b5e061a1137 Mon Sep 17 00:00:00 2001 From: Jordan DeLong Date: Mon, 16 Jun 2014 19:59:39 -0700 Subject: [PATCH] Rename file-repository to unit-cache Summary: This is just a rename diff. It's on top of everything else so we can choose different names without me needing to rebase, if anyone has a better naming idea. This seems like a reasonable name, although both resolveVmInclude and mangleUnitMd5 feel slightly out of place now (but resolveVmInclude (and resolve_include) are pretty convoluted for historical reasons and deserving of their own cleanup pass anyway, which I'm going to consider out of scope for now since it's not causing bugs as far as we know ...). Reviewed By: @mxw Differential Revision: D1386894 --- hphp/compiler/analysis/emitter.cpp | 2 +- hphp/compiler/parser/parser.cpp | 2 +- hphp/hhvm/process-init.cpp | 2 +- hphp/runtime/base/autoload-handler.cpp | 2 +- hphp/runtime/base/builtin-functions.cpp | 2 +- hphp/runtime/base/execution-context.cpp | 2 +- hphp/runtime/base/file-stream-wrapper.cpp | 2 +- hphp/runtime/base/intercept.cpp | 2 +- hphp/runtime/base/profile-dump.cpp | 2 +- hphp/runtime/base/program-functions.cpp | 2 +- hphp/runtime/base/{file-repository.cpp => unit-cache.cpp} | 2 +- hphp/runtime/base/{file-repository.h => unit-cache.h} | 4 ++-- hphp/runtime/ext/ext_fb.cpp | 2 +- hphp/runtime/ext/hh/ext_hh.cpp | 2 +- hphp/runtime/ext/std/ext_std_options.cpp | 2 +- hphp/runtime/ext/stream/ext_stream.cpp | 2 +- hphp/runtime/server/admin-request-handler.cpp | 2 +- hphp/runtime/vm/bytecode.cpp | 2 +- hphp/runtime/vm/debugger-hook.cpp | 2 +- hphp/runtime/vm/func-emitter.cpp | 2 +- hphp/runtime/vm/jit/translator.cpp | 11 +++++------ hphp/runtime/vm/unit.cpp | 2 +- 22 files changed, 27 insertions(+), 28 deletions(-) rename hphp/runtime/base/{file-repository.cpp => unit-cache.cpp} (99%) rename hphp/runtime/base/{file-repository.h => unit-cache.h} (97%) diff --git a/hphp/compiler/analysis/emitter.cpp b/hphp/compiler/analysis/emitter.cpp index f2ced714d15..e6b0504b82b 100644 --- a/hphp/compiler/analysis/emitter.cpp +++ b/hphp/compiler/analysis/emitter.cpp @@ -114,7 +114,7 @@ #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/file-repository.h" +#include "hphp/runtime/base/unit-cache.h" #include "hphp/runtime/ext_hhvm/ext_hhvm.h" #include "hphp/runtime/ext_zend_compat/hhvm/zend-wrap-func.h" #include "hphp/runtime/vm/preclass-emitter.h" diff --git a/hphp/compiler/parser/parser.cpp b/hphp/compiler/parser/parser.cpp index e4235fde2fa..9bde855fe33 100644 --- a/hphp/compiler/parser/parser.cpp +++ b/hphp/compiler/parser/parser.cpp @@ -99,7 +99,7 @@ #include "hphp/util/text-util.h" #include "hphp/util/string-vsnprintf.h" -#include "hphp/runtime/base/file-repository.h" +#include "hphp/runtime/base/unit-cache.h" #ifdef FACEBOOK #include "hphp/facebook/src/compiler/fb_compiler_hooks.h" diff --git a/hphp/hhvm/process-init.cpp b/hphp/hhvm/process-init.cpp index 7c1c77395cd..82c3375bc00 100644 --- a/hphp/hhvm/process-init.cpp +++ b/hphp/hhvm/process-init.cpp @@ -28,7 +28,7 @@ #include "hphp/runtime/base/rds.h" #include "hphp/runtime/vm/jit/fixup.h" #include "hphp/runtime/vm/jit/mc-generator.h" -#include "hphp/runtime/base/file-repository.h" +#include "hphp/runtime/base/unit-cache.h" #include "hphp/system/systemlib.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/base/autoload-handler.cpp b/hphp/runtime/base/autoload-handler.cpp index d42d517d28a..0e6548781e9 100644 --- a/hphp/runtime/base/autoload-handler.cpp +++ b/hphp/runtime/base/autoload-handler.cpp @@ -22,7 +22,7 @@ #include "hphp/runtime/ext/ext_string.h" #include "hphp/runtime/base/type-string.h" #include "hphp/runtime/base/container-functions.h" -#include "hphp/runtime/base/file-repository.h" +#include "hphp/runtime/base/unit-cache.h" #include "hphp/runtime/vm/unit.h" #include "hphp/runtime/vm/unit-util.h" #include "hphp/runtime/vm/vm-regs.h" diff --git a/hphp/runtime/base/builtin-functions.cpp b/hphp/runtime/base/builtin-functions.cpp index f1e46b1142b..74411b629f5 100644 --- a/hphp/runtime/base/builtin-functions.cpp +++ b/hphp/runtime/base/builtin-functions.cpp @@ -24,7 +24,7 @@ #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" +#include "hphp/runtime/base/unit-cache.h" #include "hphp/runtime/debugger/debugger.h" #include "hphp/runtime/ext/ext_process.h" #include "hphp/runtime/ext/ext_function.h" diff --git a/hphp/runtime/base/execution-context.cpp b/hphp/runtime/base/execution-context.cpp index 6beb82b17ed..744c8eb69d1 100644 --- a/hphp/runtime/base/execution-context.cpp +++ b/hphp/runtime/base/execution-context.cpp @@ -42,7 +42,7 @@ #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" +#include "hphp/runtime/base/unit-cache.h" #include "hphp/runtime/ext/ext_string.h" #include "hphp/runtime/ext/std/ext_std_output.h" #include "hphp/runtime/vm/jit/translator-inline.h" diff --git a/hphp/runtime/base/file-stream-wrapper.cpp b/hphp/runtime/base/file-stream-wrapper.cpp index ce0ef76c6e0..7dd8a68f757 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/file-repository.h" +#include "hphp/runtime/base/unit-cache.h" #include "hphp/runtime/base/runtime-error.h" #include "hphp/runtime/base/plain-file.h" #include "hphp/runtime/base/directory.h" diff --git a/hphp/runtime/base/intercept.cpp b/hphp/runtime/base/intercept.cpp index 39abfeb71e2..cfe397ecf45 100644 --- a/hphp/runtime/base/intercept.cpp +++ b/hphp/runtime/base/intercept.cpp @@ -31,7 +31,7 @@ #include "hphp/parser/parser.h" #include "hphp/util/lock.h" -#include "hphp/runtime/base/file-repository.h" +#include "hphp/runtime/base/unit-cache.h" #include "hphp/util/trace.h" using namespace HPHP::Trace; diff --git a/hphp/runtime/base/profile-dump.cpp b/hphp/runtime/base/profile-dump.cpp index fa5287d42b1..86c385bf2bd 100644 --- a/hphp/runtime/base/profile-dump.cpp +++ b/hphp/runtime/base/profile-dump.cpp @@ -22,7 +22,7 @@ #include "folly/Format.h" #include "folly/Conv.h" #include "hphp/runtime/base/execution-context.h" -#include "hphp/runtime/base/file-repository.h" +#include "hphp/runtime/base/unit-cache.h" #include "hphp/runtime/vm/treadmill.h" namespace HPHP { diff --git a/hphp/runtime/base/program-functions.cpp b/hphp/runtime/base/program-functions.cpp index a1ecdc3e700..3d9adcde22f 100644 --- a/hphp/runtime/base/program-functions.cpp +++ b/hphp/runtime/base/program-functions.cpp @@ -78,7 +78,7 @@ #include #include "hphp/runtime/base/arch.h" -#include "hphp/runtime/base/file-repository.h" +#include "hphp/runtime/base/unit-cache.h" #include "hphp/runtime/vm/runtime.h" #include "hphp/runtime/vm/runtime-type-profiler.h" diff --git a/hphp/runtime/base/file-repository.cpp b/hphp/runtime/base/unit-cache.cpp similarity index 99% rename from hphp/runtime/base/file-repository.cpp rename to hphp/runtime/base/unit-cache.cpp index f8bdef9e008..16abae91eca 100644 --- a/hphp/runtime/base/file-repository.cpp +++ b/hphp/runtime/base/unit-cache.cpp @@ -13,7 +13,7 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/file-repository.h" +#include "hphp/runtime/base/unit-cache.h" #include #include diff --git a/hphp/runtime/base/file-repository.h b/hphp/runtime/base/unit-cache.h similarity index 97% rename from hphp/runtime/base/file-repository.h rename to hphp/runtime/base/unit-cache.h index 0434a3f3327..acfddae0716 100644 --- a/hphp/runtime/base/file-repository.h +++ b/hphp/runtime/base/unit-cache.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_HPHP_FILE_REPOSITORY_H_ -#define incl_HPHP_FILE_REPOSITORY_H_ +#ifndef incl_HPHP_UNIT_CACHE_H_ +#define incl_HPHP_UNIT_CACHE_H_ #include diff --git a/hphp/runtime/ext/ext_fb.cpp b/hphp/runtime/ext/ext_fb.cpp index 324a4de4a89..a28ada782e5 100644 --- a/hphp/runtime/ext/ext_fb.cpp +++ b/hphp/runtime/ext/ext_fb.cpp @@ -33,7 +33,7 @@ #include "hphp/util/logger.h" #include "hphp/runtime/base/code-coverage.h" #include "hphp/runtime/base/externals.h" -#include "hphp/runtime/base/file-repository.h" +#include "hphp/runtime/base/unit-cache.h" #include "hphp/runtime/base/intercept.h" #include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/stat-cache.h" diff --git a/hphp/runtime/ext/hh/ext_hh.cpp b/hphp/runtime/ext/hh/ext_hh.cpp index 873a28bf266..9fb69871581 100644 --- a/hphp/runtime/ext/hh/ext_hh.cpp +++ b/hphp/runtime/ext/hh/ext_hh.cpp @@ -20,7 +20,7 @@ #include #include -#include "hphp/runtime/base/file-repository.h" +#include "hphp/runtime/base/unit-cache.h" #include "hphp/runtime/base/autoload-handler.h" namespace HPHP { diff --git a/hphp/runtime/ext/std/ext_std_options.cpp b/hphp/runtime/ext/std/ext_std_options.cpp index a71b808436e..baac3f011df 100644 --- a/hphp/runtime/ext/std/ext_std_options.cpp +++ b/hphp/runtime/ext/std/ext_std_options.cpp @@ -33,7 +33,7 @@ #include "hphp/runtime/ext/extension.h" #include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/php-globals.h" -#include "hphp/runtime/base/file-repository.h" +#include "hphp/runtime/base/unit-cache.h" #include "hphp/runtime/base/ini-setting.h" #include "hphp/runtime/base/memory-manager.h" #include "hphp/runtime/base/request-local.h" diff --git a/hphp/runtime/ext/stream/ext_stream.cpp b/hphp/runtime/ext/stream/ext_stream.cpp index 078fd96eacc..84f23fa951d 100644 --- a/hphp/runtime/ext/stream/ext_stream.cpp +++ b/hphp/runtime/ext/stream/ext_stream.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/ext/stream/ext_stream-user-filters.h" #include "hphp/runtime/ext/ext_socket.h" #include "hphp/runtime/base/socket.h" -#include "hphp/runtime/base/file-repository.h" +#include "hphp/runtime/base/unit-cache.h" #include "hphp/runtime/base/plain-file.h" #include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/base/zend-printf.h" diff --git a/hphp/runtime/server/admin-request-handler.cpp b/hphp/runtime/server/admin-request-handler.cpp index 1e178c12686..f6aa067d6a5 100644 --- a/hphp/runtime/server/admin-request-handler.cpp +++ b/hphp/runtime/server/admin-request-handler.cpp @@ -26,7 +26,7 @@ #include "hphp/runtime/base/file-util.h" #endif -#include "hphp/runtime/base/file-repository.h" +#include "hphp/runtime/base/unit-cache.h" #include "hphp/runtime/server/http-server.h" #include "hphp/runtime/server/pagelet-server.h" #include "hphp/runtime/base/http-client.h" diff --git a/hphp/runtime/vm/bytecode.cpp b/hphp/runtime/vm/bytecode.cpp index 6f760d995ad..b8e9fd8144d 100644 --- a/hphp/runtime/vm/bytecode.cpp +++ b/hphp/runtime/vm/bytecode.cpp @@ -46,7 +46,7 @@ #include "hphp/runtime/vm/member-operations.h" #include "hphp/runtime/base/class-info.h" #include "hphp/runtime/base/code-coverage.h" -#include "hphp/runtime/base/file-repository.h" +#include "hphp/runtime/base/unit-cache.h" #include "hphp/runtime/base/base-includes.h" #include "hphp/runtime/base/execution-context.h" #include "hphp/runtime/base/runtime-option.h" diff --git a/hphp/runtime/vm/debugger-hook.cpp b/hphp/runtime/vm/debugger-hook.cpp index 82c7f8f300e..4e2be0095ab 100644 --- a/hphp/runtime/vm/debugger-hook.cpp +++ b/hphp/runtime/vm/debugger-hook.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/debugger/break_point.h" #include "hphp/runtime/debugger/debugger.h" #include "hphp/runtime/debugger/debugger_proxy.h" -#include "hphp/runtime/base/file-repository.h" +#include "hphp/runtime/base/unit-cache.h" #include "hphp/runtime/ext/ext_generator.h" #include "hphp/runtime/vm/unit.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/vm/func-emitter.cpp b/hphp/runtime/vm/func-emitter.cpp index 3ebaa13a29d..4f085a7e533 100644 --- a/hphp/runtime/vm/func-emitter.cpp +++ b/hphp/runtime/vm/func-emitter.cpp @@ -19,7 +19,7 @@ #include "hphp/parser/parser.h" #include "hphp/runtime/base/base-includes.h" -#include "hphp/runtime/base/file-repository.h" +#include "hphp/runtime/base/unit-cache.h" #include "hphp/runtime/base/rds.h" #include "hphp/runtime/base/strings.h" diff --git a/hphp/runtime/vm/jit/translator.cpp b/hphp/runtime/vm/jit/translator.cpp index 200aa16af02..b9b460c8d06 100644 --- a/hphp/runtime/vm/jit/translator.cpp +++ b/hphp/runtime/vm/jit/translator.cpp @@ -33,10 +33,12 @@ #include "folly/Conv.h" #include "folly/MapUtil.h" -#include "hphp/runtime/base/arch.h" -#include "hphp/runtime/base/file-repository.h" -#include "hphp/runtime/base/rds.h" +#include "hphp/util/trace.h" +#include "hphp/util/map-walker.h" +#include "hphp/util/ringbuffer.h" #include "hphp/runtime/base/repo-auth-type-codec.h" +#include "hphp/runtime/base/unit-cache.h" +#include "hphp/runtime/base/arch.h" #include "hphp/runtime/base/runtime-option.h" #include "hphp/runtime/base/stats.h" #include "hphp/runtime/base/types.h" @@ -58,9 +60,6 @@ #include "hphp/runtime/vm/runtime.h" #include "hphp/runtime/vm/treadmill.h" #include "hphp/runtime/vm/type-profile.h" -#include "hphp/util/map-walker.h" -#include "hphp/util/ringbuffer.h" -#include "hphp/util/trace.h" #define KindOfUnknown DontUseKindOfUnknownInThisFile #define KindOfInvalid DontUseKindOfInvalidInThisFile diff --git a/hphp/runtime/vm/unit.cpp b/hphp/runtime/vm/unit.cpp index 12e5363fc21..328f47160ac 100644 --- a/hphp/runtime/vm/unit.cpp +++ b/hphp/runtime/vm/unit.cpp @@ -29,7 +29,7 @@ #include "hphp/runtime/server/source-root-info.h" -#include "hphp/runtime/base/file-repository.h" +#include "hphp/runtime/base/unit-cache.h" #include "hphp/runtime/base/rds.h" #include "hphp/runtime/base/stats.h" #include "hphp/runtime/base/strings.h" -- 2.11.4.GIT