Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Maintain the fuse buffer pool keyed by inode instead of threadId." into rvc-dev

Browse Source
This commit is contained in:
Sudheer Shanka
2020-06-18 09:46:29 +00:00
committed by Android (Google) Code Review
parent bcbcca7d4f c608143486
commit b52a288e0c
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/com/android/internal/os/FuseAppLoop.java
View File

@@ -210,7 +210,7 @@ public class FuseAppLoop implements Handler.Callback {
if (mInstance != 0) { if (mInstance != 0) {
native_replySimple(mInstance, unique, FUSE_OK); native_replySimple(mInstance, unique, FUSE_OK);
} }
mBytesMap.stopUsing(entry.getThreadId()); mBytesMap.stopUsing(inode);
recycleLocked(args); recycleLocked(args);
} }
break; break;
@@ -270,7 +270,7 @@ public class FuseAppLoop implements Handler.Callback {
if (mInstance != 0) { if (mInstance != 0) {
native_replyOpen(mInstance, unique, /* fh */ inode); native_replyOpen(mInstance, unique, /* fh */ inode);
entry.opened = true; entry.opened = true;
return mBytesMap.startUsing(entry.getThreadId()); return mBytesMap.startUsing(inode);
} }
} catch (ErrnoException error) { } catch (ErrnoException error) {
replySimpleLocked(unique, getError(error)); replySimpleLocked(unique, getError(error));
@@ -354,27 +354,27 @@ public class FuseAppLoop implements Handler.Callback {
} }
/** /**
* Map between Thread ID and byte buffer. * Map between inode and byte buffer.
*/ */
private static class BytesMap { private static class BytesMap {
final Map<Long, BytesMapEntry> mEntries = new HashMap<>(); final Map<Long, BytesMapEntry> mEntries = new HashMap<>();
byte[] startUsing(long threadId) { byte[] startUsing(long inode) {
BytesMapEntry entry = mEntries.get(threadId); BytesMapEntry entry = mEntries.get(inode);
if (entry == null) { if (entry == null) {
entry = new BytesMapEntry(); entry = new BytesMapEntry();
mEntries.put(threadId, entry); mEntries.put(inode, entry);
} }
entry.counter++; entry.counter++;
return entry.bytes; return entry.bytes;
} }
void stopUsing(long threadId) { void stopUsing(long inode) {
final BytesMapEntry entry = mEntries.get(threadId); final BytesMapEntry entry = mEntries.get(inode);
Objects.requireNonNull(entry); Objects.requireNonNull(entry);
entry.counter--; entry.counter--;
if (entry.counter <= 0) { if (entry.counter <= 0) {
mEntries.remove(threadId); mEntries.remove(inode);
} }
} }