SmartPtr: Free the stack of ST.

trunk/3rdparty/st-srs/Makefile

@@ -191,6 +191,9 @@ endif
 #
 # make EXTRA_CFLAGS=-DDEBUG_STATS
 #
+# or cache the stack and reuse it:
+# make EXTRA_CFLAGS=-DMD_CACHE_STACK
+#
 # or enable the coverage for utest:
 # make UTEST_FLAGS="-fprofile-arcs -ftest-coverage"
 #

trunk/3rdparty/st-srs/stk.c

@@ -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;
-            return ts;
+            returnt ts;
         }
     }
+#endif
+
+    extra = _st_randomize_stacks ? _ST_PAGE_SIZE : 0;
+#ifndef MD_CACHE_STACK
+    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
 
     /* Make a new thread stack object. */
     if ((ts = (_st_stack_t *)calloc(1, sizeof(_st_stack_t))) == NULL)
         return NULL;
-    extra = _st_randomize_stacks ? _ST_PAGE_SIZE : 0;
     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 */
-#if 0
 void _st_delete_stk_segment(char *vaddr, int size)
 {
 #ifdef MALLOC_STACK
@@ -162,7 +183,6 @@ void _st_delete_stk_segment(char *vaddr, int size)
     (void) munmap(vaddr, size);
 #endif
 }
-#endif
 
 int st_randomize_stacks(int on)
 {

trunk/research/st/.gitignore

@@ -2,3 +2,4 @@ udp-server
 udp-client
 cost
 cost.log
+thread-join

trunk/research/st/thread-join.cpp

@@ -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;
+}
+

trunk/src/app/srs_app_http_stream.cpp

@@ -1073,9 +1073,6 @@ void SrsHttpStreamServer::http_unmount(SrsRequest* r)
     SrsBufferCache* cache = entry->cache;
     SrsAutoFree(SrsBufferCache, cache);
 
-    // Unmount the HTTP handler.
-    mux.unhandle(entry->mount, stream);
-
     // Notify cache and stream to stop.
     if (stream->entry) stream->entry->enabled = false;
     cache->stop();
@@ -1089,6 +1086,9 @@ void SrsHttpStreamServer::http_unmount(SrsRequest* r)
         srs_usleep(100 * SRS_UTIME_MILLISECONDS);
     }
 
+    // Unmount the HTTP handler.
+    mux.unhandle(entry->mount, stream);
+
     srs_trace("http: unmount flv stream for sid=%s, i=%d", sid.c_str(), i);
 }