lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 09:00:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return ReplayStatus when launching/injecting, use to indicate JDWP error

Browse Source 
* If android studio or other android tools are open when a package is
  launched for debugging, they greedily jump on it and connect which
  prevents us from connecting.
This commit is contained in:
baldurk
2018-02-20 11:54:57 +00:00
parent 6a1db5deac
commit 13c1cf6ad4
17 changed files with 206 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoccmd/renderdoccmd.cpp
+21 -18
View File
@@ -363,28 +363,28 @@ struct CaptureCommand : public Command
rdcarray<EnvironmentModification> env;
uint32_t ident = RENDERDOC_ExecuteAndInject(
ExecuteResult res = RENDERDOC_ExecuteAndInject(
executable.c_str(), workingDir.empty() ? "" : workingDir.c_str(),
cmdLine.empty() ? "" : cmdLine.c_str(), env, logFile.empty() ? "" : logFile.c_str(), opts,
parser.exist("wait-for-exit"));
if(ident == 0)
if(res.status != ReplayStatus::Succeeded)
{
std::cerr << "Failed to create & inject." << std::endl;
return 2;
std::cerr << "Failed to create & inject: " << ToStr(res.status) << std::endl;
return (int)res.status;
}
if(parser.exist("wait-for-exit"))
{
std::cerr << "'" << executable << "' finished executing." << std::endl;
ident = 0;
res.ident = 0;
}
else
{
std::cerr << "Launched as ID " << ident << std::endl;
std::cerr << "Launched as ID " << res.ident << std::endl;
}
return ident;
return res.ident;
}
std::string EscapeArgument(const std::string &arg)
@@ -430,26 +430,26 @@ struct InjectCommand : public Command
RENDERDOC_InitGlobalEnv(m_Env, convertArgs(parser.rest()));
uint32_t ident = RENDERDOC_InjectIntoProcess(PID, env, logFile.empty() ? "" : logFile.c_str(),
opts, parser.exist("wait-for-exit"));
ExecuteResult res = RENDERDOC_InjectIntoProcess(
PID, env, logFile.empty() ? "" : logFile.c_str(), opts, parser.exist("wait-for-exit"));
if(ident == 0)
if(res.status != ReplayStatus::Succeeded)
{
std::cerr << "Failed to inject." << std::endl;
return 2;
std::cerr << "Failed to inject: " << ToStr(res.status) << std::endl;
return (int)res.status;
}
if(parser.exist("wait-for-exit"))
{
std::cerr << PID << " finished executing." << std::endl;
ident = 0;
res.ident = 0;
}
else
{
std::cerr << "Launched as ID " << ident << std::endl;
std::cerr << "Launched as ID " << res.ident << std::endl;
}
return ident;
return res.ident;
}
};
@@ -879,10 +879,13 @@ struct CapAltBitCommand : public Command
RENDERDOC_SetDebugLogFile(debuglog.c_str());
int ret = RENDERDOC_InjectIntoProcess(parser.get<uint32_t>("pid"), env,
parser.get<string>("log").c_str(), cmdopts, false);
ExecuteResult result = RENDERDOC_InjectIntoProcess(
parser.get<uint32_t>("pid"), env, parser.get<string>("log").c_str(), cmdopts, false);
return ret;
if(result.status == ReplayStatus::Succeeded)
return result.ident;
return (int)result.status;
}
};