justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[uart] Pass com1 address directly to thread proc

Browse Source 
To avoid a race condition I was seeing where the child thread was
reading g_com1 and seeing it as null, now we just pass the pointer as an
argument.
This commit is contained in:
Justin C. Miller
2023-02-14 20:35:03 -08:00
parent dc30437ce7
commit 7b29ba7d23
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/user/drv.uart/main.cpp
View File

@@ -32,13 +32,10 @@ uint8_t com2_in[in_buf_size];
uint8_t com1_out[out_buf_size]; uint8_t com1_out[out_buf_size];
uint8_t com2_out[out_buf_size]; uint8_t com2_out[out_buf_size];
serial_port *g_com1;
serial_port *g_com2;
constexpr uintptr_t stack_top = 0xf80000000; constexpr uintptr_t stack_top = 0xf80000000;
int int
channel_pump_loop() channel_pump_loop(serial_port *com1)
{ {
j6_status_t result; j6_status_t result;
static constexpr size_t buffer_size = 512; static constexpr size_t buffer_size = 512;
@@ -76,14 +73,15 @@ channel_pump_loop()
size_t size = buffer_size; size_t size = buffer_size;
j6_status_t s = j6_channel_receive(cout, buffer, &size, j6_channel_block); j6_status_t s = j6_channel_receive(cout, buffer, &size, j6_channel_block);
if (s == j6_status_ok) if (s == j6_status_ok)
g_com1->write(buffer, size); com1->write(buffer, size);
} }
} }
void void
pump_proc(void *) pump_proc(void *com_ptr)
{ {
j6_process_exit(channel_pump_loop()); serial_port *com1 = reinterpret_cast<serial_port*>(com_ptr);
j6_process_exit(channel_pump_loop(com1));
} }
int int
@@ -116,11 +114,9 @@ main(int argc, const char **argv)
serial_port com1 {COM1, in_buf_size, com1_in, out_buf_size, com1_out}; serial_port com1 {COM1, in_buf_size, com1_in, out_buf_size, com1_out};
serial_port com2 {COM2, in_buf_size, com2_in, out_buf_size, com2_out}; serial_port com2 {COM2, in_buf_size, com2_in, out_buf_size, com2_out};
g_com1 = &com1;
g_com2 = &com2;
j6::thread pump_thread {pump_proc, stack_top}; j6::thread pump_thread {pump_proc, stack_top};
result = pump_thread.start(); result = pump_thread.start(&com1);
if (result != j6_status_ok) if (result != j6_status_ok)
return result; return result;