Jan Kiszka wrote: > ... > A patch says more than thousand words. ;) > > As a first approach, I picked the second variant and implemented a new > function called rt_pipe_setpool. I also had to extend rt_pipe_alloc and > rt_pipe_free so that the right pool is used by them. >
I thought about this variant again, and it seems to me rather unsafe in case some buffer allocation takes place between rt_pipe_create and rt_pipe_setpool. So, here is a patch which extends rt_pipe_create with a new argument poolsize instead. Still untested... Jan
Index: skins/native/pipe.h =================================================================== --- skins/native/pipe.h (revision 165) +++ skins/native/pipe.h (working copy) @@ -37,6 +37,8 @@ #ifdef __KERNEL__ +#include <nucleus/heap.h> + #define XENO_PIPE_MAGIC 0x55550202 typedef xnpipe_mh_t RT_PIPE_MSG; @@ -57,6 +59,10 @@ RT_PIPE_MSG *buffer; /* !< Buffer used in byte stream mode. */ + xnheap_t *bufpool; /* !< Current buffer pool. */ + + xnheap_t privpool; /* !< Private buffer pool. */ + size_t fillsz; /* !< Bytes written to the buffer. */ u_long flushable; /* !< Flush request flag. */ @@ -85,8 +91,12 @@ int rt_pipe_create(RT_PIPE *pipe, const char *name, - int minor); + int minor, + size_t poolsize); +int rt_pipe_setpool(RT_PIPE *pipe, + size_t poolsize); + int rt_pipe_delete(RT_PIPE *pipe); ssize_t rt_pipe_read(RT_PIPE *pipe, @@ -113,9 +123,11 @@ size_t size, int mode); -RT_PIPE_MSG *rt_pipe_alloc(size_t size); +RT_PIPE_MSG *rt_pipe_alloc(RT_PIPE *pipe, + size_t size); -int rt_pipe_free(RT_PIPE_MSG *msg); +int rt_pipe_free(RT_PIPE *pipe, + RT_PIPE_MSG *msg); ssize_t rt_pipe_flush(RT_PIPE *pipe); Index: skins/native/syscall.c =================================================================== --- skins/native/syscall.c (revision 165) +++ skins/native/syscall.c (working copy) @@ -3194,6 +3194,7 @@ char name[XNOBJECT_NAME_LEN]; RT_PIPE_PLACEHOLDER ph; int err, minor; + size_t poolsize; RT_PIPE *pipe; if (!__xn_access_ok(curr,VERIFY_WRITE,__xn_reg_arg1(regs),sizeof(ph))) @@ -3213,12 +3214,15 @@ /* Device minor. */ minor = (int)__xn_reg_arg3(regs); + /* Buffer pool size. */ + poolsize = (size_t)__xn_reg_arg4(regs); + pipe = (RT_PIPE *)xnmalloc(sizeof(*pipe)); if (!pipe) return -ENOMEM; - err = rt_pipe_create(pipe,name,minor); + err = rt_pipe_create(pipe,name,minor,poolsize); if (err == 0) { @@ -3332,7 +3336,7 @@ /* Zero-sized messages are allowed, so we still need to free the message buffer even if no data copy took place. */ - rt_pipe_free(msg); + rt_pipe_free(pipe,msg); return err; } @@ -3374,7 +3378,7 @@ if (!__xn_access_ok(curr,VERIFY_READ,__xn_reg_arg2(regs),size)) return -EFAULT; - msg = rt_pipe_alloc(size); + msg = rt_pipe_alloc(pipe,size); if (!msg) return -ENOMEM; @@ -3386,7 +3390,7 @@ if (err != size) /* If the operation failed, we need to free the message buffer by ourselves. */ - rt_pipe_free(msg); + rt_pipe_free(pipe,msg); return err; } @@ -3436,7 +3440,7 @@ } else { - msg = rt_pipe_alloc(size); + msg = rt_pipe_alloc(pipe,size); if (!msg) return -ENOMEM; @@ -3449,7 +3453,7 @@ err = rt_pipe_stream(pipe,buf,size); if (msg) - rt_pipe_free(msg); + rt_pipe_free(pipe,msg); return err; } Index: skins/native/lib/pipe.c =================================================================== --- skins/native/lib/pipe.c (revision 165) +++ skins/native/lib/pipe.c (working copy) @@ -23,7 +23,8 @@ int rt_pipe_create (RT_PIPE *pipe, const char *name, - int minor) + int minor, + size_t poolsize) { return XENOMAI_SKINCALL3(__xeno_muxid, __xeno_pipe_create, Index: skins/native/pipe.c =================================================================== --- skins/native/pipe.c (revision 165) +++ skins/native/pipe.c (working copy) @@ -50,8 +50,6 @@ #include <native/registry.h> #include <native/pipe.h> -static xnheap_t *__pipe_heap = &kheap; - static int __pipe_flush_apc; static DECLARE_XNQUEUE(__pipe_flush_q); @@ -83,6 +81,14 @@ #endif /* CONFIG_XENO_NATIVE_EXPORT_REGISTRY */ +static void __pipe_flush_pool (xnheap_t *heap, + void *poolmem, + u_long poolsize, + void *cookie) +{ + xnarch_sysfree(poolmem,poolsize); +} + static inline ssize_t __pipe_flush (RT_PIPE *pipe) { @@ -122,8 +128,10 @@ size_t size, void *cookie) { + RT_PIPE *pipe = (RT_PIPE *)cookie; + /* Allocate memory for the incoming message. */ - return xnheap_alloc(__pipe_heap,size); + return xnheap_alloc(pipe->bufpool,size); } static int __pipe_output_handler (int bminor, @@ -131,8 +139,10 @@ int retval, void *cookie) { + RT_PIPE *pipe = (RT_PIPE *)cookie; + /* Free memory from output/discarded message. */ - xnheap_free(__pipe_heap,mh); + xnheap_free(pipe->bufpool,mh); return retval; } @@ -154,7 +164,7 @@ } /** - * @fn int rt_pipe_create(RT_PIPE *pipe,const char *name,int minor) + * @fn int rt_pipe_create(RT_PIPE *pipe,const char *name,int minor, size_t poolsize) * @brief Create a message pipe. * * This service opens a bi-directional communication channel allowing @@ -232,20 +242,55 @@ int rt_pipe_create (RT_PIPE *pipe, const char *name, - int minor) + int minor, + size_t poolsize) { int err = 0; + void *poolmem; - if (xnpod_asynch_p()) + if (!xnpod_root_p()) return -EPERM; pipe->buffer = NULL; + pipe->bufpool = &kheap; pipe->fillsz = 0; pipe->flushable = 0; pipe->handle = 0; /* i.e. (still) unregistered pipe. */ pipe->magic = XENO_PIPE_MAGIC; xnobject_copy_name(pipe->name,name); + if (poolsize > 0) + { + /* Make sure we won't hit trivial argument errors when calling + xnheap_init(). */ + + if (poolsize < 2 * PAGE_SIZE) + poolsize = 2 * PAGE_SIZE; + + /* Account for the overhead so that the actual free space is large + enough to match the requested size. */ + + poolsize += xnheap_overhead(poolsize,PAGE_SIZE); + poolsize = PAGE_ALIGN(poolsize); + + poolmem = xnarch_sysalloc(poolsize); + + if (!poolmem) + return -ENOMEM; + + err = xnheap_init(&pipe->privpool, + poolmem, + poolsize, + PAGE_SIZE); /* Use natural page size */ + if (err) + { + xnarch_sysfree(poolmem,poolsize); + return err; + } + + pipe->bufpool = &pipe->privpool; + } + minor = xnpipe_connect(minor, &__pipe_output_handler, NULL, @@ -253,7 +298,12 @@ pipe); if (minor < 0) + { + if (pipe->bufpool == &pipe->privpool) + xnheap_destroy(&pipe->privpool,__pipe_flush_pool,NULL); + return minor; + } pipe->minor = minor; @@ -337,14 +387,15 @@ if (!pipe) { err = xeno_handle_error(pipe,XENO_PIPE_MAGIC,RT_PIPE); - goto unlock_and_exit; + xnlock_put_irqrestore(&nklock,s); + return err; } if (__test_and_clear_bit(0,&pipe->flushable)) { /* Purge data waiting for flush. */ removeq(&__pipe_flush_q,&pipe->link); - rt_pipe_free(pipe->buffer); + rt_pipe_free(pipe,pipe->buffer); } err = xnpipe_disconnect(pipe->minor); @@ -356,10 +407,11 @@ xeno_mark_deleted(pipe); - unlock_and_exit: - xnlock_put_irqrestore(&nklock,s); + if (pipe->bufpool == &pipe->privpool) + xnheap_destroy(&pipe->privpool,__pipe_flush_pool,NULL); + return err; } @@ -572,7 +624,7 @@ /* Zero-sized messages are allowed, so we still need to free the message buffer even if no data copy took place. */ - rt_pipe_free(msg); + rt_pipe_free(pipe,msg); return nbytes; } @@ -767,7 +819,7 @@ /* Try flushing the streaming buffer in any case. */ return rt_pipe_send(pipe,NULL,0,mode); - msg = rt_pipe_alloc(size); + msg = rt_pipe_alloc(pipe,size); if (!msg) return -ENOMEM; @@ -779,7 +831,7 @@ if (nbytes != size) /* If the operation failed, we need to free the message buffer by ourselves. */ - rt_pipe_free(msg); + rt_pipe_free(pipe,msg); return nbytes; } @@ -886,7 +938,7 @@ if (pipe->buffer == NULL) { - pipe->buffer = rt_pipe_alloc(CONFIG_XENO_OPT_NATIVE_PIPE_BUFSZ); + pipe->buffer = rt_pipe_alloc(pipe,CONFIG_XENO_OPT_NATIVE_PIPE_BUFSZ); if (pipe->buffer == NULL) { @@ -984,7 +1036,7 @@ } /** - * @fn RT_PIPE_MSG *rt_pipe_alloc(size_t size) + * @fn RT_PIPE_MSG *rt_pipe_alloc(RT_PIPE *pipe,size_t size) * * @brief Allocate a message pipe buffer. * @@ -1010,10 +1062,11 @@ * Rescheduling: never. */ -RT_PIPE_MSG *rt_pipe_alloc (size_t size) +RT_PIPE_MSG *rt_pipe_alloc (RT_PIPE *pipe, + size_t size) { - RT_PIPE_MSG *msg = (RT_PIPE_MSG *)xnheap_alloc(__pipe_heap,size + sizeof(RT_PIPE_MSG)); + RT_PIPE_MSG *msg = (RT_PIPE_MSG *)xnheap_alloc(pipe->bufpool,size + sizeof(RT_PIPE_MSG)); if (msg) { @@ -1025,7 +1078,7 @@ } /** - * @fn int rt_pipe_free(RT_PIPE_MSG *msg) + * @fn int rt_pipe_free(RT_PIPE *pipe,RT_PIPE_MSG *msg) * * @brief Free a message pipe buffer. * @@ -1049,9 +1102,9 @@ * Rescheduling: never. */ -int rt_pipe_free (RT_PIPE_MSG *msg) +int rt_pipe_free (RT_PIPE *pipe,RT_PIPE_MSG *msg) { - return xnheap_free(__pipe_heap,msg); + return xnheap_free(pipe->bufpool,msg); } /[EMAIL PROTECTED]/ Index: testsuite/klatency/latency-module.c =================================================================== --- testsuite/klatency/latency-module.c (revision 165) +++ testsuite/klatency/latency-module.c (working copy) @@ -83,7 +83,7 @@ maxjitter = maxj; avgjitter = sumj / sample_count; - msg = rt_pipe_alloc(sizeof(struct latency_stat)); + msg = rt_pipe_alloc(&pipe,sizeof(struct latency_stat)); if (!msg) { @@ -103,7 +103,7 @@ ourselves. */ if (rt_pipe_send(&pipe,msg,sizeof(*s),0) != sizeof(*s)) - rt_pipe_free(msg); + rt_pipe_free(&pipe,msg); } } @@ -128,7 +128,7 @@ return 2; } - err = rt_pipe_create(&pipe,"klatency",0); + err = rt_pipe_create(&pipe,"klatency",0,0); if (err) {
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Xenomai-core mailing list Xenomai-core@gna.org https://mail.gna.org/listinfo/xenomai-core