From 0ad6120dadc1665f394e73330d30e949066c77e1 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Wed, 10 Jun 2009 17:07:15 -0700 Subject: Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files. This took quite a bit of refactoring. --- libs/utils/BackupHelpers.cpp | 196 +++++++++++++++++++++++++++++-------------- 1 file changed, 134 insertions(+), 62 deletions(-) (limited to 'libs/utils/BackupHelpers.cpp') diff --git a/libs/utils/BackupHelpers.cpp b/libs/utils/BackupHelpers.cpp index 7f423a8e8e..ffe4dff9fe 100644 --- a/libs/utils/BackupHelpers.cpp +++ b/libs/utils/BackupHelpers.cpp @@ -41,8 +41,8 @@ namespace android { #define MAGIC0 0x70616e53 // Snap #define MAGIC1 0x656c6946 // File -#if 0 // TEST_BACKUP_HELPERS -#define LOGP(x...) printf(x) +#if 1 // TEST_BACKUP_HELPERS +#define LOGP(f, x...) printf(f "\n", x) #else #define LOGP(x...) LOGD(x) #endif @@ -62,6 +62,11 @@ struct FileState { int nameLen; }; +struct FileRec { + char const* file; // this object does not own this string + FileState s; +}; + const static int ROUND_UP[4] = { 0, 3, 2, 1 }; static inline int @@ -92,8 +97,8 @@ read_snapshot_file(int fd, KeyedVector* snapshot) FileState file; char filenameBuf[128]; - amt = read(fd, &file, sizeof(file)); - if (amt != sizeof(file)) { + amt = read(fd, &file, sizeof(FileState)); + if (amt != sizeof(FileState)) { LOGW("read_snapshot_file FileState truncated/error with read at %d bytes\n", bytesRead); return 1; } @@ -128,7 +133,7 @@ read_snapshot_file(int fd, KeyedVector* snapshot) } static int -write_snapshot_file(int fd, const KeyedVector& snapshot) +write_snapshot_file(int fd, const KeyedVector& snapshot) { int bytesWritten = sizeof(SnapshotHeader); // preflight size @@ -151,11 +156,11 @@ write_snapshot_file(int fd, const KeyedVector& snapshot) for (int i=0; i oldSnapshot; - KeyedVector newSnapshot; + KeyedVector newSnapshot; if (oldSnapshotFD != -1) { err = read_snapshot_file(oldSnapshotFD, &oldSnapshot); @@ -297,26 +300,28 @@ back_up_files(int oldSnapshotFD, BackupDataWriter* dataStream, int newSnapshotFD } for (int i=0; i= 0) { + LOGP("back_up_files key already in use '%s'", key.string()); + return -1; + } + newSnapshot.add(key, r); } int n = 0; @@ -329,43 +334,39 @@ back_up_files(int oldSnapshotFD, BackupDataWriter* dataStream, int newSnapshotFD int cmp = p.compare(q); if (cmp > 0) { // file added - String8 realFilename(base); - realFilename.appendPath(q); - LOGP("file added: %s\n", realFilename.string()); - write_update_file(dataStream, q, realFilename); + const FileRec& g = newSnapshot.valueAt(m); + LOGP("file added: %s", g.file); + write_update_file(dataStream, q, g.file); m++; } else if (cmp < 0) { // file removed - LOGP("file removed: %s\n", p.string()); + LOGP("file removed: %s", p.string()); dataStream->WriteEntityHeader(p, -1); n++; } else { - // both files exist, check them - String8 realFilename(base); - realFilename.appendPath(q); const FileState& f = oldSnapshot.valueAt(n); - FileState& g = newSnapshot.editValueAt(m); + FileRec& g = newSnapshot.editValueAt(m); - int fd = open(realFilename.string(), O_RDONLY); + int fd = open(g.file, O_RDONLY); if (fd < 0) { // We can't open the file. Don't report it as a delete either. Let the // server keep the old version. Maybe they'll be able to deal with it // on restore. - LOGP("Unable to open file %s - skipping", realFilename.string()); + LOGP("Unable to open file %s - skipping", g.file); } else { - g.crc32 = compute_crc32(fd); + g.s.crc32 = compute_crc32(fd); - LOGP("%s\n", q.string()); - LOGP(" new: modTime=%d,%d size=%-3d crc32=0x%08x\n", + LOGP("%s", q.string()); + LOGP(" new: modTime=%d,%d size=%-3d crc32=0x%08x", f.modTime_sec, f.modTime_nsec, f.size, f.crc32); - LOGP(" old: modTime=%d,%d size=%-3d crc32=0x%08x\n", - g.modTime_sec, g.modTime_nsec, g.size, g.crc32); - if (f.modTime_sec != g.modTime_sec || f.modTime_nsec != g.modTime_nsec - || f.size != g.size || f.crc32 != g.crc32) { - write_update_file(dataStream, fd, p, realFilename); + LOGP(" old: modTime=%d,%d size=%-3d crc32=0x%08x", + g.s.modTime_sec, g.s.modTime_nsec, g.s.size, g.s.crc32); + if (f.modTime_sec != g.s.modTime_sec || f.modTime_nsec != g.s.modTime_nsec + || f.size != g.s.size || f.crc32 != g.s.crc32) { + write_update_file(dataStream, fd, p, g.file); } close(fd); @@ -384,9 +385,8 @@ back_up_files(int oldSnapshotFD, BackupDataWriter* dataStream, int newSnapshotFD // these were added while (m snapshot; + KeyedVector snapshot; const char* filename = SCRATCH_DIR "backup_helper_test_empty.snap"; system("rm -r " SCRATCH_DIR); @@ -534,7 +534,7 @@ backup_helper_test_four() { int err; int fd; - KeyedVector snapshot; + KeyedVector snapshot; const char* filename = SCRATCH_DIR "backup_helper_test_four.snap"; system("rm -r " SCRATCH_DIR); @@ -549,38 +549,44 @@ backup_helper_test_four() String8 filenames[4]; FileState states[4]; + FileRec r; + r.file = NULL; states[0].modTime_sec = 0xfedcba98; states[0].modTime_nsec = 0xdeadbeef; states[0].size = 0xababbcbc; states[0].crc32 = 0x12345678; states[0].nameLen = -12; + r.s = states[0]; filenames[0] = String8("bytes_of_padding"); - snapshot.add(filenames[0], states[0]); + snapshot.add(filenames[0], r); states[1].modTime_sec = 0x93400031; states[1].modTime_nsec = 0xdeadbeef; states[1].size = 0x88557766; states[1].crc32 = 0x22334422; states[1].nameLen = -1; + r.s = states[1]; filenames[1] = String8("bytes_of_padding3"); - snapshot.add(filenames[1], states[1]); + snapshot.add(filenames[1], r); states[2].modTime_sec = 0x33221144; states[2].modTime_nsec = 0xdeadbeef; states[2].size = 0x11223344; states[2].crc32 = 0x01122334; states[2].nameLen = 0; + r.s = states[2]; filenames[2] = String8("bytes_of_padding_2"); - snapshot.add(filenames[2], states[2]); + snapshot.add(filenames[2], r); states[3].modTime_sec = 0x33221144; states[3].modTime_nsec = 0xdeadbeef; states[3].size = 0x11223344; states[3].crc32 = 0x01122334; states[3].nameLen = 0; + r.s = states[3]; filenames[3] = String8("bytes_of_padding__1"); - snapshot.add(filenames[3], states[3]); + snapshot.add(filenames[3], r); err = write_snapshot_file(fd, snapshot); @@ -982,6 +988,14 @@ backup_helper_test_files() write_text_file(SCRATCH_DIR "data/h", "h\nhh\n"); char const* files_before[] = { + SCRATCH_DIR "data/b", + SCRATCH_DIR "data/c", + SCRATCH_DIR "data/d", + SCRATCH_DIR "data/e", + SCRATCH_DIR "data/f" + }; + + char const* keys_before[] = { "data/b", "data/c", "data/d", @@ -1004,7 +1018,7 @@ backup_helper_test_files() { BackupDataWriter dataStream(dataStreamFD); - err = back_up_files(-1, &dataStream, newSnapshotFD, SCRATCH_DIR, files_before, 5); + err = back_up_files(-1, &dataStream, newSnapshotFD, files_before, keys_before, 5); if (err != 0) { return err; } @@ -1035,6 +1049,15 @@ backup_helper_test_files() unlink(SCRATCH_DIR "data/f"); char const* files_after[] = { + SCRATCH_DIR "data/a", // added + SCRATCH_DIR "data/b", // same + SCRATCH_DIR "data/c", // different mod time + SCRATCH_DIR "data/d", // different size (same mod time) + SCRATCH_DIR "data/e", // different contents (same mod time, same size) + SCRATCH_DIR "data/g" // added + }; + + char const* keys_after[] = { "data/a", // added "data/b", // same "data/c", // different mod time @@ -1064,8 +1087,7 @@ backup_helper_test_files() { BackupDataWriter dataStream(dataStreamFD); - err = back_up_files(oldSnapshotFD, &dataStream, newSnapshotFD, SCRATCH_DIR, - files_after, 6); + err = back_up_files(oldSnapshotFD, &dataStream, newSnapshotFD, files_after, keys_after, 6); if (err != 0) { return err; } @@ -1078,6 +1100,56 @@ backup_helper_test_files() return 0; } +int +backup_helper_test_null_base() +{ + int err; + int oldSnapshotFD; + int dataStreamFD; + int newSnapshotFD; + + system("rm -r " SCRATCH_DIR); + mkdir(SCRATCH_DIR, 0777); + mkdir(SCRATCH_DIR "data", 0777); + + write_text_file(SCRATCH_DIR "data/a", "a\naa\n"); + + char const* files[] = { + SCRATCH_DIR "data/a", + }; + + char const* keys[] = { + "a", + }; + + dataStreamFD = creat(SCRATCH_DIR "null_base.data", 0666); + if (dataStreamFD == -1) { + fprintf(stderr, "error creating: %s\n", strerror(errno)); + return errno; + } + + newSnapshotFD = creat(SCRATCH_DIR "null_base.snap", 0666); + if (newSnapshotFD == -1) { + fprintf(stderr, "error creating: %s\n", strerror(errno)); + return errno; + } + + { + BackupDataWriter dataStream(dataStreamFD); + + err = back_up_files(-1, &dataStream, newSnapshotFD, files, keys, 1); + if (err != 0) { + return err; + } + } + + close(dataStreamFD); + close(newSnapshotFD); + + return 0; +} + + #endif // TEST_BACKUP_HELPERS } -- cgit v1.2.3-59-g8ed1b From 1a9e19a73e12f5e4891557de64cab5b9b7ae1ac5 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Thu, 11 Jun 2009 11:27:16 -0700 Subject: Make the file backup helper not crash if a file you requested can't be stated. This means you don't need to know if the files you are backing up exist or not -- we'll figure it out for you. --- include/utils/BackupHelpers.h | 1 + libs/utils/BackupHelpers.cpp | 153 +++++++++++++++++++++++++++++------------- 2 files changed, 109 insertions(+), 45 deletions(-) (limited to 'libs/utils/BackupHelpers.cpp') diff --git a/include/utils/BackupHelpers.h b/include/utils/BackupHelpers.h index 1d0daa741e..f60f4ead64 100644 --- a/include/utils/BackupHelpers.h +++ b/include/utils/BackupHelpers.h @@ -128,6 +128,7 @@ int backup_helper_test_empty(); int backup_helper_test_four(); int backup_helper_test_files(); int backup_helper_test_null_base(); +int backup_helper_test_missing_file(); int backup_helper_test_data_writer(); int backup_helper_test_data_reader(); #endif diff --git a/libs/utils/BackupHelpers.cpp b/libs/utils/BackupHelpers.cpp index ffe4dff9fe..4c3e37dd1c 100644 --- a/libs/utils/BackupHelpers.cpp +++ b/libs/utils/BackupHelpers.cpp @@ -64,6 +64,7 @@ struct FileState { struct FileRec { char const* file; // this object does not own this string + bool deleted; FileState s; }; @@ -135,18 +136,23 @@ read_snapshot_file(int fd, KeyedVector* snapshot) static int write_snapshot_file(int fd, const KeyedVector& snapshot) { + int fileCount = 0; int bytesWritten = sizeof(SnapshotHeader); // preflight size const int N = snapshot.size(); for (int i=0; i& snapshot) return errno; } - for (int i=0; i= 0) { - LOGP("back_up_files key already in use '%s'", key.string()); - return -1; + r.deleted = true; + } else { + r.deleted = false; + r.s.modTime_sec = st.st_mtime; + r.s.modTime_nsec = 0; // workaround sim breakage + //r.s.modTime_nsec = st.st_mtime_nsec; + r.s.size = st.st_size; + // we compute the crc32 later down below, when we already have the file open. + + if (newSnapshot.indexOfKey(key) >= 0) { + LOGP("back_up_files key already in use '%s'", key.string()); + return -1; + } } newSnapshot.add(key, r); } @@ -331,24 +340,24 @@ back_up_files(int oldSnapshotFD, BackupDataWriter* dataStream, int newSnapshotFD while (n 0) { - // file added - const FileRec& g = newSnapshot.valueAt(m); - LOGP("file added: %s", g.file); - write_update_file(dataStream, q, g.file); - m++; - } - else if (cmp < 0) { + if (g.deleted || cmp < 0) { // file removed LOGP("file removed: %s", p.string()); + g.deleted = true; // They didn't mention the file, but we noticed that it's gone. dataStream->WriteEntityHeader(p, -1); n++; } + else if (cmp > 0) { + // file added + LOGP("file added: %s", g.file); + write_update_file(dataStream, q, g.file); + m++; + } else { // both files exist, check them const FileState& f = oldSnapshot.valueAt(n); - FileRec& g = newSnapshot.editValueAt(m); int fd = open(g.file, O_RDONLY); if (fd < 0) { @@ -550,6 +559,7 @@ backup_helper_test_four() String8 filenames[4]; FileState states[4]; FileRec r; + r.deleted = false; r.file = NULL; states[0].modTime_sec = 0xfedcba98; @@ -1149,6 +1159,59 @@ backup_helper_test_null_base() return 0; } +int +backup_helper_test_missing_file() +{ + int err; + int oldSnapshotFD; + int dataStreamFD; + int newSnapshotFD; + + system("rm -r " SCRATCH_DIR); + mkdir(SCRATCH_DIR, 0777); + mkdir(SCRATCH_DIR "data", 0777); + + write_text_file(SCRATCH_DIR "data/b", "b\nbb\n"); + + char const* files[] = { + SCRATCH_DIR "data/a", + SCRATCH_DIR "data/b", + SCRATCH_DIR "data/c", + }; + + char const* keys[] = { + "a", + "b", + "c", + }; + + dataStreamFD = creat(SCRATCH_DIR "null_base.data", 0666); + if (dataStreamFD == -1) { + fprintf(stderr, "error creating: %s\n", strerror(errno)); + return errno; + } + + newSnapshotFD = creat(SCRATCH_DIR "null_base.snap", 0666); + if (newSnapshotFD == -1) { + fprintf(stderr, "error creating: %s\n", strerror(errno)); + return errno; + } + + { + BackupDataWriter dataStream(dataStreamFD); + + err = back_up_files(-1, &dataStream, newSnapshotFD, files, keys, 1); + if (err != 0) { + return err; + } + } + + close(dataStreamFD); + close(newSnapshotFD); + + return 0; +} + #endif // TEST_BACKUP_HELPERS -- cgit v1.2.3-59-g8ed1b