kernel.js: Move executionCount to class Kernel

* `executionCount` has been deprecated in nel~Session (it will be removed in [email protected]).
n-riesco · Jun 18, 2015 · 20c139f · 20c139f
1 parent 44601a6
commit 20c139f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/lib/handlers_v4.js b/lib/handlers_v4.js
@@ -97,11 +97,11 @@ function execute_request(request) {
     this.session.run(task);
 
     function beforeRun(session) {
-        session.executionCount++;
+        this.executionCount++;
         request.respond(
             this.iopubSocket,
             "pyin", {
-                execution_count: session.executionCount,
+                execution_count: this.executionCount,
                 code: request.content.code,
             }
         );
@@ -114,7 +114,7 @@ function execute_request(request) {
             this.shellSocket,
             "execute_reply", {
                 status: "ok",
-                execution_count: session.executionCount,
+                execution_count: this.executionCount,
                 payload: [], // TODO(NR) payload not implemented,
                 user_variables: {}, // TODO(NR) user_variables not implemented,
                 user_expressions: {}, // TODO(NR) user_expressions not implemented,
@@ -124,7 +124,7 @@ function execute_request(request) {
         request.respond(
             this.iopubSocket,
             "pyout", {
-                execution_count: session.executionCount,
+                execution_count: this.executionCount,
                 data: session.result.mime,
                 metadata: {},
             }
@@ -136,7 +136,7 @@ function execute_request(request) {
             this.shellSocket,
             "execute_reply", {
                 status: "error",
-                execution_count: session.executionCount,
+                execution_count: this.executionCount,
                 ename: session.result.error.ename,
                 evalue: session.result.error.evalue,
                 traceback: session.result.error.traceback,
@@ -145,7 +145,7 @@ function execute_request(request) {
         request.respond(
             this.iopubSocket,
             "pyerr", {
-                execution_count: session.executionCount,
+                execution_count: this.executionCount,
                 ename: session.result.error.ename,
                 evalue: session.result.error.evalue,
                 traceback: session.result.error.traceback,

diff --git a/lib/handlers_v5.js b/lib/handlers_v5.js
@@ -120,11 +120,11 @@ function execute_request(request) {
     this.session.run(task);
 
     function beforeRun(session) {
-        session.executionCount++;
+        this.executionCount++;
         request.respond(
             this.iopubSocket,
             "execute_input", {
-                execution_count: session.executionCount,
+                execution_count: this.executionCount,
                 code: request.content.code,
             }
         );
@@ -137,7 +137,7 @@ function execute_request(request) {
             this.shellSocket,
             "execute_reply", {
                 status: "ok",
-                execution_count: session.executionCount,
+                execution_count: this.executionCount,
                 payload: [], // TODO(NR) not implemented,
                 user_expressions: {}, // TODO(NR) not implemented,
             }
@@ -146,7 +146,7 @@ function execute_request(request) {
         request.respond(
             this.iopubSocket,
             "execute_result", {
-                execution_count: session.executionCount,
+                execution_count: this.executionCount,
                 data: session.result.mime,
                 metadata: {},
             }
@@ -158,7 +158,7 @@ function execute_request(request) {
             this.shellSocket,
             "execute_reply", {
                 status: "error",
-                execution_count: session.executionCount,
+                execution_count: this.executionCount,
                 ename: session.result.error.ename,
                 evalue: session.result.error.evalue,
                 traceback: session.result.error.traceback,
@@ -167,7 +167,7 @@ function execute_request(request) {
         request.respond(
             this.iopubSocket,
             "error", {
-                execution_count: session.executionCount,
+                execution_count: this.executionCount,
                 ename: session.result.error.ename,
                 evalue: session.result.error.evalue,
                 traceback: session.result.error.traceback,
@@ -259,7 +259,7 @@ function inspect_request(request) {
     function onError(session) {
         var content = {
             status: "error",
-            execution_count: session.executionCount,
+            execution_count: this.executionCount,
             ename: session.result.error.ename,
             evalue: session.result.error.evalue,
             traceback: session.result.error.traceback,

diff --git a/lib/kernel.js b/lib/kernel.js
@@ -145,6 +145,12 @@ function Kernel(ipythonConfig, nelConfig, protocolVersion) {
      */
     this.session = new Session(nelConfig);
 
+    /**
+     * Number of visible execution requests
+     * @member {Number}
+     */
+    this.executionCount = 0;
+
     /**
      * Last execute request (to which stdin, stdout and stderr streams are sent)
      * @member {?module:jmp~Message}