Only for Debug

[simgrid.git] / tools / tesh2 / src / writer.c

diff --git a/tools/tesh2/src/writer.c b/tools/tesh2/src/writer.c
index 419a11f..3755abc 100644 (file)
--- a/tools/tesh2/src/writer.c
+++ b/tools/tesh2/src/writer.c
@@ -14,6 +14,7 @@
  \r
 #include <writer.h>\r
 #include <command.h>\r
+#include <unit.h>\r
 \r
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(tesh);\r
 \r
@@ -41,12 +42,15 @@ writer_new(command_t command)
 int\r
 writer_free(writer_t* ptr)\r
 {\r
-       /* TODO : check the parameter */\r
+\r
+       if((*ptr)->written)\r
+               xbt_os_sem_destroy((*ptr)->written);\r
        \r
-       /*xbt_os_sem_destroy((*writer)->started);\r
-       xbt_os_sem_destroy((*writer)->can_write);*/\r
+       if((*ptr)->can_write)\r
+               xbt_os_sem_destroy((*ptr)->can_write);\r
        \r
        free(*ptr);\r
+\r
        *ptr = NULL;\r
        \r
        return 0;\r
@@ -70,6 +74,8 @@ writer_start_routine(void* p)
        DWORD number_of_bytes_to_write = command->context->input->used;\r
        DWORD number_of_bytes_written = 0;\r
 \r
+       xbt_os_sem_release(writer->written);\r
+\r
        while(!command->failed && !command->interrupted && !command->successeded && ! writer->failed && ! writer->broken_pipe && number_of_bytes_to_write)\r
        {\r
                if(!WriteFile(writer->command->stdin_fd, input, number_of_bytes_to_write, &number_of_bytes_written, NULL))\r
@@ -92,15 +98,19 @@ writer_start_routine(void* p)
        \r
        if(writer->failed  && !command->successeded && !command->failed && !command->interrupted)\r
        {\r
-               error_register("Write failure", errno, command->context->command_line, command->unit->fstream->name);\r
+               ERROR2("[%s] Error while writing input to child `%s'", command->context->pos, command->context->command_line);\r
+               unit_set_error(command->unit, (int)GetLastError(), 0, command->context->pos);\r
                command_handle_failure(command, csr_write_failure);\r
        }\r
        /*else if(writer->broken_pipe && !command->successeded && !command->failed && !command->interrupted)\r
        {\r
+\r
+               ERROR2("[%s] Pipe broken while writing input to child `%s'", command->context->pos, command->context->command_line);\r
+               unit_set_error(command->unit, (int)GetLastError(), 0);\r
                command_kill(command);\r
                command_handle_failure(command, csr_write_pipe_broken);\r
        }*/\r
-       \r
+\r
        CloseHandle(command->stdin_fd);\r
        command->stdin_fd = INDEFINITE_FD;\r
 \r
@@ -176,12 +186,16 @@ writer_start_routine(void* p)
        if(writer->failed && !command->successeded && !command->failed && !command->interrupted)\r
        {\r
                command_kill(command);\r
-               error_register("Write failure", errno, command->context->command_line, command->unit->fstream->name);\r
+               ERROR2("[%s] Error while writing input to child `%s'", command->context->pos, command->context->command_line);\r
+               \r
+               unit_set_error(command->unit, errno, 0, command->context->pos);\r
                command_handle_failure(command, csr_write_failure);\r
        }\r
        else if(writer->broken_pipe && !command->successeded && !command->failed && !command->interrupted)\r
        {\r
-               error_register("write() function failed", errno, command->context->command_line, command->unit->fstream->name);\r
+               ERROR2("[%s] Pipe broken while writing input to child `%s'", command->context->pos, command->context->command_line);\r
+\r
+               unit_set_error(command->unit, errno, 0, command->context->pos);\r
                command_kill(command);\r
                command_handle_failure(command, csr_write_pipe_broken);\r
        }\r