Lab_NHMFL
/
upsilon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix printing error

This commit is contained in:
Peter McGoron 2023-04-07 16:57:18 -04:00
parent 575d8e2167
commit af58adfa59
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
software/CMakeLists.txt
View File

@ -13,6 +13,9 @@ include_directories("src/")
include_directories("../creole") include_directories("../creole")
include_directories("../firmware/rtl/control_loop") include_directories("../firmware/rtl/control_loop")
set_source_files_properties(src/main.c PROPERTIES COMPILE_FLAGS -DMAIN_LOG_LEVEL=4)
set_source_files_properties(../creole/creole.c PROPERTIES COMPILE_FLAGS -DCREOLE_LOG_LEVEL=4)
# Add all source files here. # Add all source files here.
target_sources(app PRIVATE src/access.c src/buf.c src/main.c src/sock.c ../creole/creole.c) target_sources(app PRIVATE src/access.c src/buf.c src/main.c src/sock.c ../creole/creole.c)
# target_sources(app PRIVATE src/tests/test_ethernet.c) # target_sources(app PRIVATE src/tests/test_ethernet.c)

10
software/src/main.c
View File

@ -9,7 +9,7 @@
#include "sock.h" #include "sock.h"
#include "buf.h" #include "buf.h"
LOG_MODULE_REGISTER(main); LOG_MODULE_REGISTER(main, 4);
#define THREAD_STACK_SIZ 1024*32 #define THREAD_STACK_SIZ 1024*32
#define THREADNUM 32 #define THREADNUM 32
@ -93,6 +93,7 @@ exec_creole(unsigned char *buf, int size, int sock)
for (;;) { for (;;) {
creole_word sc; creole_word sc;
e = creole_step(&env, &sc); e = creole_step(&env, &sc);
LOG_DBG("%s: %s", get_thread_name(), run_ret_str[e]);
switch (e) { switch (e) {
case CREOLE_STEP_CONTINUE: case CREOLE_STEP_CONTINUE:
continue; continue;
@ -127,12 +128,13 @@ read_size(int s)
static void static void
exec_entry(void *client_p, void *connection_num_p, exec_entry(void *client_p, void *connection_num_p,
void *unused __attribute__((unused))) void *threadnum_p)
{ {
intptr_t client = (intptr_t)client_p; intptr_t client = (intptr_t)client_p;
intptr_t connection_num = (intptr_t)connection_num_p; intptr_t connection_num = (intptr_t)connection_num_p;
intptr_t threadnum = (intptr_t)threadnum_p;
char thread_name[64]; char thread_name[64];
snprintk(thread_name, sizeof(thread_name), "%"PRIdPTR":%"PRIdPTR, client, connection_num); snprintk(thread_name, sizeof(thread_name), "%"PRIdPTR":%"PRIdPTR, threadnum, connection_num);
k_thread_name_set(k_current_get(), thread_name); k_thread_name_set(k_current_get(), thread_name);
LOG_DBG("%s: entered thread", get_thread_name()); LOG_DBG("%s: entered thread", get_thread_name());
@ -143,6 +145,7 @@ exec_entry(void *client_p, void *connection_num_p,
zsock_close(client); zsock_close(client);
return; return;
} }
LOG_INF("%s: program length: %d", get_thread_name(), size);
struct bufptr bp = {readbuf[threadnum], size}; struct bufptr bp = {readbuf[threadnum], size};
int e = sock_read_buf(client, &bp, true); int e = sock_read_buf(client, &bp, true);
@ -151,6 +154,7 @@ exec_entry(void *client_p, void *connection_num_p,
zsock_close(client); zsock_close(client);
return; return;
} }
LOG_DBG("%s: read program", get_thread_name());
exec_creole(readbuf[threadnum], size, (int)client); exec_creole(readbuf[threadnum], size, (int)client);
zsock_close(client); zsock_close(client);

2
software/src/sock.c
View File

@ -104,8 +104,8 @@ sock_write_buf(int sock, struct bufptr *bp)
int int
sock_vprintf(int sock, struct bufptr *bp, const char *fmt, va_list va) sock_vprintf(int sock, struct bufptr *bp, const char *fmt, va_list va)
{ {
int r = buf_writevf(bp, fmt, va);
struct bufptr store_bp = *bp; struct bufptr store_bp = *bp;
int r = buf_writevf(bp, fmt, va);
if (r != BUF_OK) if (r != BUF_OK)
return r; return r;