mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 09:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Driver: Shaper: Refactor packets flushing

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2023-01-05 11:38:59 +03:00
parent a2b8cdfe84
commit 1f11c2d6ee
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/driver/fortpkt.c
View File

@ -281,6 +281,19 @@ static PFORT_PACKET fort_shaper_queue_process_latency(
return NULL; return NULL;
} }
static PFORT_PACKET fort_shaper_queue_get_packets(PFORT_PACKET_QUEUE queue, PFORT_PACKET pkt)
{
KLOCK_QUEUE_HANDLE lock_queue;
KeAcquireInStackQueuedSpinLock(&queue->lock, &lock_queue);
pkt = fort_shaper_packet_list_get(&queue->latency_list, pkt);
pkt = fort_shaper_packet_list_get(&queue->bandwidth_list, pkt);
KeReleaseInStackQueuedSpinLock(&lock_queue);
return pkt;
}
inline static BOOL fort_shaper_queue_is_empty(PFORT_PACKET_QUEUE queue) inline static BOOL fort_shaper_queue_is_empty(PFORT_PACKET_QUEUE queue)
{ {
return fort_shaper_packet_list_is_empty(&queue->bandwidth_list) return fort_shaper_packet_list_is_empty(&queue->bandwidth_list)
@ -453,8 +466,10 @@ FORT_API void fort_shaper_conf_update(PFORT_SHAPER shaper, const PFORT_CONF_IO c
shaper->group_io_bits = shaper->limit_io_bits = limit_io_bits; shaper->group_io_bits = shaper->limit_io_bits = limit_io_bits;
fort_shaper_create_queues(shaper, conf_io->conf_group.limits, limit_io_bits); const UINT32 new_limit_io_bits = (flush_io_bits & limit_io_bits);
fort_shaper_init_queues(shaper, (flush_io_bits & limit_io_bits));
fort_shaper_create_queues(shaper, conf_io->conf_group.limits, new_limit_io_bits);
fort_shaper_init_queues(shaper, new_limit_io_bits);
} }
KeReleaseInStackQueuedSpinLock(&lock_queue); KeReleaseInStackQueuedSpinLock(&lock_queue);
@ -473,7 +488,9 @@ void fort_shaper_conf_flags_update(PFORT_SHAPER shaper, const PFORT_CONF_FLAGS c
shaper->group_io_bits = (shaper->limit_io_bits & group_io_bits); shaper->group_io_bits = (shaper->limit_io_bits & group_io_bits);
fort_shaper_init_queues(shaper, (flush_io_bits & group_io_bits)); const UINT32 new_group_io_bits = (flush_io_bits & group_io_bits);
fort_shaper_init_queues(shaper, new_group_io_bits);
} }
KeReleaseInStackQueuedSpinLock(&lock_queue); KeReleaseInStackQueuedSpinLock(&lock_queue);
@ -588,15 +605,10 @@ FORT_API void fort_shaper_flush(PFORT_SHAPER shaper, UINT32 group_io_bits, BOOL
if (group_io_bits == 0) if (group_io_bits == 0)
return; return;
/* Collect packets from Queues */
PFORT_PACKET pkt_chain = NULL; PFORT_PACKET pkt_chain = NULL;
/* Collect packets from Queues */ group_io_bits &= fort_shaper_queue_active_set(shaper, group_io_bits, FALSE);
KLOCK_QUEUE_HANDLE lock_queue;
KeAcquireInStackQueuedSpinLock(&shaper->lock, &lock_queue);
if (group_io_bits == FORT_PACKET_FLUSH_ALL) {
group_io_bits &= shaper->group_io_bits;
}
for (int i = 0; group_io_bits != 0; ++i) { for (int i = 0; group_io_bits != 0; ++i) {
const BOOL queue_exists = (group_io_bits & 1) != 0; const BOOL queue_exists = (group_io_bits & 1) != 0;
@ -609,12 +621,9 @@ FORT_API void fort_shaper_flush(PFORT_SHAPER shaper, UINT32 group_io_bits, BOOL
if (queue == NULL) if (queue == NULL)
continue; continue;
pkt_chain = fort_shaper_packet_list_get(&queue->latency_list, pkt_chain); pkt_chain = fort_shaper_queue_get_packets(queue, pkt_chain);
pkt_chain = fort_shaper_packet_list_get(&queue->bandwidth_list, pkt_chain);
} }
KeReleaseInStackQueuedSpinLock(&lock_queue);
/* Process the packets */ /* Process the packets */
if (pkt_chain != NULL) { if (pkt_chain != NULL) {
fort_shaper_packet_foreach( fort_shaper_packet_foreach(