mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-11-02 09:01:50 -05:00
Work on event loop
Make a new epoll based event loop and use it for the data tranport. Simplify the spa event api a little and rename to SpaLoop
This commit is contained in:
Wim Taymans
parent
0d2fa5ebc8
commit
ae93f15965
33 changed files with 1286 additions and 954 deletions
|
|
@ -27,6 +27,7 @@ extern "C" {
|
|||
#endif
|
||||
#include <inttypes.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <stddef.h>
|
||||
|
||||
typedef enum {
|
||||
|
|
|
|||
95
spa/include/spa/loop.h
Normal file
95
spa/include/spa/loop.h
Normal file
|
|
@ -0,0 +1,95 @@
|
|||
/* Simple Plugin API
|
||||
* Copyright (C) 2016 Wim Taymans <wim.taymans@gmail.com>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Library General Public
|
||||
* License along with this library; if not, write to the
|
||||
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
|
||||
* Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#ifndef __SPA_LOOP_H__
|
||||
#define __SPA_LOOP_H__
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef struct _SpaLoop SpaLoop;
|
||||
typedef struct _SpaSource SpaSource;
|
||||
|
||||
#define SPA_LOOP_URI "http://spaplug.in/ns/loop"
|
||||
#define SPA_LOOP_PREFIX SPA_LOOP_URI "#"
|
||||
#define SPA_LOOP__MainLoop SPA_LOOP_PREFIX "MainLoop"
|
||||
#define SPA_LOOP__DataLoop SPA_LOOP_PREFIX "DataLoop"
|
||||
|
||||
#include <spa/defs.h>
|
||||
|
||||
typedef void (*SpaSourceFunc) (SpaSource *source);
|
||||
|
||||
typedef enum {
|
||||
SPA_IO_IN = (1 << 0),
|
||||
SPA_IO_OUT = (1 << 1),
|
||||
SPA_IO_HUP = (1 << 2),
|
||||
SPA_IO_ERR = (1 << 3),
|
||||
} SpaIO;
|
||||
|
||||
struct _SpaSource {
|
||||
SpaLoop *loop;
|
||||
SpaSourceFunc func;
|
||||
void *data;
|
||||
int fd;
|
||||
SpaIO mask;
|
||||
SpaIO rmask;
|
||||
void *loop_private;
|
||||
};
|
||||
|
||||
typedef SpaResult (*SpaInvokeFunc) (SpaLoop *loop,
|
||||
bool async,
|
||||
uint32_t seq,
|
||||
size_t size,
|
||||
void *data,
|
||||
void *user_data);
|
||||
/**
|
||||
* SpaLoop:
|
||||
*
|
||||
* Register sources to an event loop
|
||||
*/
|
||||
struct _SpaLoop {
|
||||
/* the total size of this structure. This can be used to expand this
|
||||
* structure in the future */
|
||||
size_t size;
|
||||
|
||||
SpaResult (*add_source) (SpaLoop *loop,
|
||||
SpaSource *source);
|
||||
SpaResult (*update_source) (SpaSource *source);
|
||||
|
||||
void (*remove_source) (SpaSource *source);
|
||||
|
||||
SpaResult (*invoke) (SpaLoop *loop,
|
||||
SpaInvokeFunc func,
|
||||
uint32_t seq,
|
||||
size_t size,
|
||||
void *data,
|
||||
void *user_data);
|
||||
};
|
||||
|
||||
#define spa_loop_add_source(l,...) (l)->add_source((l),__VA_ARGS__)
|
||||
#define spa_loop_update_source(l,...) (l)->update_source(__VA_ARGS__)
|
||||
#define spa_loop_remove_source(l,...) (l)->remove_source(__VA_ARGS__)
|
||||
#define spa_loop_invoke(l,...) (l)->invoke((l),__VA_ARGS__)
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* extern "C" */
|
||||
#endif
|
||||
|
||||
#endif /* __SPA_LOOP_H__ */
|
||||
|
|
@ -27,7 +27,6 @@ extern "C" {
|
|||
typedef struct _SpaNodeEvent SpaNodeEvent;
|
||||
|
||||
#include <spa/defs.h>
|
||||
#include <spa/poll.h>
|
||||
#include <spa/node.h>
|
||||
|
||||
#define SPA_NODE_EVENT_URI "http://spaplug.in/ns/node-event"
|
||||
|
|
|
|||
|
|
@ -1,183 +0,0 @@
|
|||
/* Simple Plugin API
|
||||
* Copyright (C) 2016 Wim Taymans <wim.taymans@gmail.com>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Library General Public
|
||||
* License along with this library; if not, write to the
|
||||
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
|
||||
* Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#ifndef __SPA_POLL_H__
|
||||
#define __SPA_POLL_H__
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef struct _SpaPoll SpaPoll;
|
||||
|
||||
#define SPA_POLL_URI "http://spaplug.in/ns/poll"
|
||||
#define SPA_POLL_PREFIX SPA_POLL_URI "#"
|
||||
#define SPA_POLL__MainLoop SPA_POLL_PREFIX "MainLoop"
|
||||
#define SPA_POLL__DataLoop SPA_POLL_PREFIX "DataLoop"
|
||||
|
||||
#include <spa/defs.h>
|
||||
#include <spa/plugin.h>
|
||||
#include <spa/dict.h>
|
||||
|
||||
/**
|
||||
* SpaPollFd:
|
||||
* @fd: a file descriptor
|
||||
* @events: events to watch
|
||||
* @revents: events after poll
|
||||
*/
|
||||
typedef struct {
|
||||
int fd;
|
||||
short events;
|
||||
short revents;
|
||||
} SpaPollFd;
|
||||
|
||||
/**
|
||||
* SpaPollNotifyData:
|
||||
* @user_data: user data
|
||||
* @fds: array of file descriptors
|
||||
* @n_fds: number of elements in @fds
|
||||
*
|
||||
* Data passed to #SpaPollNotify.
|
||||
*/
|
||||
typedef struct {
|
||||
void *user_data;
|
||||
SpaPollFd *fds;
|
||||
unsigned int n_fds;
|
||||
} SpaPollNotifyData;
|
||||
|
||||
typedef SpaResult (*SpaPollNotify) (SpaPollNotifyData *data);
|
||||
|
||||
/**
|
||||
* SpaPollItem:
|
||||
* @id: id of the poll item. This will be set when
|
||||
* adding the item to #SpaPoll.
|
||||
* @enabled: if the item is enabled
|
||||
* @fds: array of file descriptors to watch
|
||||
* @n_fds: number of elements in @fds
|
||||
* @idle_cb: callback called when there is no other work
|
||||
* @before_cb: callback called before starting the poll
|
||||
* @after_cb: callback called after the poll loop
|
||||
* @user_data: user data passed to callbacks
|
||||
*/
|
||||
typedef struct {
|
||||
uint32_t id;
|
||||
bool enabled;
|
||||
SpaPollFd *fds;
|
||||
unsigned int n_fds;
|
||||
SpaPollNotify idle_cb;
|
||||
SpaPollNotify before_cb;
|
||||
SpaPollNotify after_cb;
|
||||
void *user_data;
|
||||
} SpaPollItem;
|
||||
|
||||
|
||||
/**
|
||||
* SpaPollInvokeFunc:
|
||||
* @poll: a #SpaPoll
|
||||
* @async: If this function was called async
|
||||
* @seq: sequence number
|
||||
* @size: size of data
|
||||
* @data: data
|
||||
* @user_data: extra user data
|
||||
*
|
||||
* Function called from SpaPoll::invoke. If @async is %true, invoke returned
|
||||
* an async return value and this function should possibly schedule an async
|
||||
* reply.
|
||||
*
|
||||
* Returns: the result of the invoke function
|
||||
*/
|
||||
typedef SpaResult (*SpaPollInvokeFunc) (SpaPoll *poll,
|
||||
bool async,
|
||||
uint32_t seq,
|
||||
size_t size,
|
||||
void *data,
|
||||
void *user_data);
|
||||
|
||||
|
||||
/**
|
||||
* SpaPoll:
|
||||
*
|
||||
* Register poll events
|
||||
*/
|
||||
struct _SpaPoll {
|
||||
/* the total size of this structure. This can be used to expand this
|
||||
* structure in the future */
|
||||
size_t size;
|
||||
/**
|
||||
* SpaPoll::info
|
||||
*
|
||||
* Extra information
|
||||
*/
|
||||
const SpaDict *info;
|
||||
/**
|
||||
* SpaPoll::add_item:
|
||||
* @poll: a #SpaPoll
|
||||
* @item: a #SpaPollItem
|
||||
*
|
||||
* Add @item to the list of polled items.
|
||||
*
|
||||
* The id in @item will be set and must be passed when updating or removing
|
||||
* the @item.
|
||||
*
|
||||
* Returns: #SPA_RESULT_OK on success
|
||||
* #SPA_RESULT_INVALID_ARGUMENTS when @poll or @item is %NULL
|
||||
*/
|
||||
SpaResult (*add_item) (SpaPoll *poll,
|
||||
SpaPollItem *item);
|
||||
|
||||
SpaResult (*update_item) (SpaPoll *poll,
|
||||
SpaPollItem *item);
|
||||
|
||||
SpaResult (*remove_item) (SpaPoll *poll,
|
||||
SpaPollItem *item);
|
||||
|
||||
/**
|
||||
* SpaPoll::invoke:
|
||||
* @poll: a #SpaPoll
|
||||
* @func: function to call
|
||||
* @seq: sequence number
|
||||
* @size: size of data
|
||||
* @data: data
|
||||
* @user_data: extra user data
|
||||
*
|
||||
* Invoke @func from the poll context of @poll. @seq, @data, @size and
|
||||
* @user_data are passed to @func.
|
||||
*
|
||||
* Returns: The result of @func when this function is already called in
|
||||
* the @poll context, otherwise an async return value with @seq or, when
|
||||
* @seq is %SPA_ID_INVALID, %SPA_RETURN_OK.
|
||||
*/
|
||||
SpaResult (*invoke) (SpaPoll *poll,
|
||||
SpaPollInvokeFunc func,
|
||||
uint32_t seq,
|
||||
size_t size,
|
||||
void *data,
|
||||
void *user_data);
|
||||
};
|
||||
|
||||
#define spa_poll_add_item(n,...) (n)->add_item((n),__VA_ARGS__)
|
||||
#define spa_poll_update_item(n,...) (n)->update_item((n),__VA_ARGS__)
|
||||
#define spa_poll_remove_item(n,...) (n)->remove_item((n),__VA_ARGS__)
|
||||
#define spa_poll_invoke(n,...) (n)->invoke((n),__VA_ARGS__)
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* extern "C" */
|
||||
#endif
|
||||
|
||||
#endif /* __SPA_POLL_H__ */
|
||||
Loading…
Add table
Add a link
Reference in a new issue