Progress towards dynamic storage support.
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
diff --git a/VolumeManager.h b/VolumeManager.h
index 17fa6f7..5b3fbf6 100644
--- a/VolumeManager.h
+++ b/VolumeManager.h
@@ -14,16 +14,25 @@
* limitations under the License.
*/
-#ifndef _VOLUMEMANAGER_H
-#define _VOLUMEMANAGER_H
+#ifndef ANDROID_VOLD_VOLUME_MANAGER_H
+#define ANDROID_VOLD_VOLUME_MANAGER_H
#include <pthread.h>
+#include <fnmatch.h>
+#include <stdlib.h>
#ifdef __cplusplus
+
+#include <string>
+#include <list>
+
+#include <cutils/multiuser.h>
#include <utils/List.h>
#include <sysutils/SocketListener.h>
+#include "Disk.h"
#include "Volume.h"
+#include "VolumeBase.h"
/* The length of an MD5 hash when encoded into ASCII hex characters */
#define MD5_ASCII_LENGTH_PLUS_NULL ((MD5_DIGEST_LENGTH*2)+1)
@@ -54,7 +63,6 @@
private:
static VolumeManager *sInstance;
-private:
SocketListener *mBroadcaster;
VolumeCollection *mVolumes;
@@ -77,6 +85,40 @@
int addVolume(Volume *v);
+ class DiskSource {
+ public:
+ DiskSource(const std::string& sysPattern, const std::string& nickname, int flags) :
+ mSysPattern(sysPattern), mNickname(nickname), mFlags(flags) {
+ }
+
+ bool matches(const std::string& sysPath) {
+ return !fnmatch(mSysPattern.c_str(), sysPath.c_str(), 0);
+ }
+
+ const std::string& getNickname() { return mNickname; }
+ int getFlags() { return mFlags; }
+
+ private:
+ std::string mSysPattern;
+ std::string mNickname;
+ int mFlags;
+ };
+
+ void addDiskSource(const std::shared_ptr<DiskSource>& diskSource);
+
+ std::shared_ptr<android::vold::Disk> findDisk(const std::string& id);
+ std::shared_ptr<android::vold::VolumeBase> findVolume(const std::string& id);
+
+ int startUser(userid_t userId);
+ int cleanupUser(userid_t userId);
+
+ int setPrimary(const std::shared_ptr<android::vold::VolumeBase>& vol);
+
+ /* Reset all internal state, typically during framework boot */
+ int reset();
+ /* Prepare for device shutdown, safely unmounting all devices */
+ int shutdown();
+
int listVolumes(SocketClient *cli, bool broadcast);
int mountVolume(const char *label);
int unmountVolume(const char *label, bool force, bool revert);
@@ -156,6 +198,16 @@
bool isMountpointMounted(const char *mp);
bool isAsecInDirectory(const char *dir, const char *asec) const;
bool isLegalAsecId(const char *id) const;
+
+ int linkPrimary(userid_t userId);
+
+ std::list<std::shared_ptr<DiskSource>> mDiskSources;
+ std::list<std::shared_ptr<android::vold::Disk>> mDisks;
+
+ std::list<userid_t> mUsers;
+
+ std::shared_ptr<android::vold::VolumeBase> mInternalEmulated;
+ std::shared_ptr<android::vold::VolumeBase> mPrimary;
};
extern "C" {