facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2025-01-08 22:56:44 +03:00
Code Issues Projects Releases Wiki Activity

Move EdenStats into eden/fs/tracing/

Browse Source 
Summary:
I want to use EdenStats in eden/fs/store/. EdenStats currently lives in eden/fs/fuse/, and making eden/fs/store/ depend upon eden/fs/fuse/ is confusing. (It's also confusing that some code in eden/fs/fuse/ is used on Windows.)

Reorganize the code: move EdenStats into eden/fs/tracing/.

This diff should not change behavior.

Reviewed By: chadaustin

Differential Revision: D14677337

fbshipit-source-id: af26d214bcc3a9919920fbd4e59e6098fe4e3834
This commit is contained in:
Matt Glazar 2019-04-01 17:37:54 -07:00 committed by Facebook Github Bot
parent 5eb2009088
commit d9e4eabc9d
11 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eden/fs/fuse/RequestData.h
View File

@ -12,9 +12,9 @@
#include <folly/io/async/Request.h>
#include <atomic>
#include <utility>
#include "eden/fs/fuse/EdenStats.h"
#include "eden/fs/fuse/FuseChannel.h"
#include "eden/fs/fuse/FuseTypes.h"
#include "eden/fs/tracing/EdenStats.h"
namespace facebook {
namespace eden {

2
eden/fs/fuse/fuse_tester/main.cpp
View File

@ -17,11 +17,11 @@
#include <signal.h>
#include <sysexits.h>
#include "eden/fs/fuse/Dispatcher.h"
#include "eden/fs/fuse/EdenStats.h"
#include "eden/fs/fuse/FuseChannel.h"
#include "eden/fs/fuse/privhelper/PrivHelper.h"
#include "eden/fs/fuse/privhelper/PrivHelperImpl.h"
#include "eden/fs/fuse/privhelper/UserInfo.h"
#include "eden/fs/tracing/EdenStats.h"
#include "eden/fs/utils/PathFuncs.h"
#include "eden/fs/utils/ProcessNameCache.h"

2
eden/fs/fuse/test/FuseChannelTest.cpp
View File

@ -15,10 +15,10 @@
#include <gtest/gtest.h>
#include <unordered_map>
#include "eden/fs/fuse/Dispatcher.h"
#include "eden/fs/fuse/EdenStats.h"
#include "eden/fs/fuse/RequestData.h"
#include "eden/fs/testharness/FakeFuse.h"
#include "eden/fs/testharness/TestDispatcher.h"
#include "eden/fs/tracing/EdenStats.h"
#include "eden/fs/utils/ProcessNameCache.h"
using namespace facebook::eden;

2
eden/fs/inodes/ServerState.h
View File

@ -15,7 +15,7 @@
#include "eden/fs/config/CachedParsedFileMonitor.h"
#include "eden/fs/config/ReloadableConfig.h"
#include "eden/fs/fuse/EdenStats.h"
#include "eden/fs/tracing/EdenStats.h"
#ifdef EDEN_WIN
#include "eden/win/fs/utils/Stub.h" // @manual
#include "eden/win/fs/utils/UserInfo.h" // @manual

1
eden/fs/service/EdenServer.cpp
View File

@ -24,6 +24,7 @@
#include "common/stats/ServiceData.h"
#include "eden/fs/config/ClientConfig.h"
#include "eden/fs/tracing/EdenStats.h"
#ifdef EDEN_WIN
#include "eden/win/fs/mount/EdenMount.h" // @manual
#include "eden/win/fs/service/StartupLogger.h" // @manual

2
eden/fs/service/EdenServer.h
View File

@ -26,7 +26,7 @@
#include <unordered_map>
#include <vector>
#include "eden/fs/config/EdenConfig.h"
#include "eden/fs/fuse/EdenStats.h"
#include "eden/fs/tracing/EdenStats.h"
#ifdef EDEN_WIN
#include "eden/win/fs/mount/EdenMount.h" // @manual
#include "eden/win/fs/utils/Stub.h" // @manual

2
eden/fs/fuse/EdenStats.cpp → eden/fs/tracing/EdenStats.cpp
View File

@ -7,7 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory.
*
*/
#include "eden/fs/fuse/EdenStats.h"
#include "eden/fs/tracing/EdenStats.h"
#include <folly/container/Array.h>
#include <chrono>

0
eden/fs/fuse/EdenStats.h → eden/fs/tracing/EdenStats.h
View File

6
eden/win/fs/edenfs.vcxproj
View File

@ -162,7 +162,6 @@
<ClCompile Include="..\..\fs\config\ClientConfig.cpp" />
<ClCompile Include="..\..\fs\config\EdenConfig.cpp" />
<ClCompile Include="..\..\fs\config\FileChangeMonitor.cpp" />
<ClCompile Include="..\..\fs\fuse\EdenStats.cpp" />
<ClCompile Include="..\..\fs\inodes\ServerState.cpp" />
<ClCompile Include="..\..\fs\journal\Journal.cpp" />
<ClCompile Include="..\..\fs\journal\JournalDelta.cpp" />
@ -197,6 +196,7 @@
<ClCompile Include="..\..\fs\store\SerializedBlobMetadata.cpp" />
<ClCompile Include="..\..\fs\store\SqliteLocalStore.cpp" />
<ClCompile Include="..\..\fs\store\StoreResult.cpp" />
<ClCompile Include="..\..\fs\tracing\EdenStats.cpp" />
<ClCompile Include="..\..\fs\tracing\Tracing.cpp" />
<ClCompile Include="..\..\fs\utils\Bug.cpp" />
<ClCompile Include="..\..\fs\utils\Clock.cpp" />
@ -244,7 +244,7 @@
<ClInclude Include="..\..\fs\config\ClientConfig.h" />
<ClInclude Include="..\..\fs\config\EdenConfig.h" />
<ClInclude Include="..\..\fs\config\filechangemonitor.h" />
<ClInclude Include="..\..\fs\fuse\EdenStats.h" />
<ClInclude Include="..\..\fs\tracing\EdenStats.h" />
<ClInclude Include="..\..\fs\inodes\ServerState.h" />
<ClInclude Include="..\..\fs\journal\Journal.h" />
<ClInclude Include="..\..\fs\journal\JournalDelta.h" />
@ -342,4 +342,4 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="D:\edenwin64\vcpkg\scripts\buildsystems\msbuild\vcpkg.targets" Condition="Exists('D:\edenwin64\vcpkg\scripts\buildsystems\msbuild\vcpkg.targets')" />
</ImportGroup>
</Project>
</Project>

24
eden/win/fs/edenfs.vcxproj.filters
View File

@ -38,8 +38,8 @@
<Filter Include="Other">
<UniqueIdentifier>{003fda81-816e-482e-b180-0c3887a3a9d9}</UniqueIdentifier>
</Filter>
<Filter Include="fs\Fuse">
<UniqueIdentifier>{a8960569-2bb2-482c-82f2-bb6aa07026a5}</UniqueIdentifier>
<Filter Include="fs\Tracing">
<UniqueIdentifier>{a8960569-2bb2-482c-82f2-bb6aa07026a6}</UniqueIdentifier>
</Filter>
<Filter Include="fs\Config">
<UniqueIdentifier>{505aac1b-f4f7-436b-ace6-adb2b97d47fa}</UniqueIdentifier>
@ -182,9 +182,6 @@
<ClCompile Include="..\..\fs\model\git\GlobMatcher.cpp">
<Filter>fs\Model\Git</Filter>
</ClCompile>
<ClCompile Include="..\..\fs\fuse\EdenStats.cpp">
<Filter>fs\Fuse</Filter>
</ClCompile>
<ClCompile Include="..\..\fs\config\ClientConfig.cpp">
<Filter>fs\Config</Filter>
</ClCompile>
@ -317,12 +314,12 @@
<ClCompile Include="utils\FileUtils.cpp">
<Filter>Win\fs\Utils</Filter>
</ClCompile>
<ClCompile Include="utils\RegUtils.cpp">
<Filter>Win\fs\Utils</Filter>
</ClCompile>
<ClCompile Include="utils\UserInfo.cpp">
<Filter>Win\fs\Utils</Filter>
</ClCompile>
</ClCompile>
<ClCompile Include="..\..\fs\tracing\EdenStats.cpp">
<Filter>fs\Tracing</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\fs\store\hg\HgBackingStore.h">
@ -436,8 +433,8 @@
<ClInclude Include="..\..\fs\model\git\GlobMatcher.h">
<Filter>fs\Model\Git</Filter>
</ClInclude>
<ClInclude Include="..\..\fs\fuse\EdenStats.h">
<Filter>fs\Fuse</Filter>
<ClInclude Include="..\..\fs\tracing\EdenStats.h">
<Filter>fs\Tracing</Filter>
</ClInclude>
<ClInclude Include="..\..\fs\config\CachedParsedFileMonitor.h">
<Filter>fs\Config</Filter>
@ -583,9 +580,6 @@
<ClInclude Include="..\..\fs\utils\FaultInjector.h">
<Filter>fs\Util</Filter>
</ClInclude>
<ClInclude Include="utils\RegUtils.h">
<Filter>Win\fs\Utils</Filter>
</ClInclude>
<ClInclude Include="utils\UserInfo.h">
<Filter>Win\fs\Utils</Filter>
</ClInclude>
@ -616,4 +610,4 @@
<Filter>fs\Service</Filter>
</None>
</ItemGroup>
</Project>
</Project>

2
eden/win/fs/mount/EdenMount.h
View File

@ -21,10 +21,10 @@
#include <mutex>
#include <shared_mutex>
#include "ProjectedFsLib.h"
#include "eden/fs/fuse/EdenStats.h"
#include "eden/fs/journal/Journal.h"
#include "eden/fs/model/ParentCommits.h"
#include "eden/fs/service/gen-cpp2/eden_types.h"
#include "eden/fs/tracing/EdenStats.h"
#include "eden/fs/utils/PathFuncs.h"
#include "eden/win/fs/mount/EdenDispatcher.h"
#include "eden/win/fs/mount/FsChannel.h"