Commit: 69079ef7e42114041cc58ac2ee02836ed95230a5
Parent: 0a45ee99867d27002eacaae3891ebc1281b4d33e
Author: Randy Palamar
Date: Tue, 13 May 2025 20:05:20 -0600
os: rename stderr to error_handle
w32/mingw headers #define stderr so this creates friction when a
header is temporarily included to test something.
Diffstat:
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/beamformer.c b/beamformer.c
@@ -179,7 +179,7 @@ export_frame(BeamformerCtx *ctx, iptr handle, BeamformFrame *frame)
glGetTextureImage(frame->texture, 0, GL_RG, GL_FLOAT, out_size, ctx->export_buffer.beg);
s8 raw = {.len = out_size, .data = ctx->export_buffer.beg};
if (!ctx->os.write_file(handle, raw))
- ctx->os.write_file(ctx->os.stderr, s8("failed to export frame\n"));
+ ctx->os.write_file(ctx->os.error_handle, s8("failed to export frame\n"));
ctx->os.close(handle);
}
@@ -469,7 +469,7 @@ reload_compute_shader(BeamformerCtx *ctx, s8 path, s8 extra, ComputeShaderReload
} else {
Stream sb = arena_stream(tmp);
stream_append_s8s(&sb, s8("failed to load: "), path, extra, s8("\n"));
- ctx->os.write_file(ctx->os.stderr, stream_to_s8(&sb));
+ ctx->os.write_file(ctx->os.error_handle, stream_to_s8(&sb));
}
return result;
diff --git a/main_linux.c b/main_linux.c
@@ -62,7 +62,7 @@ dispatch_file_watch_events(OS *os, Arena arena)
}
}
-int
+extern i32
main(void)
{
BeamformerCtx ctx = {0};
@@ -79,7 +79,7 @@ main(void)
ctx.os.file_watch_context.handle = inotify_init1(IN_NONBLOCK|IN_CLOEXEC);
ctx.os.compute_worker.asleep = 1;
- ctx.os.stderr = STDERR_FILENO;
+ ctx.os.error_handle = STDERR_FILENO;
ctx.os.export_pipe_name = OS_EXPORT_PIPE_NAME;
debug_init(&ctx.os, (iptr)&input, &temp_memory);
diff --git a/main_w32.c b/main_w32.c
@@ -41,7 +41,7 @@ dispatch_file_watch(OS *os, FileWatchDirectory *fw_dir, u8 *buf, Arena arena)
stream_append_s8(&path, s8("unknown file watch event: "));
stream_append_u64(&path, fni->action);
stream_append_byte(&path, '\n');
- os->write_file(os->stderr, stream_to_s8(&path));
+ os->write_file(os->error_handle, stream_to_s8(&path));
stream_reset(&path, 0);
}
@@ -92,7 +92,7 @@ clear_io_queue(OS *os, BeamformerInput *input, Arena arena)
}
}
-int
+extern i32
main(void)
{
BeamformerCtx ctx = {0};
@@ -112,7 +112,7 @@ main(void)
ctx.os.context = (iptr)&w32_ctx;
ctx.os.compute_worker.asleep = 1;
- ctx.os.stderr = GetStdHandle(STD_ERROR_HANDLE);
+ ctx.os.error_handle = GetStdHandle(STD_ERROR_HANDLE);
ctx.os.export_pipe_name = OS_EXPORT_PIPE_NAME;
debug_init(&ctx.os, (iptr)&input, &temp_memory);
diff --git a/static.c b/static.c
@@ -35,7 +35,7 @@ function FILE_WATCH_CALLBACK_FN(debug_reload)
#undef X
stream_append_s8(&err, s8("Reloaded Main Executable\n"));
- os->write_file(os->stderr, stream_to_s8(&err));
+ os->write_file(os->error_handle, stream_to_s8(&err));
input->executable_reloaded = 1;
@@ -62,7 +62,7 @@ debug_init(OS *os, iptr input, Arena *arena)
}
}
- os->write_file(os->stderr, stream_to_s8(&err));
+ os->write_file(os->error_handle, stream_to_s8(&err));
}
#endif /* _DEBUG */
@@ -91,7 +91,7 @@ gl_debug_logger(u32 src, u32 type, u32 id, u32 lvl, i32 len, const char *msg, co
}
stream_append(e, (char *)msg, len);
stream_append_byte(e, '\n');
- ctx->os->write_file(ctx->os->stderr, stream_to_s8(e));
+ ctx->os->write_file(ctx->os->error_handle, stream_to_s8(e));
stream_reset(e, 0);
}
@@ -176,7 +176,7 @@ dump_gl_params(GLParams *gl, Arena a, OS *os)
GL_PARAMETERS
#undef X
stream_append_s8(&s, s8("-----------------------\n"));
- os->write_file(os->stderr, stream_to_s8(&s));
+ os->write_file(os->error_handle, stream_to_s8(&s));
#endif
}
@@ -251,7 +251,7 @@ static FILE_WATCH_CALLBACK_FN(load_cuda_lib)
CUDA_LIB_FNS
#undef X
- os->write_file(os->stderr, stream_to_s8(&err));
+ os->write_file(os->error_handle, stream_to_s8(&err));
}
#define X(name) if (!cl->name) cl->name = name ## _stub;
diff --git a/util.h b/util.h
@@ -313,7 +313,7 @@ struct OS {
#undef X
FileWatchContext file_watch_context;
iptr context;
- iptr stderr;
+ iptr error_handle;
GLWorkerThreadContext compute_worker;
char *export_pipe_name;
diff --git a/util_gl.c b/util_gl.c
@@ -18,7 +18,7 @@ compile_shader(OS *os, Arena a, u32 type, s8 shader, s8 name)
glGetShaderInfoLog(sid, len, &out_len, (char *)(buf.data + buf.widx));
stream_commit(&buf, out_len);
glDeleteShader(sid);
- os->write_file(os->stderr, stream_to_s8(&buf));
+ os->write_file(os->error_handle, stream_to_s8(&buf));
sid = 0;
}
@@ -42,7 +42,7 @@ link_program(OS *os, Arena a, u32 *shader_ids, u32 shader_id_count)
glGetProgramInfoLog(result, buf.cap - buf.widx, &len, (c8 *)(buf.data + buf.widx));
stream_reset(&buf, len);
stream_append_byte(&buf, '\n');
- os->write_file(os->stderr, stream_to_s8(&buf));
+ os->write_file(os->error_handle, stream_to_s8(&buf));
glDeleteProgram(result);
result = 0;
}
@@ -68,7 +68,7 @@ load_shader(OS *os, Arena arena, b32 compute, s8 vs_text, s8 fs_text, s8 cs_text
if (result) {
Stream buf = arena_stream(arena);
stream_append_s8s(&buf, s8("loaded: "), info_name, s8("\n"));
- os->write_file(os->stderr, stream_to_s8(&buf));
+ os->write_file(os->error_handle, stream_to_s8(&buf));
LABEL_GL_OBJECT(GL_PROGRAM, result, label);
}