36801cccf2
Wire up new Disk and VolumeBase objects and events to start replacing older DirectVolume code. Use filesystem UUID as visible PublicVolume name to be more deterministic. When starting, create DiskSource instances based on fstab, and watch for kernel devices to appear. Turn matching devices into Disk objects, scan for partitions, and create any relevant VolumeBase objects. Broadcast all of these events towards userspace so the framework can decide what to mount. Keep track of the primary VolumeBase, and update the new per-user /storage/self/primary symlink for all started users. Provide a reset command that framework uses to start from a known state when runtime is restarted. When vold is unexpectedly killed, try recovering by unmounting everything under /mnt and /storage before moving forward. Remove UMS sharing support for now, since no current devices support it; MTP is the recommended solution going forward because it offers better multi-user support. Switch killProcessesWithOpenFiles() to directly take signal. Fix one SOCK_CLOEXEC bug, but SELinux says there are more lurking. Bug: 19993667 Change-Id: I2dad1303aa4667ec14c52f774e2a28b3c1c1ff6d
44 lines
1.6 KiB
C++
44 lines
1.6 KiB
C++
/*
|
|
* Copyright (C) 2008 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef _PROCESS_H
|
|
#define _PROCESS_H
|
|
|
|
#ifdef __cplusplus
|
|
|
|
class Process {
|
|
public:
|
|
static void 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, char *buffer, size_t max);
|
|
private:
|
|
static int readSymLink(const char *path, char *link, size_t max);
|
|
static int pathMatchesMountPoint(const char *path, const char *mountPoint);
|
|
};
|
|
|
|
extern "C" {
|
|
#endif /* __cplusplus */
|
|
void vold_killProcessesWithOpenFiles(const char *path, int signal);
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif
|