mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-25 11:11:08 +00:00
Remove cothreads.[ch] from tests/cothreads/ and replace then with a rule in the Makefile.am to generate symlinks to t...
Original commit message from CVS: Remove cothreads.[ch] from tests/cothreads/ and replace then with a rule in the Makefile.am to generate symlinks to the live versions of the code in gst/ : fixes a compile error, and should keep things cleaner.
This commit is contained in:
Richard Boulton
parent
34811a366d
commit
ed8dac9fa8
3 changed files with 5 additions and 231 deletions
|
|
@ -9,3 +9,8 @@ simple_CFLAGS = $(shell gnome-config --cflags gnomeui)
|
|||
simple_LDFLAGS = $(shell gnome-config --libs gnomeui)
|
||||
|
||||
noinst_HEADERS = cothreads.h object.h looper.h
|
||||
|
||||
cothreads.c: $(top_srcdir)/gst/cothreads.c
|
||||
ln -sf $< $@
|
||||
cothreads.h: $(top_srcdir)/gst/cothreads.h
|
||||
ln -sf $< $@
|
||||
|
|
|
|||
|
|
@ -1,183 +0,0 @@
|
|||
#include <pthread.h>
|
||||
#include <sys/time.h>
|
||||
#include <linux/linkage.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <signal.h>
|
||||
#include <setjmp.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/mman.h>
|
||||
|
||||
#define DEBUG_ENABLED
|
||||
#include "gst/gst.h"
|
||||
#include "cothreads.h"
|
||||
#include "gst/gstarch.h"
|
||||
|
||||
pthread_key_t _cothread_key = -1;
|
||||
|
||||
cothread_state *cothread_create(cothread_context *ctx) {
|
||||
cothread_state *s;
|
||||
|
||||
DEBUG("cothread: pthread_self() %ld\n",pthread_self());
|
||||
//if (pthread_self() == 0) {
|
||||
if (0) {
|
||||
s = (cothread_state *)malloc(sizeof(int) * COTHREAD_STACKSIZE);
|
||||
DEBUG("cothread: new stack at %p\n",s);
|
||||
} else {
|
||||
char *sp = CURRENT_STACK_FRAME;
|
||||
unsigned long *stack_end = (unsigned long *)((unsigned long)sp &
|
||||
~(STACK_SIZE - 1));
|
||||
s = (cothread_state *)(stack_end + ((ctx->nthreads - 1) *
|
||||
COTHREAD_STACKSIZE));
|
||||
if (mmap((char *)s,COTHREAD_STACKSIZE*(sizeof(int)),
|
||||
PROT_READ|PROT_WRITE|PROT_EXEC,MAP_PRIVATE|MAP_ANONYMOUS,
|
||||
-1,0) < 0) {
|
||||
perror("mmap'ing cothread stack space");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
s->ctx = ctx;
|
||||
s->threadnum = ctx->nthreads;
|
||||
s->flags = 0;
|
||||
s->sp = ((int *)s + COTHREAD_STACKSIZE);
|
||||
|
||||
ctx->threads[ctx->nthreads++] = s;
|
||||
|
||||
DEBUG("cothread: created cothread at %p %p\n",s, s->sp);
|
||||
|
||||
return s;
|
||||
}
|
||||
|
||||
void cothread_setfunc(cothread_state *thread,cothread_func func,int argc,char **argv) {
|
||||
thread->func = func;
|
||||
thread->argc = argc;
|
||||
thread->argv = argv;
|
||||
thread->pc = (int *)func;
|
||||
}
|
||||
|
||||
cothread_context *cothread_init() {
|
||||
cothread_context *ctx = (cothread_context *)malloc(sizeof(cothread_context));
|
||||
|
||||
if (_cothread_key == -1) {
|
||||
if (pthread_key_create(&_cothread_key,NULL) != 0) {
|
||||
perror("pthread_key_create");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
pthread_setspecific(_cothread_key,ctx);
|
||||
|
||||
memset(ctx->threads,0,sizeof(ctx->threads));
|
||||
|
||||
ctx->threads[0] = (cothread_state *)malloc(sizeof(cothread_state));
|
||||
ctx->threads[0]->ctx = ctx;
|
||||
ctx->threads[0]->threadnum = 0;
|
||||
ctx->threads[0]->func = NULL;
|
||||
ctx->threads[0]->argc = 0;
|
||||
ctx->threads[0]->argv = NULL;
|
||||
ctx->threads[0]->flags = COTHREAD_STARTED;
|
||||
ctx->threads[0]->sp = (int *)CURRENT_STACK_FRAME;
|
||||
ctx->threads[0]->pc = 0;
|
||||
|
||||
DEBUG("cothread: 0th thread is at %p %p\n",ctx->threads[0], ctx->threads[0]->sp);
|
||||
|
||||
// we consider the initiating process to be cothread 0
|
||||
ctx->nthreads = 1;
|
||||
ctx->current = 0;
|
||||
|
||||
return ctx;
|
||||
}
|
||||
|
||||
cothread_state *cothread_main(cothread_context *ctx) {
|
||||
// fprintf(stderr,"returning %p, the 0th cothread\n",ctx->threads[0]);
|
||||
return ctx->threads[0];
|
||||
}
|
||||
|
||||
void cothread_stub() {
|
||||
cothread_context *ctx = pthread_getspecific(_cothread_key);
|
||||
register cothread_state *thread = ctx->threads[ctx->current];
|
||||
|
||||
DEBUG("cothread: cothread_stub() entered\n");
|
||||
thread->flags |= COTHREAD_STARTED;
|
||||
if (thread->func)
|
||||
thread->func(thread->argc,thread->argv);
|
||||
thread->flags &= ~COTHREAD_STARTED;
|
||||
thread->pc = 0;
|
||||
DEBUG("cothread: cothread_stub() exit\n");
|
||||
//printf("uh, yeah, we shouldn't be here, but we should deal anyway\n");
|
||||
}
|
||||
|
||||
void cothread_switch(cothread_state *thread) {
|
||||
cothread_context *ctx;
|
||||
cothread_state *current;
|
||||
int enter;
|
||||
// int i;
|
||||
//
|
||||
DEBUG("thread = %p\n", thread);
|
||||
|
||||
if (thread == NULL)
|
||||
return;
|
||||
|
||||
DEBUG("ctx = %p\n", ctx);
|
||||
|
||||
ctx = thread->ctx;
|
||||
|
||||
DEBUG("ctx->threads = %p\n", ctx->threads);
|
||||
|
||||
current = ctx->threads[ctx->current];
|
||||
|
||||
DEBUG("ctx->current = %d\n", ctx->current);
|
||||
DEBUG("current->threadnum = %d\n", current->threadnum);
|
||||
DEBUG("current = %p\n", current);
|
||||
if (current == NULL) {
|
||||
g_print("cothread: there's no current thread, help!\n");
|
||||
exit(2);
|
||||
}
|
||||
|
||||
/*
|
||||
if (current == thread) {
|
||||
g_print("cothread: trying to switch to same thread, legal but not necessary\n");
|
||||
//return;
|
||||
}
|
||||
*/
|
||||
|
||||
// find the number of the thread to switch to
|
||||
ctx->current = thread->threadnum;
|
||||
DEBUG("cothread: about to switch to thread #%d\n",ctx->current);
|
||||
|
||||
/* save the current stack pointer, frame pointer, and pc */
|
||||
GET_SP(current->sp);
|
||||
enter = setjmp(current->jmp);
|
||||
DEBUG("cothread: SP is %p\n", current->sp);
|
||||
DEBUG("cothread: after thread #%d %d\n",ctx->current, enter);
|
||||
if (enter != 0) {
|
||||
return;
|
||||
}
|
||||
enter = 1;
|
||||
|
||||
DEBUG("cothread: set stack to %p\n", thread->sp);
|
||||
/* restore stack pointer and other stuff of new cothread */
|
||||
if (thread->flags & COTHREAD_STARTED) {
|
||||
void *temp1, *temp2;
|
||||
DEBUG("cothread: in thread \n");
|
||||
GET_SP(temp1);
|
||||
SET_SP(thread->sp);
|
||||
GET_SP(temp2);
|
||||
DEBUG("SP %p -> %p\n", temp1, temp2);
|
||||
// switch to it
|
||||
longjmp(thread->jmp,1);
|
||||
} else {
|
||||
void *temp1, *temp2;
|
||||
SETUP_STACK(thread->sp);
|
||||
GET_SP(temp1);
|
||||
SET_SP(thread->sp);
|
||||
GET_SP(temp2);
|
||||
DEBUG("thead[2].num = %d\n", ctx->threads[2]->threadnum);
|
||||
DEBUG("SP %p -> %p\n", temp1, temp2);
|
||||
DEBUG("thead[2].num = %d\n", ctx->threads[2]->threadnum);
|
||||
// start it
|
||||
//JUMP(cothread_stub);
|
||||
cothread_stub();
|
||||
DEBUG("cothread: exit thread \n");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
#ifndef __COTHREADS_H__
|
||||
#define __COTHREADS_H__
|
||||
|
||||
#include <setjmp.h>
|
||||
#include <pthread.h>
|
||||
|
||||
#define COTHREAD_STACKSIZE 8192
|
||||
#define COTHREAD_MAXTHREADS 16
|
||||
#define STACK_SIZE 0x200000
|
||||
|
||||
#ifndef CURRENT_STACK_FRAME
|
||||
#define CURRENT_STACK_FRAME ({ char __csf; &__csf; })
|
||||
#endif /* CURRENT_STACK_FRAME */
|
||||
|
||||
typedef struct _cothread_state cothread_state;
|
||||
typedef struct _cothread_context cothread_context;
|
||||
|
||||
typedef int (*cothread_func)(int argc,char **argv);
|
||||
|
||||
#define COTHREAD_STARTED 0x01
|
||||
|
||||
struct _cothread_state {
|
||||
cothread_context *ctx;
|
||||
int threadnum;
|
||||
|
||||
cothread_func func;
|
||||
int argc;
|
||||
char **argv;
|
||||
|
||||
int flags;
|
||||
int *sp;
|
||||
int *pc;
|
||||
jmp_buf jmp;
|
||||
};
|
||||
|
||||
struct _cothread_context {
|
||||
cothread_state *threads[COTHREAD_MAXTHREADS];
|
||||
int nthreads;
|
||||
int current;
|
||||
};
|
||||
|
||||
cothread_context *cothread_init();
|
||||
cothread_state *cothread_create(cothread_context *ctx);
|
||||
void cothread_setfunc(cothread_state *thread,cothread_func func,int argc,char **argv);
|
||||
void cothread_switch(cothread_state *thread);
|
||||
cothread_state *cothread_main(cothread_context *ctx);
|
||||
|
||||
#endif /* __COTHREAD_H__ */
|
||||
Loading…
Reference in a new issue