MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tiny fixes.

develop
Petr Mrázek 2010-05-26 17:54:30 +02:00
parent ee8ac4e508
commit af1a41712e
5 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/DFProcess-linux-SHM.cpp
Unescape Escape View File

@ -609,7 +609,7 @@ void SHMProcess::read (uint32_t src_address, uint32_t size, uint8_t *target_buff
else
{
// first read equals the size of the SHM window
uint32_t to_read = SHM_BODY;
uint32_t to_read = SHM_BODY - 1024;
while (size)
{
// read to_read bytes from src_cursor

1
library/DFProcess-windows-SHM.cpp
Unescape Escape View File

@ -23,7 +23,6 @@ distribution.
*/
#include "Internal.h"
#include "dfhack/DFProcess.h"
#include "dfhack/DFWindow.h"
#include "dfhack/DFMemInfo.h"
#include "dfhack/DFError.h"
#include "shms.h"

1
library/DFProcess-windows.cpp
Unescape Escape View File

@ -23,7 +23,6 @@ distribution.
*/
#include "Internal.h"
#include "dfhack/DFProcess.h"
#include "dfhack/DFWindow.h"
#include "dfhack/DFMemInfo.h"
#include "dfhack/DFError.h"
using namespace DFHack;

2
library/include/DFHack.h
Unescape Escape View File

@ -1,4 +1,4 @@
#ifndef DFHACK_API_H
#ifndef DFHACK_API_H
#define DFHACK_API_H
#include "dfhack/DFIntegers.h"

36
tools/playground/incrementalsearch.cpp
Unescape Escape View File

@ -156,7 +156,40 @@ void searchLoopVector(DFHack::ContextManager & DFMgr, vector <DFHack::t_memrange
}
}
}
void mkcopy(DFHack::ContextManager & DFMgr, vector <DFHack::t_memrange>& ranges, uint32_t element_size)
{
DFMgr.Refresh();
DFHack::Context * DF = DFMgr.getSingleContext();
DF->Attach();
for (int i = 0; i < ranges.size();i++)
{
// can't read? range is invalid to us
if(!ranges[i].read)
continue;
char * buffah = (char *) malloc(ranges[i].end - ranges[i].start);
if(buffah)
{
DF->ReadRaw(ranges[i].start,ranges[i].end - ranges[i].start, (uint8_t *) buffah);
cerr << "buffer for range " << i << " allocated and filled" << endl;
free(buffah);
cerr << "and freed" << endl;
}
else
cerr << "buffer for range " << i << " failed to allocate" << endl;
//loop
/*
for(uint64_t offset = ranges[i].start;offset <= ranges[i].end - sizeof(vecTriplet); offset+=4)
{
DF->ReadRaw(offset, sizeof(vecTriplet), (uint8_t *) &load);
if(load.start <= load.finish && load.finish <= load.alloc_finish)
if((load.finish - load.start) / element_size == length)
found.push_back(offset);
}
*/
}
DF->Detach();
DFMgr.purge();
}
int main (void)
{
@ -325,6 +358,7 @@ int main (void)
}
else if(mode == 3)// string
{
mkcopy(DFMgr, selected_ranges,0);
//searchLoopString(DF, selected_ranges);
}
#ifndef LINUX_BUILD