Add Queues to E2 File Extension #2763
Conversation
- Add queuing for file load operations - Added cvar wire_expression2_file_max_queue to limit number of queued files - Added event fileList(sr) to eventify fileListClk - Added file<Load/Write/List>Queued() to return number of queued elements - Added outputs to various functions for debugging - Added various exceptions - Increased file Load/Write/List op cost to 100 (from 20) - Decreased op costs of certain functions - Fixes runOnFile triggering when runOnFile is not set - Fixes runOnList triggering when runOnFileList is not set - Deprecate runOn*- and *Clk-type functions - Removed some previously useless code - Removed old delay system
|
Would appreciate reviews and comments. |
| for k, v in ipairs(downloads[player]) do | ||
| if v.ent == entity then table.remove(downloads, k) end | ||
| end | ||
|
|
||
| if strlen > 0 then | ||
| net.Start("wire_expression2_file_download_chunk") | ||
| net.WriteUInt(strlen, 32) | ||
| net.WriteData(fdata.data, strlen) | ||
| net.Send(ply) | ||
| for k, v in ipairs(uploads[player]) do | ||
| if v.ent == entity then table.remove(uploads, k) end | ||
| end | ||
|
|
||
| fdata.data = string.sub( fdata.data, strlen + 1 ) | ||
| end | ||
| for k, v in ipairs(lists[player]) do | ||
| if v.ent == entity then table.remove(lists, k) end | ||
| end |
There was a problem hiding this comment.
This is worrying, what happens if the chip is removed during an upload/download? Would another queued chip receive the correct data?
Also these need to be while loops because you are modifying the array that you are iterating.
There was a problem hiding this comment.
The next chip in the queue would receive a file transfer error because the flag uploading would be unset, but I'll look into avoiding that.
There was a problem hiding this comment.
This has been mitigated in recent commits.
Optimize some small things Fixed backwards *Queue functions
There was a problem hiding this comment.
The code looks fine. It could be even cleaner if downloads, lists, uploads was converted to a single table of actions the player owns and if each action type had a class structure so that code was concentrated into the class table. This is fine for now though
Adds queuing to file extension. This means you can do multiple
fileLoad,fileWrite, andfileListoperations in a single execution without them overwriting each other. This is helpful since the original file system is clunky to use without it. Additionally, this contains many other QoL and fixes.wire_expression2_file_max_queue, default 5, to limit number of queued filesfileList(sr)to eventifyfileListClkevent fileWritten(ss), triggers when file finishes writing to clientfile<Load/Write/List>Queued()to return number of queued elementsrunOnFiletriggering whenrunOnFileis not setrunOnListtriggering whenrunOnFileListis not setTest code (Warning, this does create files in your e2files root folder)
Request for comments: