Merge branch 'master' into cicd/group-test-output

Author: SimonLiu423

.clang-format

@@ -24,3 +24,4 @@ ForEachMacros:
   - hlist_for_each_entry
   - rb_list_foreach
   - rb_list_foreach_safe
+SpaceBeforeParens: ControlStatementsExceptForEachMacros

.editorconfig

@@ -0,0 +1,24 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[Makefile]
+indent_style = tab
+indent_size = 4
+max_line_length = 80
+
+[**/*.[ch]]
+indent_style = space
+indent_size = 4
+max_line_length = 80
+
+[{**/*.py,.ci/*}]
+indent_style = space
+indent_size = 4
+
+[{scripts/*,.github/workflows/*}]
+indent_style = space
+indent_size = 2

.github/workflows/main.yml

@@ -10,33 +10,33 @@ jobs:
     - uses: webfactory/[email protected]
       continue-on-error: true
       with:
-          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+        ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
     - name: install-dependencies
       run: |
-            .ci/check-sanity.sh
-            sudo apt-get update
-            sudo apt-get -q -y install build-essential cppcheck
+        .ci/check-sanity.sh
+        sudo apt-get update
+        sudo apt-get -q -y install build-essential cppcheck
     - name: make
       run:  |
-            git clone [email protected]:sysprog21/lab0-c-private || echo "No provisioning profile found"
-            .ci/check-provisioning.sh
-            make
+        git clone [email protected]:sysprog21/lab0-c-private || echo "No provisioning profile found"
+        .ci/check-provisioning.sh
+        make
     - name: make check
       run: |
-            make check || (cat scripts/weeping.raw ; exit 1)
-            cat scripts/kirby.raw
+        make check || (cat scripts/weeping.raw ; exit 1)
+        cat scripts/kirby.raw
     - name: make test
       run: |
-            make test || (cat scripts/weeping.raw ; exit 1)
-            cat scripts/kirby.raw
+        make test || (cat scripts/weeping.raw ; exit 1)
+        cat scripts/kirby.raw
 
   coding-style:
     runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - name: coding convention
       run: |
-            sudo apt-get install -q -y clang-format-18
-            .ci/check-newline.sh
-            .ci/check-format.sh
+        sudo apt-get install -q -y clang-format-18
+        .ci/check-newline.sh
+        .ci/check-format.sh
       shell: bash

.gitignore

@@ -1,4 +1,5 @@
 qtest
+fmtscan
 *.o
 *.o.d
 *.dSYM

Makefile

@@ -6,7 +6,7 @@ CFLAGS += -Wvla
 
 GIT_HOOKS := .git/hooks/applied
 DUT_DIR := dudect
-all: $(GIT_HOOKS) qtest
+all: $(GIT_HOOKS) qtest fmtscan
 
 tid := 0
 
@@ -53,6 +53,10 @@ qtest: $(OBJS)
 	$(VECHO) "  CC\t$@\n"
 	$(Q)$(CC) -o $@ $(CFLAGS) -c -MMD -MF .$@.d $<
 
+fmtscan: tools/fmtscan.c
+	$(VECHO) "  CC+LD\t$@\n"
+	$(Q)$(CC) -o $@ $(CFLAGS) $< -lrt -lpthread
+
 check: qtest
 	./$< -v 3 -f traces/trace-eg.cmd
 
@@ -80,7 +84,7 @@ valgrind: valgrind_existence
 	@echo "scripts/driver.py -p $(patched_file) --valgrind -t <tid>"
 
 clean:
-	rm -f $(OBJS) $(deps) *~ qtest /tmp/qtest.*
+	rm -f $(OBJS) $(deps) *~ qtest /tmp/qtest.* fmtscan
 	rm -rf .$(DUT_DIR)
 	rm -rf *.dSYM
 	(cd traces; rm -f *~)

console.c

@@ -144,6 +144,8 @@ static char **parse_args(char *line, int *argcp)
             *dst++ = c;
         }
     }
+    /* Let the last substring is null-terminated */
+    *dst++ = '\0';
 
     /* Now assemble into array of strings */
     char **argv = calloc_or_fail(argc, sizeof(char *), "parse_args");
@@ -158,12 +160,43 @@ static char **parse_args(char *line, int *argcp)
     return argv;
 }
 
+/* Handles forced console termination for record_error and do_quit */
+static bool force_quit(int argc, char *argv[])
+{
+    cmd_element_t *c = cmd_list;
+    bool ok = true;
+    while (c) {
+        cmd_element_t *ele = c;
+        c = c->next;
+        free_block(ele, sizeof(cmd_element_t));
+    }
+
+    param_element_t *p = param_list;
+    while (p) {
+        param_element_t *ele = p;
+        p = p->next;
+        free_block(ele, sizeof(param_element_t));
+    }
+
+    while (buf_stack)
+        pop_file();
+
+    for (int i = 0; i < quit_helper_cnt; i++) {
+        ok = ok && quit_helpers[i](argc, argv);
+    }
+
+    quit_flag = true;
+    return ok;
+}
+
 static void record_error()
 {
     err_cnt++;
     if (err_cnt >= err_limit) {
-        report(1, "Error limit exceeded.  Stopping command execution");
-        quit_flag = true;
+        report(
+            1,
+            "Error limit exceeded.  Stopping command execution, and quitting");
+        force_quit(0, NULL);
     }
 }
 
@@ -224,30 +257,7 @@ void set_echo(bool on)
 /* Built-in commands */
 static bool do_quit(int argc, char *argv[])
 {
-    cmd_element_t *c = cmd_list;
-    bool ok = true;
-    while (c) {
-        cmd_element_t *ele = c;
-        c = c->next;
-        free_block(ele, sizeof(cmd_element_t));
-    }
-
-    param_element_t *p = param_list;
-    while (p) {
-        param_element_t *ele = p;
-        p = p->next;
-        free_block(ele, sizeof(param_element_t));
-    }
-
-    while (buf_stack)
-        pop_file();
-
-    for (int i = 0; i < quit_helper_cnt; i++) {
-        ok = ok && quit_helpers[i](argc, argv);
-    }
-
-    quit_flag = true;
-    return ok;
+    return force_quit(argc, argv);
 }
 
 static bool do_help(int argc, char *argv[])
@@ -345,7 +355,7 @@ static bool do_option(int argc, char *argv[])
 static bool do_source(int argc, char *argv[])
 {
     if (argc < 2) {
-        report(1, "No source file given");
+        report(1, "No source file given. Use 'source <file>'.");
         return false;
     }
 
@@ -360,14 +370,15 @@ static bool do_source(int argc, char *argv[])
 static bool do_log(int argc, char *argv[])
 {
     if (argc < 2) {
-        report(1, "No log file given");
+        report(1, "No log file given. Use 'log <file>'.");
         return false;
     }
 
     bool result = set_logfile(argv[1]);
     if (!result)
         report(1, "Couldn't open log file '%s'", argv[1]);
 
+    printf("Logging enabled: %s\n", argv[1]);
     return result;
 }
 
@@ -427,7 +438,7 @@ void init_cmd()
                 "Display or set options. See 'Options' section for details",
                 "[name val]");
     ADD_COMMAND(quit, "Exit program", "");
-    ADD_COMMAND(source, "Read commands from source file", "");
+    ADD_COMMAND(source, "Read commands from source file", "file");
     ADD_COMMAND(log, "Copy output to file", "file");
     ADD_COMMAND(time, "Time command execution", "cmd arg ...");
     ADD_COMMAND(web, "Read commands from builtin web server", "[port]");
@@ -577,7 +588,7 @@ static int cmd_select(int nfds,
         FD_ZERO(readfds);
         FD_SET(infd, readfds);
 
-        /* If web not ready listen */
+        /* If web_fd is available, add to readfds */
         if (web_fd != -1)
             FD_SET(web_fd, readfds);
 

dudect/fixture.c

@@ -84,7 +84,7 @@ static bool report(void)
     double max_tau = max_t / sqrt(number_traces_max_t);
 
     printf("\033[A\033[2K");
-    printf("meas: %7.2lf M, ", (number_traces_max_t / 1e6));
+    printf("measure: %7.2lf M, ", (number_traces_max_t / 1e6));
     if (number_traces_max_t < ENOUGH_MEASURE) {
         printf("not enough measurements (%.0f still to go).\n",
                ENOUGH_MEASURE - number_traces_max_t);
@@ -170,8 +170,11 @@ static bool test_const(char *text, int mode)
     return result;
 }
 
-#define DUT_FUNC_IMPL(op) \
-    bool is_##op##_const(void) { return test_const(#op, DUT(op)); }
+#define DUT_FUNC_IMPL(op)                \
+    bool is_##op##_const(void)           \
+    {                                    \
+        return test_const(#op, DUT(op)); \
+    }
 
 #define _(x) DUT_FUNC_IMPL(x)
 DUT_FUNCS

linenoise.c

@@ -693,7 +693,7 @@ static void refresh_multi_Line(struct line_state *l)
     /* Move cursor to right position. */
     rpos2 =
         (plen + l->pos + l->cols) / l->cols; /* current cursor relative row. */
-    lndebug("rpos2 %d", rpos2);
+    lndebug("right position %d", rpos2);
 
     /* Go up till we reach the expected positon. */
     if (rows - rpos2 > 0) {

list.h

@@ -457,8 +457,8 @@ static inline void list_move_tail(struct list_head *node,
          &entry->member != (head); entry = safe,                       \
         safe = list_entry(safe->member.next, typeof(*entry), member))
 #else
-#define list_for_each_entry_safe(entry, safe, head, member)  \
-    for (entry = (void *) 1; sizeof(struct { int i : -1; }); \
+#define list_for_each_entry_safe(entry, safe, head, member)         \
+    for (entry = safe = (void *) 1; sizeof(struct { int i : -1; }); \
          ++(entry), ++(safe))
 #endif