Use Net::ZMQ::Message objects with a Str

This is currently better at memory management, as discussed in arnsholt/Net-ZMQ#6 Also: * put the heartbeat in a loop * Keep the separator in a lexical variable * a few minor cleanups, doc changes, debug msgs
bduggan · Aug 22, 2017 · a8d2b2d · a8d2b2d
1 parent b8b4aaf
commit a8d2b2d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -29,6 +29,12 @@ You can try it in the console like this:
 jupyter-console --kernel=perl6
 ```
 
+Which is more convenient as a shell alias:
+
+```
+alias iperl6='jupyter-console --kernel=perl6'
+```
+
 SEE ALSO
 --------
 

diff --git a/lib/Jupyter/Kernel.pm6 b/lib/Jupyter/Kernel.pm6
@@ -43,7 +43,7 @@ method run {
     my $iopub = svc('iopub',   ZMQ_PUB);
     my $hb    = svc('hb',      ZMQ_REP);
 
-    start loop {
+    start {
         $hb.start-heartbeat;
     }
 
@@ -99,10 +99,10 @@ method run {
                 my $code = ~ $msg<content><code>;
                 my $result = $sandbox.eval($code);
                 my $status = 'complete';
-                debug $result.exception.gist;
+                debug "exception from sandbox: { .gist }" with $result.exception;
                 $status = 'invalid' if $result.exception;
                 $status = 'incomplete' if $result.incomplete;
-                debug "sending completion status $status";
+                debug "sending is_complete_reply: $status";
                 $shell.send: 'is_complete_reply', { :$status };
             }
             when 'shutdown_request' {

diff --git a/lib/Jupyter/Kernel/Service.pm6 b/lib/Jupyter/Kernel/Service.pm6
@@ -2,6 +2,7 @@ unit class Jupyter::Kernel::Service;
 
 use Net::ZMQ;
 use Net::ZMQ::Constants;
+use Net::ZMQ::Message;
 use UUID;
 use Log::Async;
 use Digest::HMAC;
@@ -37,8 +38,6 @@ method setup {
     self
 }
 
-constant $separator = buf8.new: "<IDS|MSG>".encode;
-
 method !hmac(@m) {
     hmac-hex $!key, @m[0] ~ @m[1] ~ @m[2] ~ @m[3], &sha256;
 }
@@ -47,6 +46,7 @@ method read-message {
     my @identities;
     my @message;
     my $separated = False;
+    my $separator = buf8.new: "<IDS|MSG>".encode;
     while $!socket.receive.data() -> $data {
         if !$separated {
             if $data eqv $separator  {
@@ -83,21 +83,36 @@ method send($type, $message, :$metadata = {} ) {
         version => '5.0',
     };
 
-    my @parts = ( $header, $!parent<header> // {}, $metadata, $message
-        ).map({ to-json($_).encode });
-    my $hmac = self!hmac(@parts).encode;
+    my @parts = (
+        $header,
+        $!parent<header> // {},
+        $metadata,
+        $message
+    ).map({
+       to-json($_)
+    });
+    my $hmac = self!hmac(@parts);
 
-    for |( @$identities.grep(*.defined) ), $separator, $hmac, |@parts[0..2] {
-        $!socket.send: $_, ZMQ_SNDMORE
+    for |( @$identities.grep(*.defined) ) {
+        my $data = $_;
+        my $msg = Net::ZMQ::Message.new(:$data);
+        $!socket.send: $msg, ZMQ_SNDMORE;
+    }
+    my $sep = "<IDS|MSG>";
+    for $sep, $hmac, |@parts[0..2] {
+        my $data = $_;
+        my $msg = Net::ZMQ::Message.new(message => $data);
+        $!socket.send: $msg, ZMQ_SNDMORE;
     }
-    $!socket.send: @parts[3];
+    my $msg = Net::ZMQ::Message.new(message => @parts[3]);
+    $!socket.send: $msg;
 }
 
 method start-heartbeat {
     loop {
         try zmq_device(ZMQ_FORWARDER, $!socket, $!socket);
         error $! if $!;
-        info 'heartbeat';
+        debug 'heartbeat';
         sleep 1;
     }
 }