mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-23 09:51:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Shell: Replace all dbg()'s with dbgln()

Browse source
This commit is contained in:
AnotherTest 2020-12-06 20:51:40 +03:30 • committed by Andreas Kling
parent 602d2ff856
commit 57728ef29f
3 changed files with 32 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Shell/AST.cpp
View file

@ -1153,7 +1153,7 @@ void Execute::for_each_entry(RefPtr<Shell> shell, Function<IterationDecision(Non
int pipefd[2]; int pipefd[2];
int rc = pipe(pipefd); int rc = pipe(pipefd);
if (rc < 0) { if (rc < 0) {
dbg() << "Error: cannot pipe(): " << strerror(errno); dbgln("Error: cannot pipe(): {}", strerror(errno));
return; return;
} }
auto& last_in_commands = commands.last(); auto& last_in_commands = commands.last();
@ -1233,7 +1233,7 @@ void Execute::for_each_entry(RefPtr<Shell> shell, Function<IterationDecision(Non
} }
if (saved_errno == 0) if (saved_errno == 0)
continue; continue;
dbg() << "read() failed: " << strerror(saved_errno); dbgln("read() failed: {}", strerror(saved_errno));
break; break;
} }
if (read_size == 0) if (read_size == 0)
@ -1253,7 +1253,7 @@ void Execute::for_each_entry(RefPtr<Shell> shell, Function<IterationDecision(Non
notifier->on_ready_to_read = nullptr; notifier->on_ready_to_read = nullptr;
if (close(pipefd[0]) < 0) { if (close(pipefd[0]) < 0) {
dbg() << "close() failed: " << strerror(errno); dbgln("close() failed: {}", strerror(errno));
} }
if (!stream.eof()) { if (!stream.eof()) {
@ -1611,7 +1611,7 @@ RefPtr<Value> MatchExpr::run(RefPtr<Shell> shell)
} }
// FIXME: Somehow raise an error in the shell. // FIXME: Somehow raise an error in the shell.
dbg() << "Non-exhaustive match rules!"; dbgln("Non-exhaustive match rules!");
return create<AST::ListValue>({}); return create<AST::ListValue>({});
} }
@ -2489,7 +2489,8 @@ void SyntaxError::dump(int level) const
RefPtr<Value> SyntaxError::run(RefPtr<Shell>) RefPtr<Value> SyntaxError::run(RefPtr<Shell>)
{ {
dbg() << "SYNTAX ERROR AAAA"; dbgln("SYNTAX ERROR executed from");
dump(1);
return create<StringValue>(""); return create<StringValue>("");
} }
@ -2897,7 +2898,7 @@ Result<NonnullRefPtr<Rewiring>, String> PathRedirection::apply() const
auto check_fd_and_return = [my_fd = this->fd](int fd, const String& path) -> Result<NonnullRefPtr<Rewiring>, String> { auto check_fd_and_return = [my_fd = this->fd](int fd, const String& path) -> Result<NonnullRefPtr<Rewiring>, String> {
if (fd < 0) { if (fd < 0) {
String error = strerror(errno); String error = strerror(errno);
dbg() << "open() failed for '" << path << "' with " << error; dbgln("open() failed for '{}' with {}", path, error);
return error; return error;
} }
return adopt(*new Rewiring(fd, my_fd, Rewiring::Close::Old)); return adopt(*new Rewiring(fd, my_fd, Rewiring::Close::Old));

44
Shell/Shell.cpp
View file

@ -70,7 +70,7 @@ void Shell::setup_signals()
{ {
Core::EventLoop::register_signal(SIGCHLD, [this](int) { Core::EventLoop::register_signal(SIGCHLD, [this](int) {
#ifdef SH_DEBUG #ifdef SH_DEBUG
dbg() << "SIGCHLD!"; dbgln("SIGCHLD!");
#endif #endif
notify_child_event(); notify_child_event();
}); });
@ -503,7 +503,7 @@ Shell::Frame Shell::push_frame(String name)
{ {
m_local_frames.append(make<LocalFrame>(name, decltype(LocalFrame::local_variables) {})); m_local_frames.append(make<LocalFrame>(name, decltype(LocalFrame::local_variables) {}));
#ifdef SH_DEBUG #ifdef SH_DEBUG
dbg() << "New frame '" << name << "' at " << &m_local_frames.last(); dbgln("New frame '{}' at {:p}", name, &m_local_frames.last());
#endif #endif
return { m_local_frames, m_local_frames.last() }; return { m_local_frames, m_local_frames.last() };
} }
@ -519,9 +519,10 @@ Shell::Frame::~Frame()
if (!should_destroy_frame) if (!should_destroy_frame)
return; return;
if (&frames.last() != &frame) { if (&frames.last() != &frame) {
dbg() << "Frame destruction order violation near " << &frame << " (container = " << this << ") '" << frame.name << "'; current frames:"; dbgln("Frame destruction order violation near {:p} (container = {:p}) in '{}'", &frame, this, frame.name);
dbgln("Current frames:");
for (auto& frame : frames) for (auto& frame : frames)
dbg() << "- " << &frame << ": " << frame.name; dbgln("- {:p}: {}", &frame, frame.name);
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
frames.take_last(); frames.take_last();
@ -557,7 +558,7 @@ int Shell::run_command(const StringView& cmd)
return 0; return 0;
#ifdef SH_DEBUG #ifdef SH_DEBUG
dbg() << "Command follows"; dbgln("Command follows");
command->dump(0); command->dump(0);
#endif #endif
@ -565,7 +566,11 @@ int Shell::run_command(const StringView& cmd)
auto& error_node = command->syntax_error_node(); auto& error_node = command->syntax_error_node();
auto& position = error_node.position(); auto& position = error_node.position();
fprintf(stderr, "Shell: Syntax error in command: %s\n", error_node.error_text().characters()); fprintf(stderr, "Shell: Syntax error in command: %s\n", error_node.error_text().characters());
fprintf(stderr, "Around '%.*s' at %zu:%zu\n", (int)min(position.end_offset - position.start_offset, (size_t)10), cmd.characters_without_null_termination() + position.start_offset, position.start_offset, position.end_offset); fprintf(stderr, "Around '%.*s' at %zu:%zu to %zu:%zu\n",
(int)min(position.end_offset - position.start_offset, (size_t)10),
cmd.characters_without_null_termination() + position.start_offset,
position.start_line.line_column, position.start_line.line_number,
position.end_line.line_column, position.end_line.line_number);
return 1; return 1;
} }
@ -640,8 +645,9 @@ RefPtr<Job> Shell::run_command(const AST::Command& command)
auto apply_rewirings = [&] { auto apply_rewirings = [&] {
for (auto& rewiring : rewirings) { for (auto& rewiring : rewirings) {
#ifdef SH_DEBUG #ifdef SH_DEBUG
dbgprintf("in %s<%d>, dup2(%d, %d)\n", command.argv.is_empty() ? "(<Empty>)" : command.argv[0].characters(), getpid(), rewiring.old_fd, rewiring.new_fd); dbgln("in {}<{}>, dup2({}, {})", command.argv.is_empty() ? "(<Empty>)" : command.argv[0].characters(), getpid(), rewiring.old_fd, rewiring.new_fd);
#endif #endif
int rc = dup2(rewiring.old_fd, rewiring.new_fd); int rc = dup2(rewiring.old_fd, rewiring.new_fd);
if (rc < 0) { if (rc < 0) {
@ -739,11 +745,10 @@ RefPtr<Job> Shell::run_command(const AST::Command& command)
// There's nothing interesting we can do here. // There's nothing interesting we can do here.
break; break;
} }
dbg() << "Oof";
} }
#ifdef SH_DEBUG #ifdef SH_DEBUG
dbg() << "Synced up with parent, we're good to exec()"; dbgln("Synced up with parent, we're good to exec()");
#endif #endif
close(sync_pipe[0]); close(sync_pipe[0]);
@ -829,7 +834,6 @@ RefPtr<Job> Shell::run_command(const AST::Command& command)
// There's nothing interesting we can do here. // There's nothing interesting we can do here.
break; break;
} }
dbg() << "Oof";
} }
close(sync_pipe[1]); close(sync_pipe[1]);
@ -906,19 +910,19 @@ NonnullRefPtrVector<Job> Shell::run_commands(Vector<AST::Command>& commands)
for (auto& command : commands) { for (auto& command : commands) {
#ifdef SH_DEBUG #ifdef SH_DEBUG
dbg() << "Command"; dbgln("Command");
for (auto& arg : command.argv) for (auto& arg : command.argv)
dbg() << "argv: " << arg; dbgln("argv: {}", arg);
for (auto& redir : command.redirections) { for (auto& redir : command.redirections) {
if (redir.is_path_redirection()) { if (redir.is_path_redirection()) {
auto path_redir = (const AST::PathRedirection*)&redir; auto path_redir = (const AST::PathRedirection*)&redir;
dbg() << "redir path " << (int)path_redir->direction << " " << path_redir->path << " <-> " << path_redir->fd; dbgln("redir path '{}' <-({})-> {}", path_redir->path, (int)path_redir->direction, path_redir->fd);
} else if (redir.is_fd_redirection()) { } else if (redir.is_fd_redirection()) {
auto* fdredir = (const AST::FdRedirection*)&redir; auto* fdredir = (const AST::FdRedirection*)&redir;
dbg() << "redir fd " << fdredir->old_fd << " -> " << fdredir->new_fd; dbgln("redir fd {} -> {}", fdredir->old_fd, fdredir->new_fd);
} else if (redir.is_close_redirection()) { } else if (redir.is_close_redirection()) {
auto close_redir = (const AST::CloseRedirection*)&redir; auto close_redir = (const AST::CloseRedirection*)&redir;
dbg() << "close fd " << close_redir->fd; dbgln("close fd {}", close_redir->fd);
} else { } else {
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
@ -951,7 +955,7 @@ bool Shell::run_file(const String& filename, bool explicitly_invoked)
if (explicitly_invoked) if (explicitly_invoked)
fprintf(stderr, "Failed to open %s: %s\n", filename.characters(), file_result.error().characters()); fprintf(stderr, "Failed to open %s: %s\n", filename.characters(), file_result.error().characters());
else else
dbg() << "open() failed for '" << filename << "' with " << file_result.error(); dbgln("open() failed for '{}' with {}", filename, file_result.error());
return false; return false;
} }
auto file = file_result.value(); auto file = file_result.value();
@ -1327,7 +1331,7 @@ Vector<Line::CompletionSuggestion> Shell::complete_option(const String& program_
Vector<Line::CompletionSuggestion> suggestions; Vector<Line::CompletionSuggestion> suggestions;
dbg() << "Shell::complete_option(" << program_name << ", " << option_pattern << ")"; dbgln("Shell::complete_option({}, {})", program_name, option_pattern);
// FIXME: Figure out how to do this stuff. // FIXME: Figure out how to do this stuff.
if (has_builtin(program_name)) { if (has_builtin(program_name)) {
@ -1469,7 +1473,7 @@ void Shell::notify_child_event()
if (errno == ECHILD) { if (errno == ECHILD) {
// The child process went away before we could process its death, just assume it exited all ok. // The child process went away before we could process its death, just assume it exited all ok.
// FIXME: This should never happen, the child should stay around until we do the waitpid above. // FIXME: This should never happen, the child should stay around until we do the waitpid above.
dbg() << "Child process gone, cannot get exit code for " << job_id; dbgln("Child process gone, cannot get exit code for {}", job_id);
child_pid = job.pid(); child_pid = job.pid();
} else { } else {
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
@ -1619,7 +1623,7 @@ void Shell::stop_all_jobs()
for (auto& entry : jobs) { for (auto& entry : jobs) {
if (entry.value->is_suspended()) { if (entry.value->is_suspended()) {
#ifdef SH_DEBUG #ifdef SH_DEBUG
dbg() << "Job " << entry.value->pid() << " is suspended"; dbgln("Job {} is suspended", entry.value->pid());
#endif #endif
kill_job(entry.value, SIGCONT); kill_job(entry.value, SIGCONT);
} }
@ -1631,7 +1635,7 @@ void Shell::stop_all_jobs()
for (auto& entry : jobs) { for (auto& entry : jobs) {
#ifdef SH_DEBUG #ifdef SH_DEBUG
dbg() << "Actively killing " << entry.value->pid() << "(" << entry.value->cmd() << ")"; dbgln("Actively killing {} ({})", entry.value->pid(), entry.value->cmd());
#endif #endif
kill_job(entry.value, SIGKILL); kill_job(entry.value, SIGKILL);
} }

2
Shell/main.cpp
View file

@ -175,7 +175,7 @@ int main(int argc, char** argv)
} }
if (command_to_run) { if (command_to_run) {
dbgprintf("sh -c '%s'\n", command_to_run); dbgln("sh -c '{}'\n", command_to_run);
shell->run_command(command_to_run); shell->run_command(command_to_run);
return 0; return 0;
} }