external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity

Merge branch 'srs.master'

Browse source
This commit is contained in:
winlin 2014-11-10 10:21:58 +08:00
commit f95f9b1bb2
2 changed files with 3 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
trunk/research/st/sched.c
View file

@ -557,7 +557,7 @@ _st_thread_t *st_thread_create(void *(*start)(void *arg), void *arg, int joinabl
}
stack->sp = sp - _ST_STACK_PAD_SIZE;
#else
#error Unknown OS
#error Unknown Stack Grown
#endif
memset(thread, 0, sizeof(_st_thread_t));

25
trunk/research/st/stk.c
View file

@ -122,28 +122,7 @@ static char *_st_new_stk_segment(int size)
#ifdef MALLOC_STACK
void *vaddr = malloc(size);
#else
static int zero_fd = -1;
int mmap_flags = MAP_PRIVATE;
void *vaddr;
#if defined (MD_USE_SYSV_ANON_MMAP)
if (zero_fd < 0) {
if ((zero_fd = open("/dev/zero", O_RDWR, 0)) < 0) {
return NULL;
}
fcntl(zero_fd, F_SETFD, FD_CLOEXEC);
}
#elif defined (MD_USE_BSD_ANON_MMAP)
mmap_flags |= MAP_ANON;
#else
#error Unknown OS
#endif
vaddr = mmap(NULL, size, PROT_READ | PROT_WRITE, mmap_flags, zero_fd, 0);
if (vaddr == (void *)MAP_FAILED) {
return NULL;
}
#error Unknown Stack Malloc
#endif
return (char *)vaddr;
@ -156,7 +135,7 @@ void _st_delete_stk_segment(char *vaddr, int size)
#ifdef MALLOC_STACK
free(vaddr);
#else
(void) munmap(vaddr, size);
#error Unknown Stack Malloc
#endif
}
#endif