diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix pthread complaining

Browse Source
This commit is contained in:
Vítor Santos Costa
2015-10-22 00:33:38 +01:00
parent d6148eb8ad
commit bcdfdeb65d
24 changed files with 34 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
C/agc.c
View File

@@ -416,7 +416,7 @@ clean_atom_list(AtomHashEntry *HashPtr)
} else {
NOfAtoms--;
if (IsBlob(atm)) {
BlobPropEntry *b = RepBlobProp(at->PropsOfAE);
YAP_BlobPropEntry *b = RepBlobProp(at->PropsOfAE);
if (b->NextOfPE != NIL) {
patm = &(at->NextOfAE);
atm = at->NextOfAE;
@@ -425,7 +425,7 @@ clean_atom_list(AtomHashEntry *HashPtr)
NOfAtoms++;
NOfBlobs--;
Yap_FreeCodeSpace((char *)b);
GLOBAL_agc_collected += sizeof(BlobPropEntry);
GLOBAL_agc_collected += sizeof(YAP_BlobPropEntry);
GLOBAL_agc_collected += sizeof(AtomEntry)+sizeof(size_t)+at->rep.blob->length;
} else if (IsWideAtom(atm)) {
#ifdef DEBUG_RESTORE3

13
C/blobs.c
View File

@@ -73,7 +73,7 @@ int Yap_write_blob(AtomEntry *ref, FILE *stream)
if (type->write) {
Atom at = AbsAtom(ref);
return type->write(stream, at, 0);
return type->write(stream, at, 0);
} else {
#if defined(__linux__) || defined(__APPLE__)
return fprintf(stream, "\'%s\'(%p)", RepAtom(AtomSWIStream)->StrOfAE, ref);
@@ -92,7 +92,7 @@ YAP_is_blob(Term t, blob_type_t **type)
CACHE_REGS
Term yt = Yap_GetFromSlot(t);
Atom a;
BlobPropEntry *b;
YAP_BlobPropEntry *b;
if (IsVarTerm(yt))
return FALSE;
@@ -122,7 +122,7 @@ YAP_is_blob(Term t, blob_type_t **type)
AtomEntry *
Yap_lookupBlob(void *blob, size_t len, void *type0, int *new)
{
BlobPropEntry *b;
YAP_BlobPropEntry *b;
AtomEntry *ae;
blob_type_t *type = type0;
if (new)
@@ -145,7 +145,7 @@ Yap_lookupBlob(void *blob, size_t len, void *type0, int *new)
}
if (new)
*new = TRUE;
b = (BlobPropEntry *)Yap_AllocCodeSpace(sizeof(BlobPropEntry));
b = (YAP_BlobPropEntry *)Yap_AllocCodeSpace(sizeof(YAP_BlobPropEntry));
if (!b) {
UNLOCK(Blobs_Lock);
return NULL;
@@ -225,7 +225,10 @@ YAP_blob_data(Atom x, size_t *len, blob_type_t **type)
if ( len )
*len = wcslen(x->WStrOfAE);
if ( type )
*type = &unregistered_blob_atom;
*type = &unregistered_blob_atom;
return x->WStrOfAE;
}
if ( len )