Skip to content

Commit

Permalink
Fix for Issue #283 (TextIO.inputAll segfaults when reading 980M file)
Browse files Browse the repository at this point in the history
  • Loading branch information
@JohnReppy
JohnReppy committed Mar 1, 2024
1 parent 6aea749 commit 382df3a
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 29 deletions.
35 changes: 18 additions & 17 deletions base/runtime/gc/ml-objects.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ ml_val_t ML_CString (ml_state_t *msp, const char *v)
if (len == 0)
return ML_string0;
else {
int n = BYTES_TO_WORDS(len+1); /* count "\0" too */
ml_val_t res;
Word_t n = BYTES_TO_WORDS(len+1); /* count "\0" too */
ml_val_t res;

res = ML_AllocRaw (msp, n);
/* zero the last word to allow fast (word) string comparisons, and to
Expand Down Expand Up @@ -98,9 +98,9 @@ ml_val_t ML_CStringList (ml_state_t *msp, char **strs)
* Allocate an uninitialized ML string of length > 0. This string is
* guaranteed to be padded to word size with 0 bytes, and to be 0 terminated.
*/
ml_val_t ML_AllocString (ml_state_t *msp, int len)
ml_val_t ML_AllocString (ml_state_t *msp, Word_t len)
{
int nwords = BYTES_TO_WORDS(len+1);
Word_t nwords = BYTES_TO_WORDS(len+1);
ml_val_t res;

ASSERT(len > 0);
Expand All @@ -122,7 +122,7 @@ ml_val_t ML_AllocString (ml_state_t *msp, int len)
*
* Allocate an uninitialized chunk of raw data.
*/
ml_val_t ML_AllocRaw (ml_state_t *msp, int nwords)
ml_val_t ML_AllocRaw (ml_state_t *msp, Word_t nwords)
{
ml_val_t desc = MAKE_DESC(nwords, DTAG_raw);
ml_val_t res;
Expand All @@ -146,6 +146,7 @@ ml_val_t ML_AllocRaw (ml_state_t *msp, int nwords)
*(ap->nextw++) = desc;
res = PTR_CtoML(ap->nextw);
ap->nextw += nwords;
ASSERT(ap->nextw < ap->tospTop);
END_CRITICAL_SECT(MP_GCGenLock)
COUNT_ALLOC(msp, szb);
}
Expand All @@ -163,7 +164,7 @@ ml_val_t ML_AllocRaw (ml_state_t *msp, int nwords)
* Shrink a freshly allocated raw-data vector. This is used by the input routines
* that must allocate space for input that may be excessive.
*/
void ML_ShrinkRaw (ml_state_t *msp, ml_val_t v, int nWords)
void ML_ShrinkRaw (ml_state_t *msp, ml_val_t v, Word_t nWords)
{
int oldNWords = OBJ_LEN(v);

Expand All @@ -190,7 +191,7 @@ void ML_ShrinkRaw (ml_state_t *msp, ml_val_t v, int nWords)
*
* Allocate an uninitialized chunk of 64-bit aligned raw data.
*/
ml_val_t ML_AllocRaw64 (ml_state_t *msp, int nelems)
ml_val_t ML_AllocRaw64 (ml_state_t *msp, Word_t nelems)
{
int nwords = DOUBLES_TO_WORDS(nelems);
ml_val_t desc = MAKE_DESC(nwords, DTAG_raw64);
Expand Down Expand Up @@ -246,7 +247,7 @@ ml_val_t ML_AllocRaw64 (ml_state_t *msp, int nelems)
*
* Allocate an uninitialized ML code object. Assume that len > 1.
*/
ml_val_t ML_AllocCode (ml_state_t *msp, int len)
ml_val_t ML_AllocCode (ml_state_t *msp, Word_t len)
{
heap_t *heap = msp->ml_heap;
int allocGen = (heap->numGens < CODE_ALLOC_GEN)
Expand All @@ -272,10 +273,10 @@ ml_val_t ML_AllocCode (ml_state_t *msp, int len)
*
* Allocate an uninitialized ML bytearray. Assume that len > 0.
*/
ml_val_t ML_AllocBytearray (ml_state_t *msp, int len)
ml_val_t ML_AllocBytearray (ml_state_t *msp, Word_t len)
{
int nwords = BYTES_TO_WORDS(len);
ml_val_t res;
Word_t nwords = BYTES_TO_WORDS(len);
ml_val_t res;

res = ML_AllocRaw (msp, nwords);

Expand All @@ -294,7 +295,7 @@ ml_val_t ML_AllocBytearray (ml_state_t *msp, int len)
*
* Allocate an uninitialized ML realarray. Assume that len > 0.
*/
ml_val_t ML_AllocRealdarray (ml_state_t *msp, int len)
ml_val_t ML_AllocRealdarray (ml_state_t *msp, Word_t len)
{
ml_val_t res;

Expand All @@ -311,7 +312,7 @@ ml_val_t ML_AllocRealdarray (ml_state_t *msp, int len)
* Allocate a mutable data array using initVal as an initial value. Assume
* that len > 0.
*/
ml_val_t ML_AllocArrayData (ml_state_t *msp, int len, ml_val_t initVal)
ml_val_t ML_AllocArrayData (ml_state_t *msp, Word_t len, ml_val_t initVal)
{
ml_val_t res, *p;
ml_val_t desc = MAKE_DESC(len, DTAG_arr_data);
Expand Down Expand Up @@ -371,7 +372,7 @@ ml_val_t ML_AllocArrayData (ml_state_t *msp, int len, ml_val_t initVal)
* Allocate an ML array using initVal as an initial value. Assume
* that len > 0.
*/
ml_val_t ML_AllocArray (ml_state_t *msp, int len, ml_val_t initVal)
ml_val_t ML_AllocArray (ml_state_t *msp, Word_t len, ml_val_t initVal)
{
ml_val_t res;

Expand All @@ -388,7 +389,7 @@ ml_val_t ML_AllocArray (ml_state_t *msp, int len, ml_val_t initVal)
* Allocate an ML vector, using the list initVal as an initializer.
* Assume that len > 0.
*/
ml_val_t ML_AllocVector (ml_state_t *msp, int len, ml_val_t initVal)
ml_val_t ML_AllocVector (ml_state_t *msp, Word_t len, ml_val_t initVal)
{
ml_val_t desc = MAKE_DESC(len, DTAG_vec_data);
ml_val_t res, *p;
Expand Down Expand Up @@ -509,7 +510,7 @@ ml_val_t ML_SysConstList (ml_state_t *msp, sysconst_tbl_t *tbl)
*
* Allocate a 64-bit aligned raw data object (to store abstract C data).
*/
ml_val_t ML_AllocCData (ml_state_t *msp, int nbytes)
ml_val_t ML_AllocCData (ml_state_t *msp, Word_t nbytes)
{
ml_val_t obj;

Expand All @@ -524,7 +525,7 @@ ml_val_t ML_AllocCData (ml_state_t *msp, int nbytes)
*
* Allocate a 64-bit aligned raw data object and initialize it to the given C data.
*/
ml_val_t ML_CData (ml_state_t *msp, void *data, int nbytes)
ml_val_t ML_CData (ml_state_t *msp, void *data, Word_t nbytes)
{
ml_val_t obj;

Expand Down
24 changes: 12 additions & 12 deletions base/runtime/include/ml-objects.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,21 +342,21 @@ typedef Unsigned64_t SysWord_t;
/** external routines **/
extern ml_val_t ML_CString (ml_state_t *msp, const char *v);
extern ml_val_t ML_CStringList (ml_state_t *msp, char **strs);
extern ml_val_t ML_AllocString (ml_state_t *msp, int len);
extern ml_val_t ML_AllocCode (ml_state_t *msp, int len);
extern ml_val_t ML_AllocBytearray (ml_state_t *msp, int len);
extern ml_val_t ML_AllocRealdarray (ml_state_t *msp, int len);
extern ml_val_t ML_AllocArrayData (ml_state_t *msp, int len, ml_val_t initVal);
extern ml_val_t ML_AllocArray (ml_state_t *msp, int len, ml_val_t initVal);
extern ml_val_t ML_AllocVector (ml_state_t *msp, int len, ml_val_t initVal);
extern ml_val_t ML_AllocRaw (ml_state_t *msp, int len);
extern void ML_ShrinkRaw (ml_state_t *msp, ml_val_t v, int nWords);
extern ml_val_t ML_AllocRaw64 (ml_state_t *msp, int len);
extern ml_val_t ML_AllocString (ml_state_t *msp, Word_t len);
extern ml_val_t ML_AllocCode (ml_state_t *msp, Word_t len);
extern ml_val_t ML_AllocBytearray (ml_state_t *msp, Word_t len);
extern ml_val_t ML_AllocRealdarray (ml_state_t *msp, Word_t len);
extern ml_val_t ML_AllocArrayData (ml_state_t *msp, Word_t len, ml_val_t initVal);
extern ml_val_t ML_AllocArray (ml_state_t *msp, Word_t len, ml_val_t initVal);
extern ml_val_t ML_AllocVector (ml_state_t *msp, Word_t len, ml_val_t initVal);
extern ml_val_t ML_AllocRaw (ml_state_t *msp, Word_t len);
extern void ML_ShrinkRaw (ml_state_t *msp, ml_val_t v, Word_t nWords);
extern ml_val_t ML_AllocRaw64 (ml_state_t *msp, Word_t len);

extern ml_val_t ML_SysConst (ml_state_t *msp, sysconst_tbl_t *tbl, int id);
extern ml_val_t ML_SysConstList (ml_state_t *msp, sysconst_tbl_t *tbl);
extern ml_val_t ML_AllocCData (ml_state_t *msp, int nbytes);
extern ml_val_t ML_CData (ml_state_t *msp, void *data, int nbytes);
extern ml_val_t ML_AllocCData (ml_state_t *msp, Word_t nbytes);
extern ml_val_t ML_CData (ml_state_t *msp, void *data, Word_t nbytes);

extern ml_val_t BuildLiterals (ml_state_t *msp, Byte_t *lits, int len);

Expand Down
9 changes: 9 additions & 0 deletions doc/src/changelog/HISTORY.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,15 @@ recent to oldest, I've edited back to release 110.46 (2004/06/17).
//====================================================================
== Recent updates

//--------------------------------------------------------------------
[2024/03/01]::
+
We now use `Word_t` to represent lengths in the various allocation
routines in `gc/ml-objects.c`. This change fixes {issue-base}/283[
Issue #283 (`TextIO.inputAll` segfaults when reading 980M file)].
+
owner:cs.uchicago.edu/~jhr[John Reppy]

//--------------------------------------------------------------------
[2024/03/01]::
+
Expand Down
3 changes: 3 additions & 0 deletions doc/src/release-notes/110.99.5-README.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ gforge bug tracker.
| [.bugid]#280#
| {issue-base}/280[Support forward-slash ("/") as a separator in the Windows implementation of `OS.Path`]
| **n.a.**
| [.bugid]#283#
| {issue-base}/283[`TextIO.inputAll` segfaults when reading 980M file]
| **n.a.**
| [.bugid]#286#
| {issue-base}/286[Get "fgrep is obsolescent" when run **sml** on Fedora]
| **n.a.**
Expand Down

0 comments on commit 382df3a

Please sign in to comment.