Multiple client source sending feature. (#1957)

Whit this enhancement the debugger can able handle more than one source file across the new source wait mode.
This feature can be used by the python client with the --client-source [paths] switch.
The client will store every source path, when the debugger send a signal about the waiting status, then the client will send one file from the list.

JerryScript-DCO-1.0-Signed-off-by: Imre Kiss kissi.szeged@partner.samsung.com

jerry-core/api/jerry-debugger.c

@@ -121,7 +121,8 @@ jerry_debugger_cleanup (void)
  * Sets whether the engine should wait and run a source.
  *
  * @return enum JERRY_DEBUGGER_SOURCE_RECEIVE_FAILED - if the source is not received
- *              JERRY_DEBUGGER_SOURCE_RECEIVED - if the source received
+ *              JERRY_DEBUGGER_SOURCE_RECEIVED - if a source code received
+ *              JERRY_DEBUGGER_SOURCE_END - the end of the source codes
  */
 jerry_debugger_wait_and_run_type_t
 jerry_debugger_wait_and_run_client_source (jerry_value_t *return_value) /**< [out] parse and run return value */
@@ -136,6 +137,9 @@ jerry_debugger_wait_and_run_client_source (jerry_value_t *return_value) /**< [ou
     jerry_debugger_uint8_data_t *client_source_data_p = NULL;
     jerry_debugger_wait_and_run_type_t ret_type = JERRY_DEBUGGER_SOURCE_RECEIVE_FAILED;
 
+    /* Notify the client about that the engine is waiting for a source. */
+    jerry_debugger_send_type (JERRY_DEBUGGER_WAIT_FOR_SOURCE);
+
     while (true)
     {
       if (jerry_debugger_receive (&client_source_data_p))
@@ -145,6 +149,13 @@ jerry_debugger_wait_and_run_client_source (jerry_value_t *return_value) /**< [ou
           break;
         }
 
+        /* Stop waiting for a new source file. */
+        if ((JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CLIENT_NO_SOURCE))
+        {
+          ret_type = JERRY_DEBUGGER_SOURCE_END;
+          break;
+        }
+
         /* The source arrived. */
         if (!(JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CLIENT_SOURCE_MODE))
         {

jerry-core/debugger/debugger.c

@@ -568,6 +568,25 @@ jerry_debugger_process_message (uint8_t *recv_buffer_p, /**< pointer the the rec
       return true;
     }
 
+    case JERRY_DEBUGGER_NO_MORE_SOURCES:
+    {
+      if (!(JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CLIENT_SOURCE_MODE))
+      {
+        jerry_port_log (JERRY_LOG_LEVEL_ERROR, "Not in client source mode\n");
+        jerry_debugger_close_connection ();
+        return false;
+      }
+
+      JERRY_DEBUGGER_CHECK_PACKET_SIZE (jerry_debugger_receive_type_t);
+
+      JERRY_CONTEXT (debugger_flags) = (uint8_t) (JERRY_CONTEXT (debugger_flags) & ~JERRY_DEBUGGER_CLIENT_SOURCE_MODE);
+      JERRY_CONTEXT (debugger_flags) = (uint8_t) (JERRY_CONTEXT (debugger_flags) | JERRY_DEBUGGER_CLIENT_NO_SOURCE);
+
+      *resume_exec_p = true;
+
+      return true;
+    }
+
     default:
     {
       jerry_port_log (JERRY_LOG_LEVEL_ERROR, "Unexpected message.");

jerry-core/debugger/debugger.h

@@ -89,6 +89,7 @@ typedef enum
   JERRY_DEBUGGER_VM_IGNORE = 1u << 3, /**< ignore all breakpoints */
   JERRY_DEBUGGER_VM_IGNORE_EXCEPTION = 1u << 4, /**< debugger stop at an exception */
   JERRY_DEBUGGER_CLIENT_SOURCE_MODE = 1u << 5, /**< debugger waiting for client code */
+  JERRY_DEBUGGER_CLIENT_NO_SOURCE = 1u << 6, /**< debugger leaving the client source loop */
 } jerry_debugger_flags_t;
 
 /**
@@ -119,6 +120,7 @@ typedef enum
   JERRY_DEBUGGER_BACKTRACE_END = 20, /**< last backtrace data */
   JERRY_DEBUGGER_EVAL_RESULT = 21, /**< eval result */
   JERRY_DEBUGGER_EVAL_RESULT_END = 22, /**< last part of eval result */
+  JERRY_DEBUGGER_WAIT_FOR_SOURCE = 23, /**< engine waiting for a source code */
 
   /* Messages sent by the client to server. */
 
@@ -130,16 +132,17 @@ typedef enum
   JERRY_DEBUGGER_STOP = 5, /**< stop execution */
   JERRY_DEBUGGER_CLIENT_SOURCE = 6, /**< first message of client source */
   JERRY_DEBUGGER_CLIENT_SOURCE_PART = 7, /**< next message of client source */
+  JERRY_DEBUGGER_NO_MORE_SOURCES = 8, /**< no more sources notification */
   /* The following messages are only available in breakpoint
    * mode and they switch the engine to run mode. */
-  JERRY_DEBUGGER_CONTINUE = 8, /**< continue execution */
-  JERRY_DEBUGGER_STEP = 9, /**< next breakpoint, step into functions */
-  JERRY_DEBUGGER_NEXT = 10, /**< next breakpoint in the same context */
+  JERRY_DEBUGGER_CONTINUE = 9, /**< continue execution */
+  JERRY_DEBUGGER_STEP = 10, /**< next breakpoint, step into functions */
+  JERRY_DEBUGGER_NEXT = 11, /**< next breakpoint in the same context */
   /* The following messages are only available in breakpoint
    * mode and this mode is kept after the message is processed. */
-  JERRY_DEBUGGER_GET_BACKTRACE = 11, /**< get backtrace */
-  JERRY_DEBUGGER_EVAL = 12, /**< first message of evaluating a string */
-  JERRY_DEBUGGER_EVAL_PART = 13, /**< next message of evaluating a string */
+  JERRY_DEBUGGER_GET_BACKTRACE = 12, /**< get backtrace */
+  JERRY_DEBUGGER_EVAL = 13, /**< first message of evaluating a string */
+  JERRY_DEBUGGER_EVAL_PART = 14, /**< next message of evaluating a string */
 } jerry_debugger_header_type_t;
 
 /**
@@ -308,7 +311,6 @@ typedef struct
   uint8_t eval_size[sizeof (uint32_t)]; /**< total size of the message */
 } jerry_debugger_receive_eval_first_t;
 
-
 /**
  * Incoming message: first message of client source.
  */

jerry-core/include/jerryscript-debugger.h

@@ -33,7 +33,8 @@ extern "C"
 typedef enum
 {
   JERRY_DEBUGGER_SOURCE_RECEIVE_FAILED = 0, /**< source is not received */
-  JERRY_DEBUGGER_SOURCE_RECEIVED = 1, /**< the source has been received */
+  JERRY_DEBUGGER_SOURCE_RECEIVED = 1, /**< a source has been received */
+  JERRY_DEBUGGER_SOURCE_END = 2, /**< the end of the sources signal received */
 } jerry_debugger_wait_and_run_type_t;
 
 /**