|
|
@ -28,8 +28,50 @@ distribution.
|
|
|
|
#include <sys/ipc.h>
|
|
|
|
#include <sys/ipc.h>
|
|
|
|
#include <time.h>
|
|
|
|
#include <time.h>
|
|
|
|
#include "shmserver/dfconnect.h"
|
|
|
|
#include "shmserver/dfconnect.h"
|
|
|
|
|
|
|
|
#include <sys/time.h>
|
|
|
|
|
|
|
|
#include <time.h>
|
|
|
|
|
|
|
|
#include <linux/futex.h>
|
|
|
|
|
|
|
|
#include <sys/syscall.h>
|
|
|
|
using namespace DFHack;
|
|
|
|
using namespace DFHack;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// a full memory barrier! better be safe than sorry.
|
|
|
|
|
|
|
|
#define gcc_barrier asm volatile("" ::: "memory"); __sync_synchronize();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
* wait for futex
|
|
|
|
|
|
|
|
* futex has to be aligned to 4 bytes
|
|
|
|
|
|
|
|
* futex has to be equal to val (returns EWOULDBLOCK otherwise)
|
|
|
|
|
|
|
|
* wait can be broken by arriving signals (returns EINTR)
|
|
|
|
|
|
|
|
* returns 0 when broken by futex_wake
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
inline int futex_wait(int * futex, int val)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return syscall(SYS_futex, futex, FUTEX_WAIT, val, 0, 0, 0);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
* wait for futex
|
|
|
|
|
|
|
|
* futex has to be aligned to 4 bytes
|
|
|
|
|
|
|
|
* futex has to be equal to val (returns EWOULDBLOCK otherwise)
|
|
|
|
|
|
|
|
* wait can be broken by arriving signals (returns EINTR)
|
|
|
|
|
|
|
|
* returns 0 when broken by futex_wake
|
|
|
|
|
|
|
|
* returns ETIMEDOUT on timeout
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
inline int futex_wait_timed(int * futex, int val, const struct timespec *timeout)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return syscall(SYS_futex, futex, FUTEX_WAIT, val, timeout, 0, 0);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
* wake up futex. returns number of waked processes
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
inline int futex_wake(int * futex)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return syscall(SYS_futex, futex, FUTEX_WAKE, 1, 0, 0, 0);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static timespec one_second = { 1,0 };
|
|
|
|
|
|
|
|
static timespec five_second = { 5,0 };
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class SHMProcess::Private
|
|
|
|
class SHMProcess::Private
|
|
|
|
{
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
public:
|
|
|
@ -38,6 +80,8 @@ class SHMProcess::Private
|
|
|
|
my_datamodel = NULL;
|
|
|
|
my_datamodel = NULL;
|
|
|
|
my_descriptor = NULL;
|
|
|
|
my_descriptor = NULL;
|
|
|
|
my_pid = 0;
|
|
|
|
my_pid = 0;
|
|
|
|
|
|
|
|
my_shm = 0;
|
|
|
|
|
|
|
|
my_shmid = -1;
|
|
|
|
my_window = NULL;
|
|
|
|
my_window = NULL;
|
|
|
|
attached = false;
|
|
|
|
attached = false;
|
|
|
|
suspended = false;
|
|
|
|
suspended = false;
|
|
|
@ -54,6 +98,7 @@ class SHMProcess::Private
|
|
|
|
bool attached;
|
|
|
|
bool attached;
|
|
|
|
bool suspended;
|
|
|
|
bool suspended;
|
|
|
|
bool identified;
|
|
|
|
bool identified;
|
|
|
|
|
|
|
|
|
|
|
|
bool validate(char * exe_file, uint32_t pid, vector <memory_info> & known_versions);
|
|
|
|
bool validate(char * exe_file, uint32_t pid, vector <memory_info> & known_versions);
|
|
|
|
bool waitWhile (DF_PINGPONG state);
|
|
|
|
bool waitWhile (DF_PINGPONG state);
|
|
|
|
bool DF_TestBridgeVersion(bool & ret);
|
|
|
|
bool DF_TestBridgeVersion(bool & ret);
|
|
|
@ -71,6 +116,7 @@ bool SHMProcess::Private::waitWhile (DF_PINGPONG state)
|
|
|
|
shmctl(my_shmid, IPC_STAT, &descriptor);
|
|
|
|
shmctl(my_shmid, IPC_STAT, &descriptor);
|
|
|
|
if(descriptor.shm_nattch == 1)// DF crashed?
|
|
|
|
if(descriptor.shm_nattch == 1)// DF crashed?
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
gcc_barrier
|
|
|
|
((shm_cmd *)my_shm)->pingpong = DFPP_RUNNING;
|
|
|
|
((shm_cmd *)my_shm)->pingpong = DFPP_RUNNING;
|
|
|
|
attached = suspended = false;
|
|
|
|
attached = suspended = false;
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
@ -96,8 +142,10 @@ bool SHMProcess::Private::waitWhile (DF_PINGPONG state)
|
|
|
|
bool SHMProcess::Private::DF_TestBridgeVersion(bool & ret)
|
|
|
|
bool SHMProcess::Private::DF_TestBridgeVersion(bool & ret)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
((shm_cmd *)my_shm)->pingpong = DFPP_VERSION;
|
|
|
|
((shm_cmd *)my_shm)->pingpong = DFPP_VERSION;
|
|
|
|
|
|
|
|
gcc_barrier
|
|
|
|
if(!waitWhile(DFPP_VERSION))
|
|
|
|
if(!waitWhile(DFPP_VERSION))
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
|
|
|
|
gcc_barrier
|
|
|
|
((shm_cmd *)my_shm)->pingpong = DFPP_SUSPENDED;
|
|
|
|
((shm_cmd *)my_shm)->pingpong = DFPP_SUSPENDED;
|
|
|
|
ret =( ((shm_retval *)my_shm)->value == PINGPONG_VERSION );
|
|
|
|
ret =( ((shm_retval *)my_shm)->value == PINGPONG_VERSION );
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
@ -106,8 +154,10 @@ bool SHMProcess::Private::DF_TestBridgeVersion(bool & ret)
|
|
|
|
bool SHMProcess::Private::DF_GetPID(pid_t & ret)
|
|
|
|
bool SHMProcess::Private::DF_GetPID(pid_t & ret)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
((shm_cmd *)my_shm)->pingpong = DFPP_PID;
|
|
|
|
((shm_cmd *)my_shm)->pingpong = DFPP_PID;
|
|
|
|
|
|
|
|
gcc_barrier
|
|
|
|
if(!waitWhile(DFPP_PID))
|
|
|
|
if(!waitWhile(DFPP_PID))
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
|
|
|
|
gcc_barrier
|
|
|
|
((shm_cmd *)my_shm)->pingpong = DFPP_SUSPENDED;
|
|
|
|
((shm_cmd *)my_shm)->pingpong = DFPP_SUSPENDED;
|
|
|
|
ret = ((shm_retval *)my_shm)->value;
|
|
|
|
ret = ((shm_retval *)my_shm)->value;
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
@ -139,11 +189,12 @@ SHMProcess::SHMProcess(vector <memory_info> & known_versions)
|
|
|
|
/*
|
|
|
|
/*
|
|
|
|
* Check if there are two processes connected to the segment
|
|
|
|
* Check if there are two processes connected to the segment
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
struct shmid_ds descriptor;
|
|
|
|
shmid_ds descriptor;
|
|
|
|
shmctl(d->my_shmid, IPC_STAT, &descriptor);
|
|
|
|
shmctl(d->my_shmid, IPC_STAT, &descriptor);
|
|
|
|
if(descriptor.shm_nattch != 2)// badness
|
|
|
|
if(descriptor.shm_nattch != 2)// badness
|
|
|
|
{
|
|
|
|
{
|
|
|
|
fprintf(stderr,"dfhack: no DF or different client already connected\n");
|
|
|
|
fprintf(stderr,"dfhack: %d : invalid no. of processes connected\n", descriptor.shm_nattch);
|
|
|
|
|
|
|
|
fprintf(stderr,"detach: %d",shmdt(d->my_shm));
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -182,8 +233,10 @@ SHMProcess::SHMProcess(vector <memory_info> & known_versions)
|
|
|
|
d->validate(target_name, d->my_pid, known_versions);
|
|
|
|
d->validate(target_name, d->my_pid, known_versions);
|
|
|
|
d->my_window = new DFWindow(this);
|
|
|
|
d->my_window = new DFWindow(this);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
gcc_barrier
|
|
|
|
// at this point, DF is stopped and waiting for commands. make it run again
|
|
|
|
// at this point, DF is stopped and waiting for commands. make it run again
|
|
|
|
((shm_cmd *)d->my_shm)->pingpong = DFPP_RUNNING;
|
|
|
|
((shm_cmd *)d->my_shm)->pingpong = DFPP_RUNNING;
|
|
|
|
|
|
|
|
fprintf(stderr,"detach: %d",shmdt(d->my_shm));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool SHMProcess::isSuspended()
|
|
|
|
bool SHMProcess::isSuspended()
|
|
|
@ -239,6 +292,10 @@ SHMProcess::~SHMProcess()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
delete d->my_window;
|
|
|
|
delete d->my_window;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(d->my_shm)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
fprintf(stderr,"detach: %d",shmdt(d->my_shm));
|
|
|
|
|
|
|
|
}
|
|
|
|
delete d;
|
|
|
|
delete d;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -341,6 +398,11 @@ bool SHMProcess::attach()
|
|
|
|
cerr << "there's already a different process attached" << endl;
|
|
|
|
cerr << "there's already a different process attached" << endl;
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
* Attach the segment
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
if ((d->my_shm = (char *) shmat(d->my_shmid, NULL, 0)) != (char *) -1)
|
|
|
|
|
|
|
|
{
|
|
|
|
d->attached = true;
|
|
|
|
d->attached = true;
|
|
|
|
if(suspend())
|
|
|
|
if(suspend())
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -352,6 +414,9 @@ bool SHMProcess::attach()
|
|
|
|
cerr << "unable to suspend" << endl;
|
|
|
|
cerr << "unable to suspend" << endl;
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
cerr << "unable to attach" << endl;
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool SHMProcess::detach()
|
|
|
|
bool SHMProcess::detach()
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -375,6 +440,7 @@ void SHMProcess::read (const uint32_t offset, const uint32_t size, uint8_t *targ
|
|
|
|
assert (size < (SHM_SIZE - sizeof(shm_read)));
|
|
|
|
assert (size < (SHM_SIZE - sizeof(shm_read)));
|
|
|
|
((shm_read *)d->my_shm)->address = offset;
|
|
|
|
((shm_read *)d->my_shm)->address = offset;
|
|
|
|
((shm_read *)d->my_shm)->length = size;
|
|
|
|
((shm_read *)d->my_shm)->length = size;
|
|
|
|
|
|
|
|
gcc_barrier
|
|
|
|
((shm_read *)d->my_shm)->pingpong = DFPP_READ;
|
|
|
|
((shm_read *)d->my_shm)->pingpong = DFPP_READ;
|
|
|
|
d->waitWhile(DFPP_READ);
|
|
|
|
d->waitWhile(DFPP_READ);
|
|
|
|
memcpy (target, d->my_shm + sizeof(shm_ret_data),size);
|
|
|
|
memcpy (target, d->my_shm + sizeof(shm_ret_data),size);
|
|
|
@ -383,6 +449,7 @@ void SHMProcess::read (const uint32_t offset, const uint32_t size, uint8_t *targ
|
|
|
|
uint8_t SHMProcess::readByte (const uint32_t offset)
|
|
|
|
uint8_t SHMProcess::readByte (const uint32_t offset)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
((shm_read_small *)d->my_shm)->address = offset;
|
|
|
|
((shm_read_small *)d->my_shm)->address = offset;
|
|
|
|
|
|
|
|
gcc_barrier
|
|
|
|
((shm_read_small *)d->my_shm)->pingpong = DFPP_READ_BYTE;
|
|
|
|
((shm_read_small *)d->my_shm)->pingpong = DFPP_READ_BYTE;
|
|
|
|
d->waitWhile(DFPP_READ_BYTE);
|
|
|
|
d->waitWhile(DFPP_READ_BYTE);
|
|
|
|
return ((shm_retval *)d->my_shm)->value;
|
|
|
|
return ((shm_retval *)d->my_shm)->value;
|
|
|
@ -391,6 +458,7 @@ uint8_t SHMProcess::readByte (const uint32_t offset)
|
|
|
|
void SHMProcess::readByte (const uint32_t offset, uint8_t &val )
|
|
|
|
void SHMProcess::readByte (const uint32_t offset, uint8_t &val )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
((shm_read_small *)d->my_shm)->address = offset;
|
|
|
|
((shm_read_small *)d->my_shm)->address = offset;
|
|
|
|
|
|
|
|
gcc_barrier
|
|
|
|
((shm_read_small *)d->my_shm)->pingpong = DFPP_READ_BYTE;
|
|
|
|
((shm_read_small *)d->my_shm)->pingpong = DFPP_READ_BYTE;
|
|
|
|
d->waitWhile(DFPP_READ_BYTE);
|
|
|
|
d->waitWhile(DFPP_READ_BYTE);
|
|
|
|
val = ((shm_retval *)d->my_shm)->value;
|
|
|
|
val = ((shm_retval *)d->my_shm)->value;
|
|
|
@ -399,6 +467,7 @@ void SHMProcess::readByte (const uint32_t offset, uint8_t &val )
|
|
|
|
uint16_t SHMProcess::readWord (const uint32_t offset)
|
|
|
|
uint16_t SHMProcess::readWord (const uint32_t offset)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
((shm_read_small *)d->my_shm)->address = offset;
|
|
|
|
((shm_read_small *)d->my_shm)->address = offset;
|
|
|
|
|
|
|
|
gcc_barrier
|
|
|
|
((shm_read_small *)d->my_shm)->pingpong = DFPP_READ_WORD;
|
|
|
|
((shm_read_small *)d->my_shm)->pingpong = DFPP_READ_WORD;
|
|
|
|
d->waitWhile(DFPP_READ_WORD);
|
|
|
|
d->waitWhile(DFPP_READ_WORD);
|
|
|
|
return ((shm_retval *)d->my_shm)->value;
|
|
|
|
return ((shm_retval *)d->my_shm)->value;
|
|
|
@ -407,6 +476,7 @@ uint16_t SHMProcess::readWord (const uint32_t offset)
|
|
|
|
void SHMProcess::readWord (const uint32_t offset, uint16_t &val)
|
|
|
|
void SHMProcess::readWord (const uint32_t offset, uint16_t &val)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
((shm_read_small *)d->my_shm)->address = offset;
|
|
|
|
((shm_read_small *)d->my_shm)->address = offset;
|
|
|
|
|
|
|
|
gcc_barrier
|
|
|
|
((shm_read_small *)d->my_shm)->pingpong = DFPP_READ_WORD;
|
|
|
|
((shm_read_small *)d->my_shm)->pingpong = DFPP_READ_WORD;
|
|
|
|
d->waitWhile(DFPP_READ_WORD);
|
|
|
|
d->waitWhile(DFPP_READ_WORD);
|
|
|
|
val = ((shm_retval *)d->my_shm)->value;
|
|
|
|
val = ((shm_retval *)d->my_shm)->value;
|
|
|
@ -415,6 +485,7 @@ void SHMProcess::readWord (const uint32_t offset, uint16_t &val)
|
|
|
|
uint32_t SHMProcess::readDWord (const uint32_t offset)
|
|
|
|
uint32_t SHMProcess::readDWord (const uint32_t offset)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
((shm_read_small *)d->my_shm)->address = offset;
|
|
|
|
((shm_read_small *)d->my_shm)->address = offset;
|
|
|
|
|
|
|
|
gcc_barrier
|
|
|
|
((shm_read_small *)d->my_shm)->pingpong = DFPP_READ_DWORD;
|
|
|
|
((shm_read_small *)d->my_shm)->pingpong = DFPP_READ_DWORD;
|
|
|
|
d->waitWhile(DFPP_READ_DWORD);
|
|
|
|
d->waitWhile(DFPP_READ_DWORD);
|
|
|
|
return ((shm_retval *)d->my_shm)->value;
|
|
|
|
return ((shm_retval *)d->my_shm)->value;
|
|
|
@ -422,6 +493,7 @@ uint32_t SHMProcess::readDWord (const uint32_t offset)
|
|
|
|
void SHMProcess::readDWord (const uint32_t offset, uint32_t &val)
|
|
|
|
void SHMProcess::readDWord (const uint32_t offset, uint32_t &val)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
((shm_read_small *)d->my_shm)->address = offset;
|
|
|
|
((shm_read_small *)d->my_shm)->address = offset;
|
|
|
|
|
|
|
|
gcc_barrier
|
|
|
|
((shm_read_small *)d->my_shm)->pingpong = DFPP_READ_DWORD;
|
|
|
|
((shm_read_small *)d->my_shm)->pingpong = DFPP_READ_DWORD;
|
|
|
|
d->waitWhile(DFPP_READ_DWORD);
|
|
|
|
d->waitWhile(DFPP_READ_DWORD);
|
|
|
|
val = ((shm_retval *)d->my_shm)->value;
|
|
|
|
val = ((shm_retval *)d->my_shm)->value;
|
|
|
@ -435,6 +507,7 @@ void SHMProcess::writeDWord (uint32_t offset, uint32_t data)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
((shm_write_small *)d->my_shm)->address = offset;
|
|
|
|
((shm_write_small *)d->my_shm)->address = offset;
|
|
|
|
((shm_write_small *)d->my_shm)->value = data;
|
|
|
|
((shm_write_small *)d->my_shm)->value = data;
|
|
|
|
|
|
|
|
gcc_barrier
|
|
|
|
((shm_write_small *)d->my_shm)->pingpong = DFPP_WRITE_DWORD;
|
|
|
|
((shm_write_small *)d->my_shm)->pingpong = DFPP_WRITE_DWORD;
|
|
|
|
d->waitWhile(DFPP_WRITE_DWORD);
|
|
|
|
d->waitWhile(DFPP_WRITE_DWORD);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -444,6 +517,7 @@ void SHMProcess::writeWord (uint32_t offset, uint16_t data)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
((shm_write_small *)d->my_shm)->address = offset;
|
|
|
|
((shm_write_small *)d->my_shm)->address = offset;
|
|
|
|
((shm_write_small *)d->my_shm)->value = data;
|
|
|
|
((shm_write_small *)d->my_shm)->value = data;
|
|
|
|
|
|
|
|
gcc_barrier
|
|
|
|
((shm_write_small *)d->my_shm)->pingpong = DFPP_WRITE_WORD;
|
|
|
|
((shm_write_small *)d->my_shm)->pingpong = DFPP_WRITE_WORD;
|
|
|
|
d->waitWhile(DFPP_WRITE_WORD);
|
|
|
|
d->waitWhile(DFPP_WRITE_WORD);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -452,6 +526,7 @@ void SHMProcess::writeByte (uint32_t offset, uint8_t data)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
((shm_write_small *)d->my_shm)->address = offset;
|
|
|
|
((shm_write_small *)d->my_shm)->address = offset;
|
|
|
|
((shm_write_small *)d->my_shm)->value = data;
|
|
|
|
((shm_write_small *)d->my_shm)->value = data;
|
|
|
|
|
|
|
|
gcc_barrier
|
|
|
|
((shm_write_small *)d->my_shm)->pingpong = DFPP_WRITE_BYTE;
|
|
|
|
((shm_write_small *)d->my_shm)->pingpong = DFPP_WRITE_BYTE;
|
|
|
|
d->waitWhile(DFPP_WRITE_BYTE);
|
|
|
|
d->waitWhile(DFPP_WRITE_BYTE);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -461,6 +536,7 @@ void SHMProcess::write (uint32_t offset, uint32_t size, const uint8_t *source)
|
|
|
|
((shm_write *)d->my_shm)->address = offset;
|
|
|
|
((shm_write *)d->my_shm)->address = offset;
|
|
|
|
((shm_write *)d->my_shm)->length = size;
|
|
|
|
((shm_write *)d->my_shm)->length = size;
|
|
|
|
memcpy(d->my_shm+sizeof(shm_write),source, size);
|
|
|
|
memcpy(d->my_shm+sizeof(shm_write),source, size);
|
|
|
|
|
|
|
|
gcc_barrier
|
|
|
|
((shm_write *)d->my_shm)->pingpong = DFPP_WRITE;
|
|
|
|
((shm_write *)d->my_shm)->pingpong = DFPP_WRITE;
|
|
|
|
d->waitWhile(DFPP_WRITE);
|
|
|
|
d->waitWhile(DFPP_WRITE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|