Merge pull request #3509 from maxteufel/net_connection_handler

lib/net: rename `Request_Handler` to `Connection_Handler`

lib/net/client.fz

@@ -29,28 +29,28 @@
 #
 # Minimal example:
 #
-#     rh : net.Request_Handler unit is
-#       handle_request unit =>
+#     ch : net.Connection_Handler unit is
+#       handle_connection unit =>
 #         say net.channel.env.get_peer_address
 #
-#     net.client rh net.family.ipv4 net.protocol.tcp "tokiwa.software" (u16 80) # NYI: type inference
+#     net.client ch net.family.ipv4 net.protocol.tcp "tokiwa.software" (u16 80) # NYI: type inference
 #
 #
 # Blocks until connection is establised.
 # NYI blocking / none blocking
 #
-public client(T type, LM type : mutate, rh Request_Handler T, f net.family.val, p net.protocol.val, host String, port u16) outcome T
+public client(T type, LM type : mutate, ch Connection_Handler T, f net.family.val, p net.protocol.val, host String, port u16) outcome T
 =>
   s := net.socket_type.by_protocol p
   fuzion.sys.net.connect f.as_num s.as_num p.as_num host port
     .bind T (desc)->
       # NYI install custom thread spawn effect
-      # NYI: BUG: (try net.request_handler).on ()->
+      # NYI: BUG: (try net.connection_handler).on ()->
 
       res := (io.buffered.reader LM (read_provider desc) 1024).with ()->
         (io.buffered.writer LM (write_provider desc) 1024).with ()->
           (net.channel desc).go ()->
-            rh.handle_request
+            ch.handle_connection
 
       _ := fuzion.sys.net.close desc
 

lib/net/request_handler.fz → lib/net/connection_handler.fz

@@ -21,8 +21,9 @@
 #
 # -----------------------------------------------------------------------
 
-# definition of a request handler.
+# definition of a connection handler.
 #
-public Request_Handler(T type) ref is
+public Connection_Handler(T type) ref is
 
-  public handle_request T ! io.buffered.reader, net.channel => abstract
+  public handle_connection T ! io.buffered.reader, io.buffered.writer, net.channel
+  => abstract

lib/net/server.fz

@@ -64,7 +64,7 @@ is
   # does nothing for UDP etc.
   # blocks until connection is established
   # NYI we may want to close server on certain errors?
-  public accept(T type, LM type : mutate, rh Request_Handler T) outcome T =>
+  public accept(T type, LM type : mutate, ch Connection_Handler T) outcome T =>
     match state
       d i64 =>
         match fuzion.sys.net.accept d
@@ -77,13 +77,13 @@ is
             #   spawn(code ()->unit) concur.thread.spawned =>
             #     panic "may not spawn threads in request handler"
             # (concur.thread no_threads).go ()->
-            #   _ := request_handler.env.handle_request (channel desc)
+            #   _ := connection_handler.env.handle_connection (channel desc)
             #   fuzion.sys.net.close desc
 
             res := (io.buffered.reader LM (read_provider desc) 1024).with ()->
               (io.buffered.writer LM (write_provider desc) 1024).with ()->
                 (net.channel desc).go ()->
-                  rh.handle_request
+                  ch.handle_connection
 
             _ := fuzion.sys.net.close desc
 

tests/sockets/sockets_test.fz

@@ -38,9 +38,9 @@ sockets_test is
 
 
 
-      rh : net.Request_Handler unit is
+      ch : net.Connection_Handler unit is
 
-        redef handle_request unit =>
+        redef handle_connection unit =>
 
           chan => net.channel.env
 
@@ -76,7 +76,7 @@ sockets_test is
 
 
 
-      while net.server.is_active && match net.server.accept unit LM rh
+      while net.server.is_active && match net.server.accept unit LM ch
                                       e error => false
                                       * => true
       do
@@ -93,9 +93,9 @@ sockets_test is
   client(family net.family.val, protocol net.protocol.val, host String, port u16, num i32) =>
     lm : mutate is
     lm.go ()->
-      rh : net.Request_Handler String is
+      ch : net.Connection_Handler String is
 
-        redef handle_request =>
+        redef handle_connection =>
 
           chan => net.channel.env
 
@@ -124,7 +124,7 @@ sockets_test is
             * =>  panic "NI"
 
 
-      match net.client String lm rh family protocol host port
+      match net.client String lm ch family protocol host port
         err error =>
           say "$protocol/$family-client {sockets_test.client.this.num}, $host:$port: error establishing connection"
         str String =>