Skip to content

Fix a few issues uncovered during full Chapel testing of qthreads 1.12 #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 13, 2017
Merged

Fix a few issues uncovered during full Chapel testing of qthreads 1.12 #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49f0560
Revert "add allocator directory to extra-dist"
ronawho Mar 12, 2017
c29c055
Add base.c and chapel.c allocators to EXTRA_DIST
ronawho Mar 12, 2017
9c156c6
Fix chapel.c allocator
ronawho Mar 12, 2017
1699c31
Quiet 'visibility' warning for qthread_tos() and qthread_bos()
ronawho Mar 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ libqthread_la_SOURCES = \
touch.c \
teams.c

EXTRA_DIST = alloc/
EXTRA_DIST =

if COMPILE_LF_HASH
libqthread_la_SOURCES += lf_hashmap.c
Expand Down Expand Up @@ -106,6 +106,8 @@ EXTRA_DIST += \
barrier/array.c \
barrier/log.c \
barrier/sinc.c \
alloc/base.c \
alloc/chapel.c \
affinity/common.c \
affinity/hwloc.c \
affinity/binders.c \
Expand Down
2 changes: 2 additions & 0 deletions src/alloc/chapel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ static QINLINE int getpagesize()
}
#endif

#include <qthread/qthread-int.h> /* for uint_fast16_t */

#include "chpl-mem-impl.h"

void *qt_malloc(size_t size){
Expand Down
4 changes: 2 additions & 2 deletions src/qthread.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1881,15 +1881,15 @@ unsigned API_FUNC qthread_size_tasklocal(void)
return f->rdata->tasklocal_size ? f->rdata->tasklocal_size : qlib->qthread_tasklocal_size;
} /*}}}*/

void* API_FUNC qthread_tos(void)
API_FUNC void* qthread_tos(void)
{
const qthread_t *f = qthread_internal_self();

return f->rdata->stack;
}


void* API_FUNC qthread_bos(void)
API_FUNC void* qthread_bos(void)
{
const qthread_t *f = qthread_internal_self();

Expand Down