system/message_queue.anubis:

add set_name method in MessageQueue. This allow to change the name of message queue for better debugging tools/basis.anubis: move println on the top of file to permit some function to use it improve the read_line_from_stdin for better working on Windows web/service_machine.anubis: update vm_info to fit with right number of resurgent symbols src/vmtools.cpp: read_byte is able to read byte per byte on stdin instead of line before. This only work with stdin.

system/message_queue.anubis:
add set_name method in MessageQueue. This allow to change the name of message queue for better debugging tools/basis.anubis: move println on the top of file to permit some function to use it improve the read_line_from_stdin for better working on Windows web/service_machine.anubis: update vm_info to fit with right number of resurgent symbols src/vmtools.cpp: read_byte is able to read byte per byte on stdin instead of line before. This only work with stdin.
David René
1 parent 5b9a783b
Showing 5 changed files with 80 additions and 25 deletions Show diff stats
anubis_dev/library/system/message_queue.anubis
anubis_dev/library/system/message_transceiver.anubis
anubis_dev/library/tools/basis.anubis
anubis_dev/library/web/service_machine.anubis
anubis_dev/vm/src/vmtools.cpp
@@ -2,6 +2,7 @@
  
 read muscle.anubis
 read tools/basis.anubis
+read system/string.anubis
  
 public type MessageResult:
   timeout,
@@ -19,7 +20,8 @@ public type MessageQueue:
     One -> One              connection_closed,
     One -> One              quit,
     One -> Bool             quit_requested,
-    One -> String           get_name
+    One -> String           get_name,
+    String -> One           set_name
   ).
  
  
@@ -105,7 +107,7 @@ define MessageResult
 public define MessageQueue
   create_MessageQueue
   (
-    String name
+    String g_name
   )=
   with rcv_flip       = var((List(Message))[]),
        rcv_flap       = var((List(Message))[]),
@@ -117,6 +119,7 @@ public define MessageQueue
        send_flip_flag = var((Bool) true),
        conn_closed    = var((Bool) false),
        quit           = var((Bool) false),
+       name           = var((String) g_name),
   message_queue
   (
     //add_Message
@@ -143,11 +146,11 @@ public define MessageQueue
     (Message msg) |->
       if *send_flip_flag then
         send_flip <- ([msg . *send_flip]);
-//        println("add_Message_to_send add in flip");
+//        println("add_Message_to_send [0x"+zero_pad_n(8,to_hexa(*msg.what))+"] add in flip ["+*name+"]");
         unique
       else
         send_flap <- ([msg . *send_flap]);
-//        println("add_Message_to_send add in flap");
+//        println("add_Message_to_send [0x"+zero_pad_n(8,to_hexa(*msg.what))+"] add in flap ["+*name+"]");
         unique,
  
     //get_next_Message_to_send
@@ -178,6 +181,9 @@ public define MessageQueue
       *quit,
     //get_name
     (One u) |->
-      name
+      *name,
+    //set_name
+    (String new_name) |->
+      name <- new_name
   ).
  
@@ -82,7 +82,7 @@ define One
       {
         failure then 
           message_receiver(conn, queue, constant_byte_array(0,0)),
-          closed  then unique,
+        closed  then unique,
         ok(msg) then
           queue.add_received_Message(msg);
           message_receiver(conn, queue, constant_byte_array(0,0)),
-
+
                               The Anubis Project
  
                            Some basic definitions.
@@ -347,7 +347,17 @@ public define Int
    }.
  
    *** (3) String functions
-
+   
+   Print the given string together with a newline. This is a convenience function to avoid
+   typing +"\n" at each call of print.
+   
+public define One
+  println
+  (
+    String line
+  )=
+  print(line + "\n").
+  
 public define String
    String s + Word32 i =
       s + to_decimal(i). 
@@ -639,8 +649,6 @@ public define Bool
     ) =
   member(c,s,0). 
  
-
-   
    A syntactical variant  for member, using the sign ':'  (remind of 'membership' relation
    in Set Theory).  'a:b' means that 'a' belongs to the list 'b'.
  
@@ -2144,7 +2152,7 @@ public define Bool
  
       *** (14.1) Reading a line from the standard input. 
  
-define String
+public define String
   read_line_from_stdin
     (
       List(Word8) so_far
@@ -2153,9 +2161,12 @@ define String
     {
       failure then implode(reverse(so_far)), 
       success(c) then 
-        if c = '\n'
-        then implode(reverse(so_far))
-        else read_line_from_stdin([c . so_far])
+        //println("read line read char ["+c+"|"+implode([c])+"]");
+        if c = '\n' | c='\r' then
+          implode(reverse(so_far))
+        else 
+          print(implode[c]);
+          read_line_from_stdin([c . so_far])
     }. 
  
  
@@ -2399,15 +2410,7 @@ public define RGBA
    rgba(r,g,b,a). 
  
  
-   Print the given string together with a newline. This is a convenience function to avoid
-   typing +"\n" at each call of print.
-   
-public define One
-  println
-  (
-    String line
-  )=
-  print(line + "\n").
+
  
 public define One
   print
@@ -75,7 +75,7 @@ define One
      {
        [ ] then unique, 
        [h . t] then 
-         if h is vm_info(mid,state,ws,sip,ip,ss,sp,l1,l5,l15) then
+         if h is vm_info(mid,state,ws,ip,ss,sp,l1,l5,l15) then
            print(to_decimal(mid)); print(state); print(ws); 
            print(to_decimal(ip)); 
            //(if state is running then print(to_decimal(ip)) else unique); 
@@ -8,6 +8,7 @@
 #include "AnubisSupport.h"
 //#include <malloc.h>
 #include <stdio.h>
+#include <conio.h>
 #include <assert.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -1714,7 +1715,52 @@ open_IP_connection(U32 conn_seg,
       switch (conn[4])     /* type of connection (see vm.h) */
       {
         case conn_file:
-          return getc(*((FILE **)(conn+8)));
+          FILE* fd;
+		  fd = *((FILE **)(conn+8));
+		  if (fd == stdin)
+		  {
+#ifdef WIN32
+/*            HANDLE handle = GetStdHandle(STD_INPUT_HANDLE);
+            DWORD events;
+            INPUT_RECORD buffer;
+			PeekConsoleInput(handle, &buffer, 1, &events);
+			if (events > 0)
+			{
+				if(buffer.EventType == KEY_EVENT & buffer.Event.KeyEvent.bKeyDown==1)
+				{
+					int read_char;
+					ReadConsoleInput(handle, &buffer, 1, &events);
+				
+					read_char = buffer.Event.KeyEvent.uChar.AsciiChar;
+					FlushConsoleInputBuffer(handle);
+					if (read_char == 0)
+					{
+						return 2*EOF;
+				    }
+					else
+					{
+						if (read_char != 27) //don't show escape
+							putchar(read_char);
+							
+						//printf("Read char [%d]\n bKeyDown [%d]\n",read_char, buffer.Event.KeyEvent.bKeyDown);
+						return(read_char);
+					}
+				}
+				else if (buffer.EventType > 0)
+				{
+					FlushConsoleInputBuffer(handle);
+				}
+			}
+			return 2*EOF; 
+*/
+#endif
+			if (kbhit())	//a character waiting to be read
+				return(getch());
+			else
+				return 2*EOF;
+
+		  }
+          return getc(fd);
  
         case conn_network:
           {