diff options
| author | Kenny Root <kroot@google.com> | 2010-09-24 07:57:37 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2010-09-24 08:05:51 -0700 |
| commit | 6458fa0fce4bce7f3f9cccbacf9116f6f08abdf1 (patch) | |
| tree | e0ffbaae8f45022b61189e96f99faffc36cca3b4 /include/utils | |
| parent | 7f459df9f94bc52e53d42894dea4702394fbad5c (diff) | |
| download | frameworks_base-6458fa0fce4bce7f3f9cccbacf9116f6f08abdf1.zip frameworks_base-6458fa0fce4bce7f3f9cccbacf9116f6f08abdf1.tar.gz frameworks_base-6458fa0fce4bce7f3f9cccbacf9116f6f08abdf1.tar.bz2 | |
Add locking around ZIP seeking
Since we switched to seeking to the LFH to verify its existence instead
of a huge mmap of the file, we have to guarantee that another seek
doesn't happen before we finish our read on the LFH.
Change-Id: If8135d9cb6f2f5cc4db734eafa4f6b5f6269c62a
Diffstat (limited to 'include/utils')
| -rw-r--r-- | include/utils/ZipFileRO.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/utils/ZipFileRO.h b/include/utils/ZipFileRO.h index 97d31f4..9668bde 100644 --- a/include/utils/ZipFileRO.h +++ b/include/utils/ZipFileRO.h @@ -24,8 +24,9 @@ #ifndef __LIBS_ZIPFILERO_H #define __LIBS_ZIPFILERO_H -#include "Errors.h" -#include "FileMap.h" +#include <utils/Errors.h> +#include <utils/FileMap.h> +#include <utils/threads.h> #include <stdio.h> #include <stdlib.h> @@ -211,6 +212,9 @@ private: /* open Zip archive */ int mFd; + /* Lock for handling the file descriptor (seeks, etc) */ + mutable Mutex mFdLock; + /* zip file name */ char* mFileName; |