openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Get the backup calling through to the file backup helper. 

This includes some cleanup to make the parameters match
between BackupService.onBackup and FileBackupHelper.performBackup.
This commit is contained in:
Joe Onorato 2009-05-13 18:57:29 -04:00 committed by Alex Ray
parent 5222355ad8
commit b81a9a18e5
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/utils/backup_helpers.h
View File

@ -1,7 +1,7 @@
#ifndef _UTILS_BACKUP_HELPERS_H
#define _UTILS_BACKUP_HELPERS_H
int back_up_files(int oldSnapshotFD, int newSnapshotFD, int oldDataStream,
int back_up_files(int oldSnapshotFD, int oldDataStream, int newSnapshotFD,
char const* fileBase, char const* const* files, int fileCount);
#define TEST_BACKUP_HELPERS 0

15
libs/utils/file_backup_helper.cpp
View File

@ -24,6 +24,9 @@ using namespace android;
#define MAGIC0 0x70616e53 // Snap
#define MAGIC1 0x656c6946 // File
#define LOGP(x...) LOGD(x)
//#define LOGP(x...) printf(x)
struct SnapshotHeader {
int magic0;
int fileCount;
@ -159,14 +162,14 @@ write_snapshot_file(int fd, const KeyedVector<String8,FileState>& snapshot)
static int
write_delete_file(const String8& key)
{
printf("write_delete_file %s\n", key.string());
LOGP("write_delete_file %s\n", key.string());
return 0;
}
static int
write_update_file(const String8& realFilename, const String8& key)
{
printf("write_update_file %s (%s)\n", realFilename.string(), key.string());
LOGP("write_update_file %s (%s)\n", realFilename.string(), key.string());
return 0;
}
@ -195,7 +198,7 @@ compute_crc32(const String8& filename)
}
int
back_up_files(int oldSnapshotFD, int newSnapshotFD, int oldDataStream,
back_up_files(int oldSnapshotFD, int oldDataStream, int newSnapshotFD,
char const* fileBase, char const* const* files, int fileCount)
{
int err;
@ -260,10 +263,10 @@ back_up_files(int oldSnapshotFD, int newSnapshotFD, int oldDataStream,
const FileState& f = oldSnapshot.valueAt(n);
const FileState& g = newSnapshot.valueAt(m);
printf("%s\n", q.string());
printf(" new: modTime=%d,%d size=%-3d crc32=0x%08x\n",
LOGP("%s\n", q.string());
LOGP(" new: modTime=%d,%d size=%-3d crc32=0x%08x\n",
f.modTime_sec, f.modTime_nsec, f.size, f.crc32);
printf(" old: modTime=%d,%d size=%-3d crc32=0x%08x\n",
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) {