patch 7.4.1541

Problem:    Missing job_info().
Solution:   Implement it.

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 5284293d46b1965c7b33b1dbf942409b849060cf..0bb4b83b2a4ae661b43fc0f5ea4604e2cb3092f4 100644 (file)
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -4527,6 +4527,8 @@ job_status({job})                                 *job_status()* *E916*
                If an exit callback was set with the "exit-cb" option and the
                job is now detected to be "dead" the callback will be invoked.
 
+               For more information see |job_info()|.
+
                {only available when compiled with the |+job| feature}
 
 job_stop({job} [, {how}])                                      *job_stop()*

diff --git a/src/channel.c b/src/channel.c
index 10f1bc8d185834536e11b77489556ec73e3b9496..8f70da2762ccc7576b6b48b0d0e16335e0ff640d 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -3725,6 +3725,40 @@ job_status(job_T *job)
     return result;
 }
 
+/*
+ * Implementation of job_info().
+ */
+    void
+job_info(job_T *job, dict_T *dict)
+{
+    dictitem_T *item;
+    varnumber_T        nr;
+
+    dict_add_nr_str(dict, "status", 0L, (char_u *)job_status(job));
+
+    item = dictitem_alloc((char_u *)"channel");
+    if (item == NULL)
+       return;
+    item->di_tv.v_lock = 0;
+    item->di_tv.v_type = VAR_CHANNEL;
+    item->di_tv.vval.v_channel = job->jv_channel;
+    if (job->jv_channel != NULL)
+       ++job->jv_channel->ch_refcount;
+    if (dict_add(dict, item) == FAIL)
+       dictitem_free(item);
+
+#ifdef UNIX
+    nr = job->jv_pid;
+#else
+    nr = job->jv_proc_info.dwProcessId;
+#endif
+    dict_add_nr_str(dict, "process", nr, NULL);
+
+    dict_add_nr_str(dict, "exitval", job->jv_exitval, NULL);
+    dict_add_nr_str(dict, "exit-cb", 0L, job->jv_exit_cb);
+    dict_add_nr_str(dict, "stoponexit", 0L, job->jv_stoponexit);
+}
+
     int
 job_stop(job_T *job, typval_T *argvars)
 {

diff --git a/src/eval.c b/src/eval.c
index 5807707f12edb9fb1fdb46e98d023e435c8c80e2..f4843e2c023828d11fa3781e61bd83604740c168 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -632,6 +632,7 @@ static void f_isnan(typval_T *argvars, typval_T *rettv);
 static void f_items(typval_T *argvars, typval_T *rettv);
 #ifdef FEAT_JOB_CHANNEL
 static void f_job_getchannel(typval_T *argvars, typval_T *rettv);
+static void f_job_info(typval_T *argvars, typval_T *rettv);
 static void f_job_setoptions(typval_T *argvars, typval_T *rettv);
 static void f_job_start(typval_T *argvars, typval_T *rettv);
 static void f_job_stop(typval_T *argvars, typval_T *rettv);
@@ -8208,6 +8209,7 @@ static struct fst
     {"items",          1, 1, f_items},
 #ifdef FEAT_JOB_CHANNEL
     {"job_getchannel", 1, 1, f_job_getchannel},
+    {"job_info",       1, 1, f_job_info},
     {"job_setoptions", 2, 2, f_job_setoptions},
     {"job_start",      1, 2, f_job_start},
     {"job_status",     1, 1, f_job_status},
@@ -14341,6 +14343,18 @@ f_job_getchannel(typval_T *argvars, typval_T *rettv)
     }
 }
 
+/*
+ * "job_info()" function
+ */
+    static void
+f_job_info(typval_T *argvars, typval_T *rettv)
+{
+    job_T      *job = get_job_arg(&argvars[0]);
+
+    if (job != NULL && rettv_dict_alloc(rettv) != FAIL)
+       job_info(job, rettv->vval.v_dict);
+}
+
 /*
  * "job_setoptions()" function
  */
@@ -14375,13 +14389,11 @@ f_job_start(typval_T *argvars, typval_T *rettv)
 f_job_status(typval_T *argvars, typval_T *rettv)
 {
     job_T      *job = get_job_arg(&argvars[0]);
-    char       *result;
 
     if (job != NULL)
     {
-       result = job_status(job);
        rettv->v_type = VAR_STRING;
-       rettv->vval.v_string = vim_strsave((char_u *)result);
+       rettv->vval.v_string = vim_strsave((char_u *)job_status(job));
     }
 }
 

diff --git a/src/proto/channel.pro b/src/proto/channel.pro
index e6e544687150bcca1fdebe4213eac3c1ee15988b..eb50b2f3bdceefdd1cd19f1ae8631f85fe471915 100644 (file)
--- a/src/proto/channel.pro
+++ b/src/proto/channel.pro
@@ -54,5 +54,6 @@ void job_stop_on_exit(void);
 void job_check_ended(void);
 job_T *job_start(typval_T *argvars);
 char *job_status(job_T *job);
+void job_info(job_T *job, dict_T *dict);
 int job_stop(job_T *job, typval_T *argvars);
 /* vim: set ft=c : */

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index a2d41252c3270f0bfdca10c8490f610ccf1ebc4d..ed62e66465167830322bf966370d68dcea8a9fe2 100644 (file)
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -479,6 +479,12 @@ func Test_raw_pipe()
   finally
     call job_stop(job)
   endtry
+
+  let s:job = job
+  call s:waitFor('"dead" == job_status(s:job)')
+  let info = job_info(job)
+  call assert_equal("dead", info.status)
+  call assert_equal("term", info.stoponexit)
 endfunc
 
 func Test_nl_pipe()
@@ -1051,6 +1057,7 @@ endfunc
 function s:test_exit_callback(port)
   call job_setoptions(s:job, {'exit-cb': 'MyExitCb'})
   let s:exit_job = s:job
+  call assert_equal('MyExitCb', job_info(s:job)['exit-cb'])
 endfunc
 
 func Test_exit_callback()
@@ -1069,6 +1076,7 @@ func Test_exit_callback()
     endfor
 
     call assert_equal('done', s:job_exit_ret)
+    call assert_equal('dead', job_info(s:exit_job).status)
     unlet s:exit_job
   endif
 endfunc

diff --git a/src/version.c b/src/version.c
index 3e802b58f11c54cc1dd746796335c4ee898b6a8a..ed48bb068f34646c9fa88f4e20c5c19fd89d4d51 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1541,
 /**/
     1540,
 /**/