mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-07-18 06:39:18 +02:00
On a million-instance scenery (tomaszewo) the infra pass was spending ~24s reopening pure-visual leaf twins (grass.incb etc.) just to skip their content -- ~200k cParser constructions, because every flora include reopens the same leaf. Twin header now flags whether a file has any infrastructure node or include (format bumped to v10). A pure-visual leaf (flora .incb: triangles + transform directives only) has it clear, so the infra pass skips opening it: the first open of each file caches the verdict, later opens are dropped before construction. Result on tomaszewo: infra 55s -> 31s, getToken 1.06M -> 89k. Also adds a load profiler (per-type build time, dispatch time, getToken count) behind WriteLog so the next bottleneck is measured, not guessed (it's now the 25s of decorative vehicle media loading).
289 lines
14 KiB
C++
289 lines
14 KiB
C++
/*
|
|
This Source Code Form is subject to the
|
|
terms of the Mozilla Public License, v.
|
|
2.0. If a copy of the MPL was not
|
|
distributed with this file, You can
|
|
obtain one at
|
|
http://mozilla.org/MPL/2.0/.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <string>
|
|
#include <sstream>
|
|
#include <fstream>
|
|
#include <vector>
|
|
#include <map>
|
|
#include <memory>
|
|
#include <cstdint>
|
|
|
|
// binary scenery twin support (full definitions in scene/scenerybinary.h, included
|
|
// from parser.cpp). only forward declarations here to avoid pulling utilities.h in
|
|
// before cParser is defined.
|
|
namespace scene {
|
|
enum class scenery_file_kind : std::uint8_t;
|
|
enum class scenery_load_pass : std::uint8_t;
|
|
class scenery_binary_writer;
|
|
class scenery_binary_reader;
|
|
}
|
|
|
|
/////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
// cParser -- generic class for parsing text data, either from file or provided string
|
|
|
|
class cParser //: public std::stringstream
|
|
{
|
|
public:
|
|
// parameters:
|
|
enum buffertype
|
|
{
|
|
buffer_FILE,
|
|
buffer_TEXT
|
|
};
|
|
// constructors:
|
|
cParser(std::string const &Stream, buffertype const Type = buffer_TEXT, std::string Path = "", bool const Loadtraction = true, std::vector<std::string> Parameters = std::vector<std::string>(), bool allowRandom = false, bool BakeOnly = false );
|
|
// destructor:
|
|
virtual ~cParser();
|
|
// bake-only: tokenize this file into its binary twin without opening includes or
|
|
// touching scene state, and return the (relative) filenames it includes so a parallel
|
|
// baker can compile each of those twins on its own thread. requires BakeOnly ctor.
|
|
std::vector<std::string> bakeFile();
|
|
// select which class of nodes the replay serves (propagated to include children).
|
|
// only meaningful in replay (twin) mode; ignored for text parsing.
|
|
void setReplayPass( scene::scenery_load_pass Pass );
|
|
// rewind the replay to the start of the twin with a (possibly new) pass, dropping any
|
|
// open include child. used to run a second pass (visual) over an already-loaded twin.
|
|
// returns false if this parser isn't replaying a twin (no second pass possible).
|
|
bool restartReplay( scene::scenery_load_pass Pass );
|
|
// true when this (top-level) file is served from a binary twin, i.e. a second
|
|
// (visual) pass via restartReplay() is possible. false for a text/compile load.
|
|
bool isReplaying() const { return m_replay; }
|
|
// true if this twin has any infrastructure node or include (so the infra pass must process
|
|
// it); false for a pure-visual leaf (a flora .incb), which the infra pass can skip opening.
|
|
bool infraRelevant() const;
|
|
// clears the per-load cache of which include files are pure-visual leaves (call at the start
|
|
// of a scenario load so a rebake that changed a file's class isn't masked by a stale entry).
|
|
static void clearInfraSkipCache();
|
|
// skips the rest of the node currently being replayed in O(1) (jump over its v6 marker
|
|
// span), delegating to the active include child that is actually serving it. returns
|
|
// false if the skip can't be done here (e.g. a text include with no binary twin), so the
|
|
// caller can fall back to a token-by-token skip. used by the camera-ring visual load.
|
|
bool skipReplayNode();
|
|
// local position of the node about to be replayed (the "node" token just read), if its
|
|
// v7 marker carried one (visual model nodes). lets the camera-ring load distance-test and
|
|
// skip a node without decoding its body. returns false for shapes / non-replay / older twins.
|
|
bool currentNodePosition( double &X, double &Y, double &Z, double &Range );
|
|
// --- section-index streaming: capture enough to rebuild the node about to be replayed
|
|
// (the deepest active include serves it) without re-scanning the whole twin later ---
|
|
// source file + base path of the twin the current node lives in (to re-open it)
|
|
std::string currentReplayFile();
|
|
std::string currentReplayPath();
|
|
// byte offset of the current node's marker within that twin (to seek back to it)
|
|
std::size_t currentReplayOffset();
|
|
// the include parameters in effect for the current node (its "(pN)" tokens resolve against
|
|
// these); empty for a node read directly from a parameterless file
|
|
std::vector<std::string> currentReplayParams();
|
|
// reposition this (replay) parser at a node recorded via currentReplayOffset() and serve it
|
|
// next; drops any open include child. used to rebuild one indexed node on demand.
|
|
void seekReplayNode( std::size_t Offset );
|
|
// set the include parameters used to resolve the next node's "(pN)" tokens during rebuild
|
|
void setReplayParams( std::vector<std::string> Params );
|
|
// methods:
|
|
template <typename Type_>
|
|
cParser &
|
|
operator>>( Type_ &Right );
|
|
template <typename Output_>
|
|
Output_
|
|
getToken( bool const ToLower = true, char const *Break = "\n\r\t ;" ) {
|
|
getTokens( 1, ToLower, Break );
|
|
Output_ output;
|
|
*this >> output;
|
|
return output; };
|
|
inline
|
|
void
|
|
ignoreToken() {
|
|
std::string out;
|
|
readToken(out); };
|
|
inline
|
|
bool
|
|
expectToken( std::string const &Value ) {
|
|
std::string out;
|
|
readToken(out);
|
|
return out == Value; };
|
|
inline
|
|
bool
|
|
eof() {
|
|
// in replay mode there is no character stream; exhaustion is reaching the
|
|
// end of the twin's entries with no include still being drained
|
|
if( m_replay ) {
|
|
return m_replayexhausted && ( !mIncludeParser );
|
|
}
|
|
// text is tokenized from an in-memory buffer; eof is the read cursor
|
|
// reaching its end
|
|
return ( m_bufferpos >= m_buffer.size() ); };
|
|
inline
|
|
bool
|
|
ok() {
|
|
// historically !stream.fail(); with the in-memory buffer the stream is read
|
|
// only once at construction, so its fail bit never flips at end-of-input.
|
|
// ok() now means "there is still input to read", which is what the common
|
|
// `while( parser.ok() )` loops rely on, and is true right after opening a
|
|
// non-empty file (the `if( !ok() )` open checks) / false if the open failed
|
|
// (empty buffer) or once everything has been consumed.
|
|
if( m_replay ) { return ( false == m_replayexhausted ); }
|
|
return ( m_bufferpos < m_buffer.size() ); };
|
|
cParser &
|
|
autoclear( bool const Autoclear );
|
|
inline
|
|
bool
|
|
autoclear() const {
|
|
return m_autoclear; }
|
|
bool
|
|
getTokens( unsigned int Count = 1, bool ToLower = true, char const *Break = "\n\r\t ;" );
|
|
std::string readTokenFromStream(bool ToLower, const char *Break);
|
|
void stripFirstTokenBOM(std::string &token, bool ToLower, const char *Break);
|
|
void substituteParameters(std::string &token, bool ToLower);
|
|
void skipIncludeBlock();
|
|
// returns next incoming token, if any, without removing it from the set
|
|
inline
|
|
std::string
|
|
peek() const {
|
|
return (
|
|
false == tokens.empty() ?
|
|
tokens.front() :
|
|
"" ); }
|
|
// inject string as internal include
|
|
void injectString(const std::string &str);
|
|
|
|
// writes the compiled binary twin to disk if this parser was compiling one and the
|
|
// source was fully consumed. safe to call multiple times; the destructor also calls
|
|
// it as a fallback. used to flush the top-level twin promptly once loading finishes.
|
|
void flushBinaryTwin();
|
|
|
|
// returns percentage of file processed so far
|
|
int getProgress() const;
|
|
int getFullProgress() const;
|
|
//
|
|
static std::size_t countTokens( std::string const &Stream, std::string Path = "" );
|
|
// add custom definition of text which should be ignored when retrieving tokens
|
|
void addCommentStyle( std::string const &Commentstart, std::string const &Commentend );
|
|
// returns name of currently open file, or empty string for text type stream
|
|
std::string Name() const;
|
|
// returns number of currently processed line
|
|
std::size_t Line() const;
|
|
// returns number of currently processed line in main file, -1 if inside include
|
|
int LineMain() const;
|
|
bool expandIncludes = true;
|
|
bool allowRandomIncludes = false;
|
|
bool skipComments = true;
|
|
|
|
private:
|
|
// reads an include directive (filename expression + parameters) from srcParser,
|
|
// records it for the binary twin when compiling, and opens the include with a
|
|
// freshly evaluated filename (re-randomizing any random set).
|
|
void processInclude(cParser &srcParser, bool ToLower);
|
|
// opens an include directly from a (filename, parameters) pair, as reconstructed
|
|
// from a binary twin's include entry, minus the stream-driven parameter parsing.
|
|
void startIncludeDirect(std::string includefile, std::vector<std::string> Params);
|
|
bool handleIncludeIfPresent(std::string &token, bool ToLower, const char *Break);
|
|
// serves the next token when replaying a binary twin, transparently entering
|
|
// child includes when an include entry is reached.
|
|
void readReplayToken(std::string &out, bool ToLower, const char *Break);
|
|
// methods:
|
|
void readToken(std::string& out, bool ToLower = true, const char *Break = "\n\r\t ;");
|
|
static std::vector<std::string> readParameters( cParser &Input );
|
|
std::string readQuotes( char const Quote = '\"' );
|
|
void skipComment( std::string const &Endmark );
|
|
bool findQuotes( std::string &String );
|
|
bool trimComments( std::string &String );
|
|
std::size_t count();
|
|
// members:
|
|
bool m_autoclear { true }; // unretrieved tokens are discarded when another read command is issued (legacy behaviour)
|
|
bool LoadTraction { true }; // load traction?
|
|
std::shared_ptr<std::istream> mStream; // attached on creation; kept for open/fail state.
|
|
std::string m_buffer; // whole source text read into memory; tokenized from here
|
|
std::size_t m_bufferpos { 0 }; // read cursor into m_buffer
|
|
std::string mFile; // name of the open file, if any
|
|
std::string mPath; // path to open stream, for relative path lookups.
|
|
std::streamoff mSize { 0 }; // size of open stream, for progress report.
|
|
std::size_t mLine { 0 }; // currently processed line
|
|
bool mIncFile { false }; // the parser is processing an *.inc file
|
|
bool mFirstToken { true }; // processing first token in the current file; helper used when checking for utf bom
|
|
typedef std::map<std::string, std::string> commentmap;
|
|
commentmap mComments {
|
|
commentmap::value_type( "/*", "*/" ),
|
|
commentmap::value_type( "//", "\n" ) };
|
|
std::shared_ptr<cParser> mIncludeParser; // child class to handle include directives.
|
|
std::vector<std::string> parameters; // parameter list for included file.
|
|
std::deque<std::string> tokens;
|
|
// --- binary scenery twin support ---
|
|
// last token produced by readTokenFromStream was (partly) quoted -> case preserved
|
|
bool m_lastquoted { false };
|
|
// per-load cache: include path -> true if it's a pure-visual leaf the infra pass skips opening
|
|
static std::map<std::string, bool> s_infraskip;
|
|
// replay: this file is served from its binary twin instead of text
|
|
bool m_replay { false };
|
|
bool m_replayexhausted { false }; // all twin entries consumed (for inline eof())
|
|
scene::scenery_load_pass m_replaypass {}; // value-init == scenery_load_pass::all
|
|
std::string m_twinbuf; // whole twin file held in memory; the reader views into it
|
|
std::unique_ptr<scene::scenery_binary_reader> m_reader; // streams entries from m_twinbuf
|
|
// compile: this file is being captured into a binary twin alongside the text read
|
|
bool m_compiling { false };
|
|
std::unique_ptr<scene::scenery_binary_writer> m_writer;
|
|
std::string m_binarytwinpath; // destination path for the compiled twin
|
|
scene::scenery_file_kind m_binarykind {}; // value-initialised (== scenery_file_kind::scn)
|
|
bool m_capturesuppress { false }; // suppress token capture (include directive internals)
|
|
bool m_twinwritten { false }; // guards against writing the twin more than once
|
|
// standalone/parallel bake: capture this file only, collect its include filenames
|
|
bool m_bakeonly { false };
|
|
std::vector<std::string> m_bakeincludes;
|
|
// v6 node-marker tracking during bake (wrap each top-level node for pass selection)
|
|
bool m_bakenode_active { false };
|
|
int m_bakenode_count { 0 }; // entries captured since "node" (1=node,...,5=type)
|
|
bool m_bakenode_visual { false };
|
|
std::string m_bakenode_end; // terminator token; empty until type classified
|
|
// v7: a model node's local position (entries 6,7,8 = X,Y,Z), stored in its marker so the
|
|
// camera-ring load can distance-test it without decoding the node body
|
|
bool m_bakenode_haspos { false };
|
|
double m_bakenode_pos[ 3 ] { 0.0, 0.0, 0.0 };
|
|
double m_bakenode_rangemax { -1.0 }; // range_max (entry 2), stored in the model marker
|
|
// explicit shape (triangles/lines) position extraction: a shape has no fixed-index position
|
|
// like a model, so walk past its material to its first vertex and use that. posstate:
|
|
// 0=before material, 1=inside material...endmaterial, 2=seeking the 3 vertex numbers, 3=done.
|
|
bool m_bakenode_shape { false };
|
|
int m_bakenode_posstate { 0 };
|
|
int m_bakenode_posidx { 0 };
|
|
// flushes a node still open at end-of-file (or unknown type), so its buffer is written
|
|
void bakeFinishNode();
|
|
};
|
|
|
|
|
|
template <>
|
|
glm::vec3
|
|
cParser::getToken( bool const ToLower, const char *Break );
|
|
|
|
|
|
template<typename Type_>
|
|
cParser&
|
|
cParser::operator>>( Type_ &Right ) {
|
|
|
|
if( true == this->tokens.empty() ) { return *this; }
|
|
|
|
std::stringstream converter( this->tokens.front() );
|
|
converter >> Right;
|
|
this->tokens.pop_front();
|
|
|
|
return *this;
|
|
}
|
|
|
|
template<>
|
|
cParser&
|
|
cParser::operator>>( std::string &Right );
|
|
|
|
template<>
|
|
cParser&
|
|
cParser::operator>>( bool &Right );
|
|
|
|
template<>
|
|
bool
|
|
cParser::getToken<bool>( bool const ToLower, const char *Break );
|