mirror of
https://github.com/jberthold/packman.git
synced 2024-09-11 13:45:24 +03:00
follow renaming of StgArrWords to StgArrBytes
This commit is contained in:
Jost Berthold
parent
2b4cca24d4
commit
f51cf8b784
45
cbits/Pack.c
45
cbits/Pack.c
@ -46,6 +46,11 @@
|
||||
#include <string.h> // memset
|
||||
#endif
|
||||
|
||||
#if __GLASGOW_HASKELL__ < 711
|
||||
// programming against internal types is great, isn't it? :-P
|
||||
#define StgArrBytes StgArrWords
|
||||
#endif
|
||||
|
||||
#ifdef DEBUG
|
||||
#define DBG_HEADROOM 1
|
||||
#define END_OF_BUFFER_MARKER 0xdededeee
|
||||
@ -137,7 +142,7 @@ static void init(void) __attribute__((constructor));
|
||||
|
||||
// init/destruct pack data structure
|
||||
#ifdef LIBRARY_CODE
|
||||
static PackState* initPacking(StgArrWords *mutArr);
|
||||
static PackState* initPacking(StgArrBytes *mutArr);
|
||||
#else
|
||||
static PackState* initRtsPacking(StgWord *buffer, nat size, StgTSO *tso);
|
||||
#endif
|
||||
@ -179,7 +184,7 @@ STATIC_INLINE rtsBool pmIsBlackhole(StgClosure* node);
|
||||
#ifdef LIBRARY_CODE
|
||||
// interface function used in foreign primop: pack graph to given array, return
|
||||
// size in bytes (offset by P_ERRCODEMAX) or an error code
|
||||
int pmtryPackToBuffer(StgClosure* closure, StgArrWords* mutArr);
|
||||
int pmtryPackToBuffer(StgClosure* closure, StgArrBytes* mutArr);
|
||||
#else
|
||||
// in-RTS version: packToBuffer, declared in Parallel.h
|
||||
// int packToBuffer(StgClosure* closure,
|
||||
@ -214,12 +219,12 @@ static StgWord PackArray(PackState* p, StgClosure* array);
|
||||
#ifdef LIBRARY_CODE
|
||||
// interface unpacking from a Haskell array (using the Haskell Byte Array)
|
||||
// may return error code P_GARBLED
|
||||
StgClosure* pmUnpackGraphWrapper(StgArrWords* packBufferArray, Capability* cap);
|
||||
StgClosure* pmUnpackGraphWrapper(StgArrBytes* packBufferArray, Capability* cap);
|
||||
#else
|
||||
// in-RTS unpacking: unpacks from rtsPackBuffer and wipes it, aborts on failure
|
||||
// declared in Parallel.h
|
||||
// StgClosure* unpackGraph(rtsPackBuffer *packBuffer, Capability* cap);
|
||||
// StgClosure* unpackGraphWrapper(StgArrWords* packBufferArray, Capability* cap);
|
||||
// StgClosure* unpackGraphWrapper(StgArrBytes* packBufferArray, Capability* cap);
|
||||
#endif
|
||||
|
||||
// internal function working on the raw data buffer
|
||||
@ -298,7 +303,7 @@ static void init(void) {
|
||||
#ifdef LIBRARY_CODE
|
||||
// A mutable array is passed as the buffer space. Note that its size comes in
|
||||
// bytes, while internally all is managed in units of StgWord.
|
||||
static PackState* initPacking(StgArrWords *mutArr) {
|
||||
static PackState* initPacking(StgArrBytes *mutArr) {
|
||||
PackState *ret;
|
||||
|
||||
ret = (PackState*) stgMallocBytes(sizeof(PackState), "pack state");
|
||||
@ -563,7 +568,7 @@ getClosureInfo(StgClosure* node, StgInfoTable* info,
|
||||
case ARR_WORDS:
|
||||
*vhs = 1;
|
||||
*ptrs = 0;
|
||||
*nonptrs = (((StgArrWords*) node)->bytes) / sizeof(StgWord);
|
||||
*nonptrs = (((StgArrBytes*) node)->bytes) / sizeof(StgWord);
|
||||
break;
|
||||
|
||||
/* For Arrays of pointers, we need to fill in all the pointers and
|
||||
@ -699,7 +704,7 @@ STATIC_INLINE void Pack(PackState* p, StgWord data) {
|
||||
// pmtryPackToBuffer: interface function called by the foreign primop.
|
||||
// Returns packed size (in bytes!) + P_ERRCODEMAX when successful, or
|
||||
// error codes upon failure
|
||||
int pmtryPackToBuffer(StgClosure* closure, StgArrWords* mutArr) {
|
||||
int pmtryPackToBuffer(StgClosure* closure, StgArrBytes* mutArr) {
|
||||
int errcode = P_SUCCESS; // error code returned by PackClosure
|
||||
PackState* p;
|
||||
nat size;
|
||||
@ -806,7 +811,7 @@ StgClosure* tryPackToMemory(StgClosure* graphroot,
|
||||
StgTSO* tso, Capability* cap) {
|
||||
StgWord *buffer;
|
||||
StgWord packedSize, trySize;
|
||||
StgArrWords* wordArray;
|
||||
StgArrBytes* wordArray;
|
||||
|
||||
#define ONEMEGABYTE 1048576
|
||||
trySize = ONEMEGABYTE; // start with 1MB buffer, increase if it fails
|
||||
@ -844,7 +849,7 @@ StgClosure* tryPackToMemory(StgClosure* graphroot,
|
||||
// +---------+----------+------------------------+
|
||||
// |ARR_WORDS| n_bytes | data (array of words) |
|
||||
// +---------+----------+------------------------+
|
||||
wordArray = (StgArrWords*) allocate(cap, 2 + packedSize / sizeof(StgWord));
|
||||
wordArray = (StgArrBytes*) allocate(cap, 2 + packedSize / sizeof(StgWord));
|
||||
SET_HDR(wordArray, &stg_ARR_WORDS_info, CCS_SYSTEM);
|
||||
wordArray->bytes = packedSize;
|
||||
memcpy((void*) &(wordArray->payload), buffer, packedSize);
|
||||
@ -1471,7 +1476,7 @@ static StgWord PackPAP(PackState *p, StgPAP *pap) {
|
||||
// Packing Arrays.
|
||||
|
||||
// An Array in the heap can contain StgWords or Pointers (to
|
||||
// closures), and is thus of type StgArrWords or StgMutArrPtrs.
|
||||
// closures), and is thus of type StgArrWords/Bytes or StgMutArrPtrs.
|
||||
//
|
||||
// Array layout in heap/buffer is the following:
|
||||
//
|
||||
@ -1483,8 +1488,8 @@ static StgWord PackPAP(PackState *p, StgPAP *pap) {
|
||||
//
|
||||
// The array size is stored in bytes, but will always be word-aligned.
|
||||
//
|
||||
// Historically, this routine was also packing ArrWords, but they can
|
||||
// equally well be treated as "pointers-first" generic layout (with no
|
||||
// Historically, this routine was also packing StgArrWords/Bytes, but they
|
||||
// can equally well be treated as "pointers-first" generic layout (with no
|
||||
// pointers), and are packed simply by copying all words (as non-ptrs).
|
||||
//
|
||||
// MutArrPtrs (MUT_ARRAY_PTRS_* types) contain pointers to other
|
||||
@ -1519,7 +1524,7 @@ static StgWord PackArray(PackState *p, StgClosure *closure) {
|
||||
payloadsize = ((StgMutArrPtrs *)closure)->ptrs;
|
||||
|
||||
// the function in ClosureMacros.h would include the header:
|
||||
// arr_words_sizeW(stgCast(StgArrWords*,q));
|
||||
// arr_words_sizeW(stgCast(StgArrBytes*,q));
|
||||
PACKETDEBUG(debugBelch("*>== %p (%s): packing array"
|
||||
"(%d words) (size=%d)\n",
|
||||
closure, info_type(closure), payloadsize,
|
||||
@ -1577,9 +1582,9 @@ static StgWord PackArray(PackState *p, StgClosure *closure) {
|
||||
#ifdef LIBRARY_CODE
|
||||
// unpacking from a Haskell array (using the Haskell Byte Array)
|
||||
// may return error code P_GARBLED
|
||||
StgClosure* pmUnpackGraphWrapper(StgArrWords* packBufferArray, Capability* cap)
|
||||
StgClosure* pmUnpackGraphWrapper(StgArrBytes* packBufferArray, Capability* cap)
|
||||
#else
|
||||
StgClosure* unpackGraphWrapper(StgArrWords* packBufferArray, Capability* cap)
|
||||
StgClosure* unpackGraphWrapper(StgArrBytes* packBufferArray, Capability* cap)
|
||||
#endif
|
||||
{
|
||||
nat size;
|
||||
@ -2571,7 +2576,7 @@ print:
|
||||
case ARR_WORDS:
|
||||
{ // record size only (contains StgWords, not pointers)
|
||||
char str[6];
|
||||
sprintf(str, "%ld", (long) arr_words_words((StgArrWords*)p));
|
||||
sprintf(str, "%ld", (long) arr_words_words((StgArrBytes*)p));
|
||||
strcat(fp, str);
|
||||
}
|
||||
break;
|
||||
@ -2781,11 +2786,3 @@ static void checkPacket(StgWord* buffer, nat size) {
|
||||
|
||||
/* END OF DEBUG */
|
||||
#endif
|
||||
|
||||
// Local Variables:
|
||||
// mode: C++
|
||||
// fill-column: 80
|
||||
// indent-tabs-mode: nil
|
||||
// c-basic-offset: 4
|
||||
// buffer-file-coding-system: utf-8-unix
|
||||
// End:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user