Skip to content

Optimised speed of transfer and added resume capability #607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Optimised speed of transfer and added resume capability #607

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 28 additions & 3 deletions src/ios-deploy/ios-deploy.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1175,7 +1175,7 @@ void write_lldb_prep_cmds(AMDeviceRef device, CFURLRef disk_app_url) {
on_error(@"Failed to open %s", custom_script_path);
}
fwrite("\n", 1, 1, out);
char buffer[0x1000];
char buffer[262144]; // 256KB buffer for faster transfers
size_t bytesRead;
while ((bytesRead = fread(buffer, 1, sizeof(buffer), fh)) > 0)
{
Expand Down Expand Up @@ -1244,7 +1244,7 @@ void server_callback(CFSocketRef s, CFSocketCallBackType callbackType, CFDataRef
ServiceConnRef dbgServiceConnection = (ServiceConnRef)CFDictionaryGetValue(connection_properties, kDbgConnectionPropertyServiceConnection);
CFSocketRef lldb_socket = (CFSocketRef)CFDictionaryGetValue(connection_properties, kDbgConnectionPropertyLLDBSocket);

char buffer[0x1000];
char buffer[262144]; // 256KB buffer for faster transfers
int bytesRead;
do {
bytesRead = AMDServiceConnectionReceive(dbgServiceConnection, buffer, sizeof(buffer));
Expand Down Expand Up @@ -2171,6 +2171,31 @@ void copy_file_callback(AFCConnectionRef afc_conn_p, const char *name, read_dir_
if (*local_name=='\0') return;

if (reason == READ_DIR_FILE || reason == READ_DIR_FIFO) {
// Get remote file size using AFCFileInfoOpen
struct afc_dictionary *afc_dict_p = NULL;
long long remote_size = -1;

unsigned int code = AFCFileInfoOpen(afc_conn_p, name, &afc_dict_p);
if (code == 0) {
char *key, *val;
while((AFCKeyValueRead(afc_dict_p, &key, &val) == 0) && key && val) {
if (strcmp(key, "st_size") == 0) {
remote_size = atoll(val);
break;
}
}
AFCKeyValueClose(afc_dict_p);
}

// Check if local file exists and has the same size
struct stat local_stat;
if (remote_size >= 0 && stat(local_name, &local_stat) == 0) {
if (local_stat.st_size == remote_size) {
NSLogOut(@"%@ (skipped - already downloaded)", [NSString stringWithUTF8String:name]);
return;
}
}

NSLogOut(@"%@", [NSString stringWithUTF8String:name]);
afc_file_ref fref;
int err = AFCFileRefOpen(afc_conn_p,name,1,&fref);
Expand All @@ -2188,7 +2213,7 @@ void copy_file_callback(AFCConnectionRef afc_conn_p, const char *name, read_dir_
return;
}

char buf[4096];
char buf[262144]; // 256KB buffer for faster transfers
size_t sz=sizeof(buf);

while (AFCFileRefRead(afc_conn_p,fref,buf,&sz)==0 && sz) {
Expand Down