change the return result of read. Now the return type is ReadResult instead of M…

…aybe(ByteArray). ReadResult introduce timeout error handling.

change the return result of read. Now the return type is ReadResult instead of M…
…aybe(ByteArray). ReadResult introduce timeout error handling.
David René
1 parent c11bb75d
Showing 11 changed files with 45 additions and 104 deletions Show diff stats
anubis_dev/library/doc_tools/latex.anubis
anubis_dev/library/mail/smtp_server.anubis
anubis_dev/library/network/tools.anubis
anubis_dev/library/predefined.anubis
anubis_dev/library/system/data_io.anubis
anubis_dev/library/system/files.anubis
anubis_dev/library/system/muscle.anubis
anubis_dev/library/test/all_unit_test.anubis
anubis_dev/library/tools/basis.anubis
anubis_dev/library/web/http_server.anubis
anubis_dev/library/web/multihost_http_server.anubis
@@ -340,14 +340,16 @@ define Bool
    wait for true 
      then if read(process_stdout(ec),1000,120) is 
             {
-              failure    then print("SO=failure \n"),
-              success(s) then print("SO=["+to_string(s)+"]\n")
+              error   then print("SO=failure \n"),
+              timeout then print("SO=timeout \n"),
+              ok(s)   then print("SO=["+to_string(s)+"]\n")
             };
  
           if read(process_stderr(ec),1000,120) is 
             {
-              failure    then print("SE=failure \n"),
-              success(s) then print("SE=["+to_string(s)+"]\n")
+              error   then print("SE=failure \n"),
+              timeout then print("SE=timeout \n"),
+              ok(s)   then print("SE=["+to_string(s)+"]\n")
             };
  
           if check_execute_status(ec) is 
@@ -770,8 +770,9 @@ define Maybe(ByteArray)
      ) =
    if read(weaken(conn),1000,480) is 
      {
-       failure then failure, 
-       success(bytes) then 
+       error    then failure, 
+       timeout  then failure,
+       ok(bytes)then 
          with new = so_far+bytes, 
                 l = length(new), 
          if extract(new,l-5,l) = crlf_dot_crlf
@@ -975,4 +976,4 @@ public define One
  
  
  
-   
 \ No newline at end of file
+   
@@ -13,7 +13,7 @@ read system/string.anubis
  
 public type Byte_Net_Result:
   failure,
-  time_out,
+  timeout,
   success(Word8).
  
  
@@ -25,9 +25,9 @@ public define Byte_Net_Result
   )=
   if read(conn, 1, t_out) is
   {
-    error     then failure,
-    time_out  then time_out,
-    ok(byte)  then
+    error    then failure,
+    timeout  then timeout,
+    ok(byte) then
     if nth(0, byte) is
     {
       failure       then failure,
@@ -38,7 +38,7 @@ public define Byte_Net_Result
  
  public type Bytes_Net_Result:
   failure,
-  time_out,
+  timeout,
   success(ByteArray),
   truncated(ByteArray).
  
@@ -51,8 +51,8 @@ public define Byte_Net_Result
   )=
   if read(conn, how_many, t_out) is
   {
-    error     then failure,
-    time_out  then time_out,
+    error    then failure,
+    timeout  then timeout,
     ok(bytes) then
       with len = length(bytes),
       if len = how_many  then
@@ -1322,7 +1322,7 @@ public define Bool
  
 public type ReadResult:
     error,
-    time_out,
+    timeout,
     ok(ByteArray).
  
  // public define Maybe(ByteArray)
@@ -31,7 +31,7 @@ public type Data_IO:
  
  /* File interface */
  
-define Int32 -> Data_IO_Result
+ define Int32 -> Data_IO_Result
   make_read_bytes   // making the 'rb' function 
   (
     RStream       file, 
@@ -51,7 +51,7 @@ define Int32 -&gt; Data_IO_Result
           truncated(bytes)
     }. 
  
-public define Data_IO
+ public define Data_IO
   make_data_io
   (
     RStream    file
@@ -39,9 +39,9 @@ public define ResultCopy
     copy_ok
   else if read(source, read_length, 10) is
   {
-    error       then copy_error,
-    time_out    then copy_error,
-    ok(buffer)  then
+    error     then copy_error,
+    timeout   then copy_error,
+    ok(buffer)then
     if write( target , buffer) is
     {
       failure then copy_error,
@@ -159,9 +159,9 @@ public define Maybe(One)
     success(unique)
   else if read(source_file, read_length, 10) is
   {
-    error       then failure,
-    time_out    then  failure,
-    ok(buffer)  then
+    error     then failure,
+    timeout   then  failure,
+    ok(buffer)then
     if reliable_write(tcp(socket), buffer) is
     {
       failure           then failure,
@@ -1608,76 +1608,8 @@ public define Message_Send_Result
  
  
  
-/********************** TESTING SERVER *************************/
  
-define One 
-  message_received
-  (
-    Message msg
-  )=
-  print("MESSAGE [" + to_ascii(*msg.what) + "] received\n");
-  if * msg.what = 323232 then
-    unique
-  else
-    unique
-  .
-
-define One   
-  message_receiver
-  (
-    RWStream conn
-  ) =
-  
-  if unflatten_message(make_data_io(weaken(conn))) is
-  {
-    failure       then 
-      print("can't unflatten any message\n");
-      message_receiver(conn),
-    success(msg)  then 
-      message_received(msg);
-      message_receiver(conn)
-  }.
-
-define Server -> (RWStream) -> One
-  muscle_handler
-  (
-    One dummy
-  ) = 
-  (Server server) |-> (RWStream conn) |->
-  if remote_IP_address_and_port(conn) is (num_peer,_) then 
-  //convert IP address of the client to string
-  with peer = ip_addr_to_string(num_peer), 
-  print("Accepting connection with "+peer+"\n"); 
-  
-  //now managing the AUTHORIZATION state
-  message_receiver(conn).
-
-public define One
-   start_muscle_server
-     (
-       One dummy
-     ) =
-   if start_server(0,
-                   44701, 
-                   muscle_handler(unique),
-                   (One u) |-> unique) is 
-     {
-       cannot_create_the_socket then print("Cannot create the listening socket.\n"), 
-       cannot_bind_to_port      then print("Cannot bind to port 44701\n"), 
-       cannot_listen_on_port    then print("Cannot listen on port 44701\n"),
-       ok(server)               then print("Muscle Server started on port 44701 \n")
-     }.
-
-global define One
-  muscle
-  (
-    List(String)  args
-  ) =
-  start_muscle_server(unique);
-  print("Muscle Message Test\n")
-  .
-
-global define One
+ global define One
   muscle_file
   (
     List(String)  args
  
+read tools/basis.anubis
 read tools/unit_test.anubis
 read test/system/convert.unit_test.anubis
+read test/system/message_queue.unit_test.anubis
  
  
 define List(TestAction)
@@ -8,7 +10,8 @@ define List(TestAction)
   (
     One dummy
   )=
-  make_convert_test_actions
+  make_convert_test_actions +
+  make_message_queue_test_actions
   .
  
 global define One
@@ -1800,7 +1800,7 @@ define Maybe(ByteArray)
    if read(conn,n,1) is 
      {
        error    then failure,
-       time_out then failure,
+       timeout  then failure,
        ok(ba)   then 
         with l = length(ba),
          if l = n
@@ -487,8 +487,9 @@ define Maybe(Word8)
      ) =
    if read(connection,1,60) is 
      {
-       failure then failure, 
-       success(ba) then nth(0,ba)
+       error    then failure,
+       timeout  then failure,
+       ok(ba)   then nth(0,ba)
      }.
  
  
@@ -1445,8 +1446,9 @@ define Result(Error,ByteArray)
    if retries =< 0 then error(cannot_read_from_connection) else
    if read(connection,body_size,60) is 
      {
-       failure then error(cannot_read_from_connection),
-       success(new_bytes) then with
+       error          then error(cannot_read_from_connection),
+       timeout        then error(cannot_read_from_connection),
+       ok(new_bytes)  then with
         ba        = so_far + new_bytes,                     // contains all the bytes read so far
         nr        = length(ba),                             // total read since the beginning
         nn        = length(new_bytes),                      // number of bytes just read
@@ -1695,8 +1697,9 @@ define One
    if sent >= size then unique else
    if read(file,min(10000,size-sent),60) is 
      {
-       failure then log_journal_msg(desc,"Cannot read from file '"+filename+"'.\n"), 
-       success(ba) then 
+       error    then log_journal_msg(desc,"Cannot read from file '"+filename+"'.\n"), 
+       timeout  then log_journal_msg(desc,"Cannot read from file timeout'"+filename+"'.\n"),
+       ok(ba)   then 
          with nr = length(ba),                          // get the number of bytes read
          if reliable_write(connection,ba) is 
            {
@@ -2582,4 +2585,4 @@ public define One
  
  
  
-   
 \ No newline at end of file
+   
@@ -698,7 +698,7 @@ define Result(Error,Word8)
      {
        error      then error(cannot_read_from_connection),
                          //record_dubious_connection(connection,dead_line,dos),
-       time_out     then error(timeout(600)),
+       timeout     then error(timeout(600)),
        ok(ba)       then if nth(0,ba) is 
          {
            failure then error(cannot_read_from_connection),
@@ -1633,7 +1633,7 @@ define Result(Error,ByteArray)
    if read(connection,body_size,60) is 
      {
        error          then error(cannot_read_from_connection),
-       time_out       then error(timeout(60)),
+       timeout        then error(timeout(60)),
        ok(new_bytes)  then with
         ba        = so_far + new_bytes,                     // contains all the bytes read so far
         nr        = length(ba),                             // total read since the beginning
@@ -1884,7 +1884,7 @@ define One
    if read(file,min(10000,size-sent),60) is 
      {
        error    then log_journal_msg(desc,"Cannot read from file '"+filename+"'.\n"),
-       time_out then log_journal_msg(desc,"Cannot read from file timeout '"+filename+"'.\n"),
+       timeout  then log_journal_msg(desc,"Cannot read from file timeout '"+filename+"'.\n"),
        ok(ba)   then 
          with nr = length(ba),                          // get the number of bytes read
          if reliable_write(connection,ba) is