mirror of
https://gitlab.uni-freiburg.de/opensourcevdi/spice
synced 2026-01-04 00:06:29 +00:00
char-device: use local 'reds' variable
Store a reference to the server in the SpiceCharDeviceState struct and use that rather than the global 'reds' variable Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Jonathon Jongsma
Frediano Ziglio
parent
82fe27d753
commit
b830f193a1
@ -156,7 +156,7 @@ static void spice_char_device_client_free(SpiceCharDeviceState *dev,
|
||||
RingItem *item, *next;
|
||||
|
||||
if (dev_client->wait_for_tokens_timer) {
|
||||
reds_get_core_interface(reds)->timer_remove(dev_client->wait_for_tokens_timer);
|
||||
reds_get_core_interface(dev->reds)->timer_remove(dev_client->wait_for_tokens_timer);
|
||||
}
|
||||
|
||||
spice_char_device_client_send_queue_free(dev, dev_client);
|
||||
@ -262,7 +262,7 @@ static void spice_char_device_add_msg_to_client_queue(SpiceCharDeviceClientState
|
||||
ring_add(&dev_client->send_queue, &msg_item->link);
|
||||
dev_client->send_queue_size++;
|
||||
if (!dev_client->wait_for_tokens_started) {
|
||||
reds_get_core_interface(reds)->timer_start(dev_client->wait_for_tokens_timer,
|
||||
reds_get_core_interface(dev->reds)->timer_start(dev_client->wait_for_tokens_timer,
|
||||
SPICE_CHAR_DEVICE_WAIT_TOKENS_TIMEOUT);
|
||||
dev_client->wait_for_tokens_started = TRUE;
|
||||
}
|
||||
@ -362,6 +362,7 @@ static void spice_char_device_client_send_queue_push(SpiceCharDeviceClientState
|
||||
static void spice_char_device_send_to_client_tokens_absorb(SpiceCharDeviceClientState *dev_client,
|
||||
uint32_t tokens)
|
||||
{
|
||||
SpiceCharDeviceState *dev = dev_client->dev;
|
||||
dev_client->num_send_tokens += tokens;
|
||||
|
||||
if (dev_client->send_queue_size) {
|
||||
@ -370,12 +371,12 @@ static void spice_char_device_send_to_client_tokens_absorb(SpiceCharDeviceClient
|
||||
}
|
||||
|
||||
if (spice_char_device_can_send_to_client(dev_client)) {
|
||||
reds_get_core_interface(reds)->timer_cancel(dev_client->wait_for_tokens_timer);
|
||||
reds_get_core_interface(dev->reds)->timer_cancel(dev_client->wait_for_tokens_timer);
|
||||
dev_client->wait_for_tokens_started = FALSE;
|
||||
spice_char_device_read_from_device(dev_client->dev);
|
||||
} else if (dev_client->send_queue_size) {
|
||||
reds_get_core_interface(reds)->timer_start(dev_client->wait_for_tokens_timer,
|
||||
SPICE_CHAR_DEVICE_WAIT_TOKENS_TIMEOUT);
|
||||
reds_get_core_interface(dev->reds)->timer_start(dev_client->wait_for_tokens_timer,
|
||||
SPICE_CHAR_DEVICE_WAIT_TOKENS_TIMEOUT);
|
||||
dev_client->wait_for_tokens_started = TRUE;
|
||||
}
|
||||
}
|
||||
@ -456,7 +457,7 @@ static int spice_char_device_write_to_device(SpiceCharDeviceState *dev)
|
||||
spice_char_device_state_ref(dev);
|
||||
|
||||
if (dev->write_to_dev_timer) {
|
||||
reds_get_core_interface(reds)->timer_cancel(dev->write_to_dev_timer);
|
||||
reds_get_core_interface(dev->reds)->timer_cancel(dev->write_to_dev_timer);
|
||||
}
|
||||
|
||||
sif = SPICE_CONTAINEROF(dev->sin->base.sif, SpiceCharDeviceInterface, base);
|
||||
@ -498,8 +499,8 @@ static int spice_char_device_write_to_device(SpiceCharDeviceState *dev)
|
||||
if (dev->running) {
|
||||
if (dev->cur_write_buf) {
|
||||
if (dev->write_to_dev_timer) {
|
||||
reds_get_core_interface(reds)->timer_start(dev->write_to_dev_timer,
|
||||
CHAR_DEVICE_WRITE_TO_TIMEOUT);
|
||||
reds_get_core_interface(dev->reds)->timer_start(dev->write_to_dev_timer,
|
||||
CHAR_DEVICE_WRITE_TO_TIMEOUT);
|
||||
}
|
||||
} else {
|
||||
spice_assert(ring_is_empty(&dev->write_queue));
|
||||
@ -516,7 +517,7 @@ static void spice_char_dev_write_retry(void *opaque)
|
||||
SpiceCharDeviceState *dev = opaque;
|
||||
|
||||
if (dev->write_to_dev_timer) {
|
||||
reds_get_core_interface(reds)->timer_cancel(dev->write_to_dev_timer);
|
||||
reds_get_core_interface(dev->reds)->timer_cancel(dev->write_to_dev_timer);
|
||||
}
|
||||
spice_char_device_write_to_device(dev);
|
||||
}
|
||||
@ -668,6 +669,7 @@ void spice_char_device_write_buffer_release(SpiceCharDeviceState *dev,
|
||||
********************************/
|
||||
|
||||
SpiceCharDeviceState *spice_char_device_state_create(SpiceCharDeviceInstance *sin,
|
||||
RedsState *reds,
|
||||
uint32_t client_tokens_interval,
|
||||
uint32_t self_tokens,
|
||||
SpiceCharDeviceCallbacks *cbs,
|
||||
@ -683,6 +685,7 @@ SpiceCharDeviceState *spice_char_device_state_create(SpiceCharDeviceInstance *si
|
||||
|
||||
char_dev = spice_new0(SpiceCharDeviceState, 1);
|
||||
char_dev->sin = sin;
|
||||
char_dev->reds = reds;
|
||||
char_dev->cbs = *cbs;
|
||||
char_dev->opaque = opaque;
|
||||
char_dev->client_tokens_interval = client_tokens_interval;
|
||||
@ -742,9 +745,9 @@ static void spice_char_device_state_unref(SpiceCharDeviceState *char_dev)
|
||||
|
||||
void spice_char_device_state_destroy(SpiceCharDeviceState *char_dev)
|
||||
{
|
||||
reds_on_char_device_state_destroy(reds, char_dev);
|
||||
reds_on_char_device_state_destroy(char_dev->reds, char_dev);
|
||||
if (char_dev->write_to_dev_timer) {
|
||||
reds_get_core_interface(reds)->timer_remove(char_dev->write_to_dev_timer);
|
||||
reds_get_core_interface(char_dev->reds)->timer_remove(char_dev->write_to_dev_timer);
|
||||
char_dev->write_to_dev_timer = NULL;
|
||||
}
|
||||
write_buffers_queue_free(&char_dev->write_queue);
|
||||
@ -795,9 +798,10 @@ int spice_char_device_client_add(SpiceCharDeviceState *dev,
|
||||
dev_client->max_send_queue_size = max_send_queue_size;
|
||||
dev_client->do_flow_control = do_flow_control;
|
||||
if (do_flow_control) {
|
||||
dev_client->wait_for_tokens_timer = reds_get_core_interface(reds)->timer_add(reds_get_core_interface(reds),
|
||||
device_client_wait_for_tokens_timeout,
|
||||
dev_client);
|
||||
dev_client->wait_for_tokens_timer =
|
||||
reds_get_core_interface(dev->reds)->timer_add(reds_get_core_interface(dev->reds),
|
||||
device_client_wait_for_tokens_timeout,
|
||||
dev_client);
|
||||
if (!dev_client->wait_for_tokens_timer) {
|
||||
spice_error("failed to create wait for tokens timer");
|
||||
}
|
||||
@ -862,7 +866,7 @@ void spice_char_device_stop(SpiceCharDeviceState *dev)
|
||||
dev->running = FALSE;
|
||||
dev->active = FALSE;
|
||||
if (dev->write_to_dev_timer) {
|
||||
reds_get_core_interface(reds)->timer_cancel(dev->write_to_dev_timer);
|
||||
reds_get_core_interface(dev->reds)->timer_cancel(dev->write_to_dev_timer);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -79,6 +79,8 @@
|
||||
*
|
||||
* */
|
||||
|
||||
struct RedsState;
|
||||
|
||||
/* buffer that is used for writing to the device */
|
||||
typedef struct SpiceCharDeviceWriteBuffer {
|
||||
RingItem link;
|
||||
@ -128,6 +130,7 @@ typedef struct SpiceCharDeviceCallbacks {
|
||||
} SpiceCharDeviceCallbacks;
|
||||
|
||||
SpiceCharDeviceState *spice_char_device_state_create(SpiceCharDeviceInstance *sin,
|
||||
struct RedsState *reds,
|
||||
uint32_t client_tokens_interval,
|
||||
uint32_t self_tokens,
|
||||
SpiceCharDeviceCallbacks *cbs,
|
||||
|
||||
@ -2952,6 +2952,7 @@ static SpiceCharDeviceState *attach_to_red_agent(RedsState *reds, SpiceCharDevic
|
||||
char_dev_state_cbs.on_free_self_token = vdi_port_on_free_self_token;
|
||||
|
||||
state->base = spice_char_device_state_create(sin,
|
||||
reds,
|
||||
REDS_TOKENS_TO_SEND,
|
||||
REDS_NUM_INTERNAL_AGENT_MESSAGES,
|
||||
&char_dev_state_cbs,
|
||||
|
||||
@ -280,6 +280,7 @@ static SmartCardDeviceState *smartcard_device_state_new(SpiceCharDeviceInstance
|
||||
|
||||
st = spice_new0(SmartCardDeviceState, 1);
|
||||
st->chardev_st = spice_char_device_state_create(sin,
|
||||
reds,
|
||||
0, /* tokens interval */
|
||||
~0, /* self tokens */
|
||||
&chardev_cbs,
|
||||
|
||||
@ -542,6 +542,7 @@ SpiceCharDeviceState *spicevmc_device_connect(SpiceCharDeviceInstance *sin,
|
||||
char_dev_cbs.remove_client = spicevmc_char_dev_remove_client;
|
||||
|
||||
state->chardev_st = spice_char_device_state_create(sin,
|
||||
reds,
|
||||
0, /* tokens interval */
|
||||
~0, /* self tokens */
|
||||
&char_dev_cbs,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user