Skip to content
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.

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

Make putting large objects work. #411

Merged
merged 34 commits into from
Apr 5, 2017
Merged
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
2140837
putting large objects
pcmoritz Mar 30, 2017
fec2447
add more checks
pcmoritz Mar 30, 2017
96bd3bf
support large objects
pcmoritz Mar 30, 2017
6b489c1
fix test
pcmoritz Mar 30, 2017
b6d3115
fix linting
pcmoritz Mar 31, 2017
e864aeb
upgrade to latest arrow version
pcmoritz Mar 31, 2017
1fd1b08
check malloc return code
pcmoritz Mar 31, 2017
17d223d
print mmap file sizes
pcmoritz Mar 31, 2017
5159065
printing
pcmoritz Mar 31, 2017
47f4fe6
revert to dlmalloc
pcmoritz Apr 1, 2017
0264cac
add prints
pcmoritz Apr 1, 2017
5306ab5
more prints
pcmoritz Apr 1, 2017
6aba98f
add printing
pcmoritz Apr 1, 2017
e1c9580
printing
pcmoritz Apr 1, 2017
2339edf
fix
pcmoritz Apr 1, 2017
2842eda
update
pcmoritz Apr 1, 2017
1a4b6f9
fix
pcmoritz Apr 1, 2017
4637436
update
pcmoritz Apr 1, 2017
d7564c1
print
pcmoritz Apr 1, 2017
dc6c7b0
initialization
pcmoritz Apr 1, 2017
7b2f4ac
temp
pcmoritz Apr 1, 2017
e8ec99c
fix
pcmoritz Apr 1, 2017
432830f
update
pcmoritz Apr 1, 2017
3c68bf2
fix linting
pcmoritz Apr 2, 2017
cbc688a
comment out object_store_full tests
pcmoritz Apr 2, 2017
69f6b5c
fix test
pcmoritz Apr 2, 2017
1625dc8
fix test
pcmoritz Apr 2, 2017
5be1a44
evict objects if dlmalloc fails
pcmoritz Apr 2, 2017
2ee41da
fix stresstests
pcmoritz Apr 5, 2017
2d60ff5
Fix linting.
robertnishihara Apr 5, 2017
058aa8d
Uncomment large-memory tests.
robertnishihara Apr 5, 2017
e18f919
Increase memory for docker image for jenkins tests.
robertnishihara Apr 5, 2017
cd8853a
Reduce large memory tests.
robertnishihara Apr 5, 2017
d82219d
Further reduce large memory tests.
robertnishihara Apr 5, 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
Prev Previous commit
Next Next commit
add prints
  • Loading branch information
pcmoritz committed Apr 1, 2017
commit 0264cac30a02c7ebbf1686430f9a95e042020b5f
2 changes: 2 additions & 0 deletions src/plasma/thirdparty/dlmalloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -4030,6 +4030,7 @@ static void add_segment(mstate m, char* tbase, size_t tsize, flag_t mmapped) {

/* Get memory from system using MORECORE or MMAP */
static void* sys_alloc(mstate m, size_t nb) {
printf("called sys_alloc\n");
char* tbase = CMFAIL;
size_t tsize = 0;
flag_t mmap_flag = 0;
Expand All @@ -4039,6 +4040,7 @@ static void* sys_alloc(mstate m, size_t nb) {

/* Directly map large chunks, but only if already initialized */
if (use_mmap(m) && nb >= mparams.mmap_threshold && m->topsize != 0) {
printf("called mmap_alloc\n");
void* mem = mmap_alloc(m, nb);
if (mem != 0)
return mem;
Expand Down