Move to modern utility methods from android::base.
Moves away from crufty char* operations to std::string utility
methods, including android::base methods for splitting/parsing.
Rewrite of how Process handles scanning procfs for filesystem
references; now uses fts(3) for more sane traversal.
Replace sscanf() with new FindValue() method, also has unit tests.
Remove some unused methods. Switch almost everyone over to using
modern logging library.
Test: cts-tradefed run commandAndExit cts-dev -m CtsOsTestCases -t android.os.storage.cts.StorageManagerTest
Test: cts-tradefed run commandAndExit cts-dev --abi armeabi-v7a -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AdoptableHostTest
Bug: 67041047
Change-Id: I70dc512f21459d1e25b187f24289002b2c7bc7af
diff --git a/Process.h b/Process.h
index 4ddbdb9..1406782 100644
--- a/Process.h
+++ b/Process.h
@@ -17,28 +17,12 @@
#ifndef _PROCESS_H
#define _PROCESS_H
-#ifdef __cplusplus
+namespace android {
+namespace vold {
-class Process {
-public:
- static int killProcessesWithOpenFiles(const char *path, int signal);
- static int getPid(const char *s);
- static int checkSymLink(int pid, const char *path, const char *name);
- static int checkFileMaps(int pid, const char *path);
- static int checkFileMaps(int pid, const char *path, char *openFilename, size_t max);
- static int checkFileDescriptorSymLinks(int pid, const char *mountPoint);
- static int checkFileDescriptorSymLinks(int pid, const char *mountPoint, char *openFilename, size_t max);
- static void getProcessName(int pid, std::string& out_name);
-private:
- static int readSymLink(const char *path, char *link, size_t max);
- static int pathMatchesMountPoint(const char *path, const char *mountPoint);
-};
+int KillProcessesWithOpenFiles(const std::string& path, int signal);
-extern "C" {
-#endif /* __cplusplus */
- void vold_killProcessesWithOpenFiles(const char *path, int signal);
-#ifdef __cplusplus
-}
-#endif
+} // namespace vold
+} // namespace android
#endif