Changeset ae0c1c3 for libcfa/src/fstream.cfa

Timestamp:

Apr 25, 2025, 7:08:53 PM (8 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

7d02d35, ecfa58be

Parents:

65bd3c2

Message:

Rewrote the iostream traits to have a single assertion each, a table containing function pointers. This is just an experiment right now. It seems that it does cause significant speed up of assertion resolution, but for some reason also seems to add a flat overhead that mostly eats up that saving.

File:

• libcfa/src/fstream.cfa (modified) (2 diffs)

libcfa/src/fstream.cfa

@@ -202 +202 @@
 } // nl
 
+static basic_ostream_data(ofstream) ofstream_basic_data = {
+        sepPrt$,
+        sepReset$,
+        sepReset$,
+        sepGetCur$,
+        sepSetCur$,
+        getNL$,
+        setNL$,
+        getANL$,
+        setANL$,
+        getPrt$,
+        setPrt$,
+        nlOn,
+        nlOff,
+        sep,
+        nosep,
+        sepOn,
+        sepOff,
+        sepGet,
+        sepSet,
+        sepGetTuple,
+        sepSetTuple,
+        ends,
+        fmt,
+};
+
+basic_ostream_data(ofstream) const & basic_ostream_table = ofstream_basic_data;
+
+static ostream_data(ofstream) ofstream_data;
+
+// This should be an initializer like for the basic table.
+// But, initialization of a structure with an inline structure doesn't work.
+__attribute__((constructor(200)))
+static void __ofstream_data_init__() {
+        basic_ostream_data(ofstream) & basic = ofstream_data;
+        basic.sepPrt$ = sepPrt$;
+        basic.sepReset$ = (void(*)(ofstream&))sepReset$;
+        basic.sepReset$ = (void(*)(ofstream&, bool))sepReset$;
+        basic.sepGetCur$ = sepGetCur$;
+        basic.sepSetCur$ = sepSetCur$;
+        basic.getNL$ = getNL$;
+        basic.setNL$ = setNL$;
+        basic.getANL$ = getANL$;
+        basic.setANL$ = setANL$;
+        basic.getPrt$ = getPrt$;
+        basic.setPrt$ = setPrt$;
+        basic.nlOn = nlOn;
+        basic.nlOff = nlOff;
+        basic.sep = sep;
+        basic.nosep = nosep;
+        basic.sepOn = sepOn;
+        basic.sepOff = sepOff;
+        basic.sepGet = sepGet;
+        basic.sepSet = sepSet;
+        basic.sepGetTuple = sepGetTuple;
+        basic.sepSetTuple = sepSetTuple;
+        basic.ends = ends;
+        basic.fmt = fmt;
+        ofstream_data.fail = fail;
+        ofstream_data.clearerr = clearerr;
+        ofstream_data.flush = flush;
+        ofstream_data.open = open;
+        ofstream_data.close = close;
+        ofstream_data.write = write;
+}
+
+ostream_data(ofstream) const & ostream_table = ofstream_data;
 
 // *********************************** ifstream ***********************************
@@ -211 +278 @@
         nlOnOff$ = false;                                                                       // => skip newlines when reading single characters
 } // ?{}
+
+static basic_istream_data(ifstream) ifstream_basic_data = {
+        getANL$,
+        setANL$,
+        nlOn,
+        nlOff,
+        fmt,
+        ungetc,
+        eof,
+        clearerr,
+};
+
+basic_istream_data(ifstream) const & basic_istream_table = ifstream_basic_data;
+
+static istream_data(ifstream) ifstream_data;
+
+// This should be an initializer like for the basic table.
+// But, initialization of a structure with an inline structure doesn't work.
+__attribute__((constructor(200)))
+static void __ifstream_data_init__() {
+        basic_istream_data(ifstream) & basic = ifstream_data;
+        basic.getANL$ = getANL$;
+        basic.setANL$ = setANL$;
+        basic.nlOn = nlOn;
+        basic.nlOff = nlOff;
+        basic.fmt = fmt;
+        basic.ungetc = ungetc;
+        basic.eof = eof;
+        basic.clearerr = clearerr;
+        ifstream_data.fail = fail;
+        ifstream_data.open = (void(*)(ifstream &, const char *, const char *))open;
+        ifstream_data.open = (void(*)(ifstream &, const char *))open;
+        ifstream_data.close = close;
+        ifstream_data.read = read;
+}
+
+istream_data(ifstream) const & istream_table = ifstream_data;
 
 bool getANL$( ifstream & os ) { return os.nlOnOff$; }