SmartPtr: Support detect memory leak by valgrind. v6.0.132 #4102
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -57,13 +57,15 @@ __thread int _st_num_free_stacks = 0; | |||||
| __thread int _st_randomize_stacks = 0; | ||||||
|
|
||||||
| static char *_st_new_stk_segment(int size); | ||||||
| static void _st_delete_stk_segment(char *vaddr, int size); | ||||||
|
|
||||||
| _st_stack_t *_st_stack_new(int stack_size) | ||||||
| { | ||||||
| _st_clist_t *qp; | ||||||
| _st_stack_t *ts; | ||||||
| int extra; | ||||||
|
|
||||||
| #ifdef MD_CACHE_STACK | ||||||
| for (qp = _st_free_stacks.next; qp != &_st_free_stacks; qp = qp->next) { | ||||||
| ts = _ST_THREAD_STACK_PTR(qp); | ||||||
| if (ts->stk_size >= stack_size) { | ||||||
|
|
@@ -72,14 +74,34 @@ _st_stack_t *_st_stack_new(int stack_size) | |||||
| _st_num_free_stacks--; | ||||||
| ts->links.next = NULL; | ||||||
| ts->links.prev = NULL; | ||||||
| returnt ts; | ||||||
|
There was a problem hiding this comment. is it a mistake? There was a problem hiding this comment. It's a mistake. Lines 283 to 297 in ea7e2c2
There was a problem hiding this comment. Fixed. BTW: You can use configure to enable the macro: |
||||||
| } | ||||||
| } | ||||||
| #endif | ||||||
|
|
||||||
| extra = _st_randomize_stacks ? _ST_PAGE_SIZE : 0; | ||||||
| #ifndef MD_CACHE_STACK | ||||||
|
There was a problem hiding this comment. if don't cache stack, why not free There was a problem hiding this comment. The crash appears to occur when the Won't fix.
|
||||||
| for (qp = _st_free_stacks.next; qp != &_st_free_stacks;) { | ||||||
| ts = _ST_THREAD_STACK_PTR(qp); | ||||||
| // Before qp is freed, move to next one, because the qp will be freed when free the ts. | ||||||
| qp = qp->next; | ||||||
|
|
||||||
| ST_REMOVE_LINK(&ts->links); | ||||||
| _st_num_free_stacks--; | ||||||
|
|
||||||
| #if defined(DEBUG) && !defined(MD_NO_PROTECT) | ||||||
| mprotect(ts->vaddr, REDZONE, PROT_READ | PROT_WRITE); | ||||||
| mprotect(ts->stk_top + extra, REDZONE, PROT_READ | PROT_WRITE); | ||||||
| #endif | ||||||
|
|
||||||
| _st_delete_stk_segment(ts->vaddr, ts->vaddr_size); | ||||||
| free(ts); | ||||||
| } | ||||||
| #endif | ||||||
|
There was a problem hiding this comment. only rarely a few part of codes in
Suggested change
I would suggest add comments in this way. |
||||||
|
|
||||||
| /* Make a new thread stack object. */ | ||||||
| if ((ts = (_st_stack_t *)calloc(1, sizeof(_st_stack_t))) == NULL) | ||||||
| return NULL; | ||||||
| ts->vaddr_size = stack_size + 2*REDZONE + extra; | ||||||
| ts->vaddr = _st_new_stk_segment(ts->vaddr_size); | ||||||
| if (!ts->vaddr) { | ||||||
|
|
@@ -114,7 +136,7 @@ void _st_stack_free(_st_stack_t *ts) | |||||
| { | ||||||
| if (!ts) | ||||||
| return; | ||||||
|
|
||||||
| /* Put the stack on the free list */ | ||||||
| ST_APPEND_LINK(&ts->links, _st_free_stacks.prev); | ||||||
| _st_num_free_stacks++; | ||||||
|
|
@@ -153,7 +175,6 @@ static char *_st_new_stk_segment(int size) | |||||
|
|
||||||
|
|
||||||
| /* Not used */ | ||||||
| void _st_delete_stk_segment(char *vaddr, int size) | ||||||
winlinvip marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| { | ||||||
| #ifdef MALLOC_STACK | ||||||
|
|
@@ -162,7 +183,6 @@ void _st_delete_stk_segment(char *vaddr, int size) | |||||
| (void) munmap(vaddr, size); | ||||||
| #endif | ||||||
| } | ||||||
|
|
||||||
| int st_randomize_stacks(int on) | ||||||
| { | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,3 +2,4 @@ udp-server | |
| udp-client | ||
| cost | ||
| cost.log | ||
| thread-join | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /* | ||
| g++ thread-join.cpp ../../objs/st/libst.a -g -O0 -o thread-join && ./thread-join | ||
| */ | ||
| #include <stdio.h> | ||
| #include <stdlib.h> | ||
| #include "../../objs/st/st.h" | ||
|
|
||
| void* pfn(void* arg) { | ||
| printf("pid=%d, coroutine is ok\n", ::getpid()); | ||
| return NULL; | ||
| } | ||
|
|
||
| int main(int argc, char** argv) { | ||
| st_init(); | ||
|
|
||
| printf("pid=%d, create coroutine #1\n", ::getpid()); | ||
| st_thread_t thread = st_thread_create(pfn, NULL, 1, 0); | ||
| st_thread_join(thread, NULL); | ||
|
|
||
| st_usleep(100 * 1000); | ||
|
|
||
| printf("pid=%d, create coroutine #2\n", ::getpid()); | ||
| thread = st_thread_create(pfn, NULL, 1, 0); | ||
| st_thread_join(thread, NULL); | ||
|
|
||
| st_usleep(100 * 1000); | ||
|
|
||
| printf("pid=%d, create coroutine #3\n", ::getpid()); | ||
| thread = st_thread_create(pfn, NULL, 1, 0); | ||
| st_thread_join(thread, NULL); | ||
|
|
||
| printf("done\n"); | ||
| st_thread_exit(NULL); | ||
| return 0; | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why not add configure args to bypass
MD_CACHE_STACKtost-srs, likeMD_VALGRIND?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I want to not cache the stack by default, while this macro is used to enable the stack cache.
Won't fix.