github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-22 06:13:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Speed up flashing to previous levels by executing on main thread

Browse source
This commit is contained in:
Michael Farrell 2017-11-04 23:53:03 +11:00
commit 582cceff01
1 changed files with 35 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

45
client/comms.c
View file

@ -32,7 +32,9 @@ static bool offline;
// flasher, as it means SendCommand is no longer async, and can't be used as a // flasher, as it means SendCommand is no longer async, and can't be used as a
// buffer for a pending command when the connection is re-established. // buffer for a pending command when the connection is re-established.
static UsbCommand txcmd; static UsbCommand txcmd;
static bool txcmd_pending; static bool txcmd_pending = false;
static pthread_mutex_t txcmd_lock = PTHREAD_MUTEX_INITIALIZER;
static pthread_cond_t txcmd_sig = PTHREAD_COND_INITIALIZER;
// Used by UsbReceiveCommand as a ring buffer for messages that are yet to be // Used by UsbReceiveCommand as a ring buffer for messages that are yet to be
// processed by a command handler (WaitForResponse{,Timeout}) // processed by a command handler (WaitForResponse{,Timeout})
@ -72,17 +74,35 @@ void SendCommand(UsbCommand *c) {
#endif #endif
if (offline) { if (offline) {
PrintAndLog("Sending bytes to proxmark failed - offline"); PrintAndLog("Sending bytes to proxmark failed - offline");
return; return;
} }
/**
The while-loop below causes hangups at times, when the pm3 unit is unresponsive if (c->cmd == CMD_FINISH_WRITE) {
or disconnected. The main console thread is alive, but comm thread just spins here. // We're being called by the flasher (in write_block). The flasher still
Not good.../holiman // runs the comms thread, but when we're in this bootloader mode, there's
**/ // no other commands being sent at the same time.
while(txcmd_pending); if (!uart_send(port, (byte_t*) c, sizeof(UsbCommand))) {
PrintAndLog("Sending bytes to proxmark failed");
}
return;
}
// The while-loop below causes hangups at times, when the pm3 unit is
// unresponsive or disconnected. The main console thread is alive, but comm
// thread just spins here. Not good.../holiman
pthread_mutex_lock(&txcmd_lock);
while (txcmd_pending) {
// Receiver thread will signal when it is ready for us to continue.
pthread_cond_wait(&txcmd_sig, &txcmd_lock);
}
// Send command buffer to receiver thread for processing. This is slower, but
// there are many race conditions which would otherwise be triggered.
txcmd = *c; txcmd = *c;
txcmd_pending = true; txcmd_pending = true;
pthread_mutex_unlock(&txcmd_lock);
} }
/** /**
@ -264,12 +284,17 @@ static void
// We aren't normally trying to transmit in the flasher when the port would // We aren't normally trying to transmit in the flasher when the port would
// be reset, so we can just keep going at this point. // be reset, so we can just keep going at this point.
pthread_mutex_lock(&txcmd_lock);
if (txcmd_pending) { if (txcmd_pending) {
if (!uart_send(port, (byte_t*) &txcmd, sizeof(UsbCommand))) { if (!uart_send(port, (byte_t*) &txcmd, sizeof(UsbCommand))) {
PrintAndLog("Sending bytes to proxmark failed"); PrintAndLog("Sending bytes to proxmark failed");
} }
txcmd_pending = false; txcmd_pending = false;
// Signal SendCommand to say that we're ready for more.
pthread_cond_signal(&txcmd_sig);
} }
pthread_mutex_unlock(&txcmd_lock);
} }
pthread_exit(NULL); pthread_exit(NULL);