On Wednesday, September 11, 2013 7:46:06 AM UTC-7, ZyX wrote:
> On Sep 11, 2013 1:27 PM, "Thomas" <wiene...@googlemail.com> wrote:
>
> >
>
> > On 11 September 2013 00:18, Nikolay Pavlov <zyx...@gmail.com> wrote:
>
> >>
>
> >> Why do you keep calling it async?
>
> >
>
> > Referring to the introduction to asynchronous programming linked below, the
> > patch is an almost asynchronous feature, or at least a completition of the
> > already existing asynchronous features of vim. With all the
> > "autocmd-events" we already have the posibillity to run code asynchronous.
>
>
> > Anyway asynchronous doesn't mean threaded, as far as I know and referring
> > again to the link. That a two different concepts (which you can combine if
> > you want).
>
> >
>
> > http://cs.brown.edu/courses/cs168/f12/handouts/async.pdf
>
> Now please show how you can run one sequence of commands interleaved with the
> other with this patch. Function that runs with given interval blocks
> everything until it completes, same for autocommands. You cannot say you
> implement preemptive multitasking if you have to wait for one task to
> complete before starting the other. It is not async feature.
>
>
> You can, of course, do some hacks with saving a state, exiting and resuming,
> but you will then be forced to *emulate* preemption without any support from
> vim. I used to have some simple emulation even without such patch.
>
>
> Note though that I would really like it merged. But not with the current name.
>
> > --
>
> > --
>
> > You received this message from the "vim_dev" maillist.
>
> > Do not top-post! Type your reply below the text you are replying to.
>
> > For more information, visit http://www.vim.org/maillist.php
>
> >
>
> > ---
>
> > You received this message because you are subscribed to the Google Groups
> > "vim_dev" group.
>
> > To unsubscribe from this group and stop receiving emails from it, send an
> > email to vim_dev+u...@googlegroups.com.
>
> > For more options, visit https://groups.google.com/groups/opt_out.
ZyX,
The new patch addresses your criticism apart from changing the name. I believe
we obey Vim code conventions everywhere. We have also implemented a
monotonically increasing timer for unix and osx which are the only two OSes we
have on hand. Otherwise, we fall back to gettimeofday. Async is only #defined
if gettimeofday exists.
Bram,
We now use long longs for keeping track of the timers. We have also documented
the new functions and some of their limitations.
Please let us know if you have further feedback.
-Matt
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
>From b297f29ffcf1ba8ce2c865744d30da4bdad61c3a Mon Sep 17 00:00:00 2001
From: Geoff Greer <ge...@greer.fm>
Date: Tue, 10 Sep 2013 03:54:58 -0700
Subject: [PATCH] Add asynchronous functions to Vim: settimeout, setinterval,
and canceltimeout.
---
Filelist | 2 +
runtime/doc/eval.txt | 45 ++++++++++++++++++++-
runtime/doc/options.txt | 11 ++++++
runtime/doc/tags | 5 +++
src/Makefile | 8 ++++
src/async.c | 88 +++++++++++++++++++++++++++++++++++++++++
src/eval.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++++
src/feature.h | 7 ++++
src/globals.h | 5 +++
src/gui.c | 30 ++++++++------
src/option.c | 8 ++++
src/option.h | 3 ++
src/os_macosx.m | 16 ++++++++
src/os_unix.c | 40 +++++++++++++++++--
src/proto.h | 4 ++
src/proto/async.pro | 5 +++
src/proto/os_unix.pro | 1 +
src/structs.h | 14 +++++++
src/version.c | 5 +++
19 files changed, 382 insertions(+), 17 deletions(-)
create mode 100644 src/async.c
create mode 100644 src/proto/async.pro
diff --git a/Filelist b/Filelist
index b324933..7f7d62e 100644
--- a/Filelist
+++ b/Filelist
@@ -7,6 +7,7 @@ SRC_ALL = \
src/arabic.c \
src/arabic.h \
src/ascii.h \
+ src/async.c \
src/blowfish.c \
src/buffer.c \
src/charset.c \
@@ -94,6 +95,7 @@ SRC_ALL = \
src/testdir/python_after/*.py \
src/testdir/python_before/*.py \
src/proto.h \
+ src/proto/async.pro \
src/proto/blowfish.pro \
src/proto/buffer.pro \
src/proto/charset.pro \
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 60b01a8..a0dd86a 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt* For Vim version 7.4. Last change: 2013 Aug 24
+*eval.txt* For Vim version 7.4. Last change: 2013 Sep 10
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1926,6 +1926,7 @@ server2client( {clientid}, {string})
serverlist() String get a list of available servers
setbufvar( {expr}, {varname}, {val}) set {varname} in buffer {expr} to {val}
setcmdpos( {pos}) Number set cursor position in command-line
+setinterval( {nr},{string}) Number evaluate the expression {string} every {nr} milliseconds
setline( {lnum}, {line}) Number set line {lnum} to {line}
setloclist( {nr}, {list}[, {action}])
Number modify location list using {list}
@@ -1936,6 +1937,7 @@ setreg( {n}, {v}[, {opt}]) Number set register to value and type
settabvar( {nr}, {varname}, {val}) set {varname} in tab page {nr} to {val}
settabwinvar( {tabnr}, {winnr}, {varname}, {val}) set {varname} in window
{winnr} in tab page {tabnr} to {val}
+settimeout( {nr}, {string}) Number evaluate the expression {string} after {nr} milliseconds
setwinvar( {nr}, {varname}, {val}) set {varname} in window {nr} to {val}
sha256( {string}) String SHA256 checksum of {string}
shellescape( {string} [, {special}])
@@ -2281,6 +2283,15 @@ call({func}, {arglist} [, {dict}]) *call()* *E699*
{dict} is for functions with the "dict" attribute. It will be
used to set the local variable "self". |Dictionary-function|
+canceltimeout({nr}) *canceltimeout()*
+ Cancel the timeout or interval with id, {nr}, preventing it
+ from every firing.
+ Also see |settimeout()| and |setinterval()|.
+ {only available when compiled with the |+async| feature}
+ Examples: >
+ let timeout_id = settimeout(5000, 'echo(2)')
+ echo canceltimeout(timeout_id)
+
ceil({expr}) *ceil()*
Return the smallest integral value greater than or equal to
{expr} as a |Float| (round up).
@@ -5187,6 +5198,23 @@ setcmdpos({pos}) *setcmdpos()*
Returns 0 when successful, 1 when not editing the command
line.
+setinterval({nr}, {string}) *setinterval()*
+ Immediately returns an interval id and evaluate the expression,
+ {string}, every {nr} milliseconds. Intervals do not pile up.
+ The timer's resolution defaults to 100ms and can be changed by
+ setting |ticktime|. Intervals can be canceled by calling
+ |canceltimeout({interval_id})|.
+ NOTE: Vim is single-threaded and all expressions are run within
+ the main thread. Therefore, expressions should return control
+ flow within a short amount of time.
+ Also see |settimeout()| and |canceltimeout()|.
+ {only available when compiled with the |+async| feature}
+ Examples: >
+ :call setinterval(1000, "call echo(2)")
+< 2
+ 2
+ 2
+
setline({lnum}, {text}) *setline()*
Set line {lnum} of the current buffer to {text}. To insert
lines use |append()|.
@@ -5356,6 +5384,21 @@ settabwinvar({tabnr}, {winnr}, {varname}, {val}) *settabwinvar()*
:call settabwinvar(3, 2, "myvar", "foobar")
< This function is not available in the |sandbox|.
+settimeout({nr}, {string}) *settimeout()*
+ Immediately returns an interval id and evaluate the expression,
+ {string}, once after {nr} milliseconds. The timer's
+ resolution defaults to 100ms and can be changed by setting
+ |ticktime|. Timeouts can be canceled by calling
+ |canceltimeout({interval_id})|.
+ NOTE: Vim is single-threaded and all expressions are run within
+ the main thread. Therefore, expressions should return control
+ flow within a short amount of time.
+ Also see |setinterval()| and |canceltimeout()|.
+ {only available when compiled with the |+async| feature}
+ Examples: >
+ :call settimeout(1000, "call echo(2)")
+< 2
+
setwinvar({nr}, {varname}, {val}) *setwinvar()*
Like |settabwinvar()| for the current tab page.
Examples: >
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 0688fcc..e7174ff 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -7253,6 +7253,17 @@ A jump table for the options with a short description can be found at |Q_op|.
uses another default.
Backticks cannot be used in this option for security reasons.
+ *'ticktime'* *'tt'*
+'ticktime' 'tt' number (default 100)
+ global
+ {not in Vi}
+ This is the resolution for all timers set with |setinterval()| and
+ |settimeout()|. Decreasing this number will make the timers
+ more accurate but will also make Vim less efficient. To globally
+ disable all timers for debugging, set |ticktime| to -1.
+ Also see |setinterval()|, |settimeout()|, and |canceltimeout()|.
+ {only available when compiled with the |+async| feature}
+
*'tildeop'* *'top'* *'notildeop'* *'notop'*
'tildeop' 'top' boolean (default off)
global
diff --git a/runtime/doc/tags b/runtime/doc/tags
index f32ea6f..3e8e0f7 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -1014,6 +1014,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME*
'tf' options.txt /*'tf'*
'tgst' options.txt /*'tgst'*
'thesaurus' options.txt /*'thesaurus'*
+'ticktime' options.txt /*'ticktime'*
'tildeop' options.txt /*'tildeop'*
'timeout' options.txt /*'timeout'*
'timeoutlen' options.txt /*'timeoutlen'*
@@ -1032,6 +1033,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME*
'ts' options.txt /*'ts'*
'tsl' options.txt /*'tsl'*
'tsr' options.txt /*'tsr'*
+'tt' options.txt /*'tt'*
'ttimeout' options.txt /*'ttimeout'*
'ttimeoutlen' options.txt /*'ttimeoutlen'*
'ttm' options.txt /*'ttm'*
@@ -4987,6 +4989,7 @@ c_Up cmdline.txt /*c_Up*
c_digraph cmdline.txt /*c_digraph*
c_wildchar cmdline.txt /*c_wildchar*
call() eval.txt /*call()*
+canceltimeout() eval.txt /*canceltimeout()*
carriage-return intro.txt /*carriage-return*
case change.txt /*case*
catch-all eval.txt /*catch-all*
@@ -7653,6 +7656,7 @@ set-option options.txt /*set-option*
set-spc-auto spell.txt /*set-spc-auto*
setbufvar() eval.txt /*setbufvar()*
setcmdpos() eval.txt /*setcmdpos()*
+setinterval() eval.txt /*setinterval()*
setline() eval.txt /*setline()*
setloclist() eval.txt /*setloclist()*
setmatches() eval.txt /*setmatches()*
@@ -7661,6 +7665,7 @@ setqflist() eval.txt /*setqflist()*
setreg() eval.txt /*setreg()*
settabvar() eval.txt /*settabvar()*
settabwinvar() eval.txt /*settabwinvar()*
+settimeout() eval.txt /*settimeout()*
setting-guifont gui.txt /*setting-guifont*
setting-guitablabel tabpage.txt /*setting-guitablabel*
setting-tabline tabpage.txt /*setting-tabline*
diff --git a/src/Makefile b/src/Makefile
index c830378..43e04bd 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1424,6 +1424,7 @@ DEST_MAN_RU_U = $(DEST_MAN_TOP)/ru.UTF-8$(MAN1DIR)
TAGS_INCL = *.h
BASIC_SRC = \
+ async.c \
blowfish.c \
buffer.c \
charset.c \
@@ -1513,6 +1514,7 @@ LINT_SRC = $(BASIC_SRC) $(GUI_SRC) $(HANGULIN_SRC) $(PYTHON_SRC) $(PYTHON3_SRC)
#LINT_SRC = $(BASIC_SRC)
OBJ_COMMON = \
+ objects/async.o \
objects/buffer.o \
objects/blowfish.o \
objects/charset.o \
@@ -2484,6 +2486,9 @@ auto/pathdef.c: Makefile auto/config.mk
objects:
mkdir objects
+objects/async.o: async.c
+ $(CCC) -o $@ async.c
+
objects/blowfish.o: blowfish.c
$(CCC) -o $@ blowfish.c
@@ -2830,6 +2835,9 @@ $(APPDIR)/Contents:
###############################################################################
### (automatically generated by 'make depend')
### Dependencies:
+objects/async.o: async.c vim.h auto/config.h feature.h os_unix.h os_mac.h ascii.h \
+ keymap.h term.h macros.h option.h structs.h regexp.h gui.h ex_cmds.h \
+ proto.h proto/async.pro globals.h farsi.h arabic.h
objects/blowfish.o: blowfish.c vim.h auto/config.h feature.h os_unix.h \
auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
diff --git a/src/async.c b/src/async.c
new file mode 100644
index 0000000..f8cab24
--- /dev/null
+++ b/src/async.c
@@ -0,0 +1,88 @@
+#include "vim.h"
+
+#ifdef FEAT_ASYNC
+
+/*
+ * Return monotonic time, if available. Fall back to gettimeofday otherwise.
+ */
+ unsigned long long
+get_monotonic_time(void)
+{
+ unsigned long long tm;
+#ifdef MCH_MONOTONIC_TIME
+ tm = mch_monotonic_time();
+#else
+ struct timeval now;
+ gettimeofday(&now, NULL);
+ tm = now.tv_sec * 1000 + now.tv_usec/1000;
+#endif
+ return tm;
+}
+
+
+/*
+ * Insert a new timeout into the timeout linked list.
+ * This is called by set_timeout() in eval.c
+ */
+ void
+insert_timeout(to)
+ timeout_T *to; /* timeout to insert */
+{
+ timeout_T *cur = timeouts;
+ timeout_T *prev = NULL;
+
+ if (timeouts == NULL) {
+ timeouts = to;
+ return;
+ }
+ while (cur != NULL)
+ {
+ if (cur->tm > to->tm)
+ {
+ if (prev)
+ {
+ prev->next = to;
+ }
+ else
+ {
+ timeouts = to;
+ }
+ to->next = cur;
+ return;
+ }
+ prev = cur;
+ cur = cur->next;
+ }
+ prev->next = to;
+ to->next = NULL;
+}
+
+/*
+ * Execute timeouts that are due.
+ * This is called every ticktime milliseconds by low-level input functions.
+ */
+ void
+call_timeouts(void)
+{
+ unsigned long long tm = get_monotonic_time();
+ timeout_T *tmp;
+
+ while (timeouts != NULL && timeouts->tm < tm)
+ {
+ do_cmdline_cmd(timeouts->cmd);
+ tmp = timeouts;
+ timeouts = timeouts->next;
+ if (tmp->interval == -1)
+ {
+ free(tmp->cmd);
+ free(tmp);
+ }
+ else
+ {
+ tmp->tm = tm + tmp->interval;
+ insert_timeout(tmp);
+ }
+ }
+}
+
+#endif
diff --git a/src/eval.c b/src/eval.c
index 807efe2..7259ba0 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -674,6 +674,11 @@ struct funccall_S
static void f_setloclist __ARGS((typval_T *argvars, typval_T *rettv));
static void f_setmatches __ARGS((typval_T *argvars, typval_T *rettv));
static void f_setpos __ARGS((typval_T *argvars, typval_T *rettv));
+#ifdef FEAT_ASYNC
+static void f_canceltimeout __ARGS((typval_T *argvars, typval_T *rettv));
+static void f_setinterval __ARGS((typval_T *argvars, typval_T *rettv));
+static void f_settimeout __ARGS((typval_T *argvars, typval_T *rettv));
+#endif
static void f_setqflist __ARGS((typval_T *argvars, typval_T *rettv));
static void f_setreg __ARGS((typval_T *argvars, typval_T *rettv));
static void f_settabvar __ARGS((typval_T *argvars, typval_T *rettv));
@@ -7861,6 +7866,9 @@ struct funccall_S
{"byte2line", 1, 1, f_byte2line},
{"byteidx", 2, 2, f_byteidx},
{"call", 2, 3, f_call},
+#ifdef FEAT_ASYNC
+ {"canceltimeout", 1, 1, f_canceltimeout},
+#endif
#ifdef FEAT_FLOAT
{"ceil", 1, 1, f_ceil},
#endif
@@ -8059,6 +8067,9 @@ struct funccall_S
{"serverlist", 0, 0, f_serverlist},
{"setbufvar", 3, 3, f_setbufvar},
{"setcmdpos", 1, 1, f_setcmdpos},
+#ifdef FEAT_ASYNC
+ {"setinterval", 2, 2, f_setinterval},
+#endif
{"setline", 2, 2, f_setline},
{"setloclist", 2, 3, f_setloclist},
{"setmatches", 1, 1, f_setmatches},
@@ -8067,6 +8078,9 @@ struct funccall_S
{"setreg", 2, 3, f_setreg},
{"settabvar", 3, 3, f_settabvar},
{"settabwinvar", 4, 4, f_settabwinvar},
+#ifdef FEAT_ASYNC
+ {"settimeout", 2, 2, f_settimeout},
+#endif
{"setwinvar", 3, 3, f_setwinvar},
#ifdef FEAT_CRYPT
{"sha256", 1, 1, f_sha256},
@@ -12416,6 +12430,9 @@ struct funccall_S
#ifdef FEAT_RELTIME
"reltime",
#endif
+#ifdef FEAT_ASYNC
+ "async",
+#endif
#ifdef FEAT_QUICKFIX
"quickfix",
#endif
@@ -16589,6 +16606,91 @@ struct funccall_S
#endif
}
+#ifdef FEAT_ASYNC
+static int timeout_id = 0;
+
+ static void
+set_timeout(argvars, rettv, interval)
+ typval_T *argvars;
+ typval_T *rettv;
+ int interval;
+{
+ long i = get_tv_number(&argvars[0]);
+ char_u *cmd = get_tv_string(&argvars[1]);
+ rettv->v_type = VAR_NUMBER;
+
+ if (i < 0) {
+ rettv->vval.v_number = -1;
+ EMSG2(_(e_invarg2), "Interval cannot be negative.");
+ return;
+ }
+
+ timeout_T *to = malloc(sizeof(timeout_T));
+ to->id = timeout_id++;
+ to->tm = get_monotonic_time() + i;
+ rettv->vval.v_number = to->id;
+ to->cmd = (char_u*)strdup((char*)cmd);
+ to->interval = interval ? i : -1;
+ to->next = NULL;
+
+ insert_timeout(to);
+}
+
+ static void
+f_setinterval(argvars, rettv)
+ typval_T *argvars;
+ typval_T *rettv;
+{
+ set_timeout(argvars, rettv, TRUE);
+}
+
+ static void
+f_settimeout(argvars, rettv)
+ typval_T *argvars;
+ typval_T *rettv;
+{
+ set_timeout(argvars, rettv, FALSE);
+}
+
+ static void
+f_canceltimeout(argvars, rettv)
+ typval_T *argvars;
+ typval_T *rettv;
+{
+ long id = get_tv_number(&argvars[0]);
+ if (id < 0) {
+ rettv->vval.v_number = -1;
+ EMSG2(_(e_invarg2), "Timeout id cannot be negative.");
+ return;
+ }
+
+ timeout_T *tmp = timeouts;
+ timeout_T *prev = NULL;
+ timeout_T *next;
+ while (tmp != NULL) {
+ next = tmp->next;
+ if (tmp->id == id) {
+ if (prev) {
+ prev->next = next;
+ } else {
+ timeouts = next;
+ }
+ free(tmp->cmd);
+ free(tmp);
+ rettv->vval.v_number = 0;
+ rettv->v_type = VAR_NUMBER;
+ return;
+ } else {
+ prev = tmp;
+ }
+ tmp = next;
+ }
+ rettv->vval.v_number = 1;
+ rettv->v_type = VAR_NUMBER;
+ EMSG2(_(e_invarg2), "Timeout id not found.");
+}
+#endif
+
/*
* "setpos()" function
*/
diff --git a/src/feature.h b/src/feature.h
index d4b9aea..fea8459 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -467,6 +467,13 @@
#endif
/*
+ * +async settimeout and setinterval functions.
+ */
+#if defined(FEAT_NORMAL) && defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)
+# define FEAT_ASYNC
+#endif
+
+/*
* +diff Displaying diffs in a nice way.
* Requires +windows and +autocmd.
*/
diff --git a/src/globals.h b/src/globals.h
index feb1dd4..615cce9 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1626,3 +1626,8 @@
#ifdef FEAT_ARABIC
# include "arabic.h"
#endif
+
+/*
+ * For keeping track of timeouts.
+ */
+EXTERN timeout_T *timeouts INIT(= NULL);
diff --git a/src/gui.c b/src/gui.c
index b667ba3..a754709 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -2898,18 +2898,31 @@ enum {
gui_mch_start_blink();
retval = FAIL;
+
+ int i = 0;
+ while (i < p_ut) {
+#ifdef FEAT_ASYNC
+ retval = gui_mch_wait_for_chars(p_tt);
+ call_timeouts();
+ i += p_tt;
+#else
+ retval = gui_mch_wait_for_chars(p_ut);
+ i += p_ut;
+#endif
+ if (retval == OK) {
+ break;
+ }
+ }
+
+#ifdef FEAT_AUTOCMD
/*
* We may want to trigger the CursorHold event. First wait for
* 'updatetime' and if nothing is typed within that time put the
* K_CURSORHOLD key in the input buffer.
*/
- if (gui_mch_wait_for_chars(p_ut) == OK)
- retval = OK;
-#ifdef FEAT_AUTOCMD
- else if (trigger_cursorhold())
+ if (retval == FAIL && trigger_cursorhold())
{
char_u buf[3];
-
/* Put K_CURSORHOLD in the input buffer. */
buf[0] = CSI;
buf[1] = KS_EXTRA;
@@ -2920,13 +2933,6 @@ enum {
}
#endif
- if (retval == FAIL)
- {
- /* Blocking wait. */
- before_blocking();
- retval = gui_mch_wait_for_chars(-1L);
- }
-
gui_mch_stop_blink();
return retval;
}
diff --git a/src/option.c b/src/option.c
index bf65556..b78809f 100644
--- a/src/option.c
+++ b/src/option.c
@@ -2590,6 +2590,14 @@ struct vimoption
(char_u *)NULL, PV_NONE,
#endif
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+ {"ticktime", "tt", P_NUM|P_VI_DEF,
+#ifdef FEAT_ASYNC
+ (char_u *)&p_tt, PV_NONE,
+#else
+ (char_u *)NULL, PV_NONE,
+#endif
+ {(char_u *)100L, (char_u *)0L} SCRIPTID_INIT},
+
{"tildeop", "top", P_BOOL|P_VI_DEF|P_VIM,
(char_u *)&p_to, PV_NONE,
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
diff --git a/src/option.h b/src/option.h
index 167b562..ae2ba22 100644
--- a/src/option.h
+++ b/src/option.h
@@ -795,6 +795,9 @@
#ifdef FEAT_INS_EXPAND
EXTERN char_u *p_tsr; /* 'thesaurus' */
#endif
+#ifdef FEAT_ASYNC
+EXTERN long p_tt; /* 'ticktime' */
+#endif
EXTERN int p_ttimeout; /* 'ttimeout' */
EXTERN long p_ttm; /* 'ttimeoutlen' */
EXTERN int p_tbi; /* 'ttybuiltin' */
diff --git a/src/os_macosx.m b/src/os_macosx.m
index d919f63..1b8c5b5 100644
--- a/src/os_macosx.m
+++ b/src/os_macosx.m
@@ -23,6 +23,22 @@
#include "vim.h"
#import <Cocoa/Cocoa.h>
+#include <mach/mach.h>
+#include <mach/mach_time.h>
+
+
+#define MCH_MONOTONIC_TIME
+ unsigned long long
+mch_monotonic_time(void)
+{
+ mach_timebase_info_data_t info;
+
+ if (mach_timebase_info(&info) != KERN_SUCCESS)
+ abort();
+
+ return (mach_absolute_time() * info.numer / info.denom) / 1000000;
+}
+
/*
* Clipboard support for the console.
diff --git a/src/os_unix.c b/src/os_unix.c
index cc02653..bd2d6dc 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -892,6 +892,17 @@ catch_sigpwr SIGDEFARG(sigarg)
}
#endif
+#if !defined(MACOS_X_UNIX)
+#define MCH_MONOTONIC_TIME
+ unsigned long long
+mch_monotonic_time(void)
+{
+ struct timespec ts;
+ clock_gettime(CLOCK_MONOTONIC, &ts);
+ return ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
+}
+#endif
+
#ifdef SET_SIG_ALARM
/*
* signal function for alarm().
@@ -5057,7 +5068,7 @@ sigcont_handler SIGDEFARG(sigarg)
#ifdef FEAT_NETBEANS_INTG
int nb_fd = netbeans_filedesc();
#endif
-#if defined(FEAT_XCLIPBOARD) || defined(USE_XSMP) || defined(FEAT_MZSCHEME)
+#if defined(FEAT_XCLIPBOARD) || defined(USE_XSMP) || defined(FEAT_MZSCHEME) || defined(FEAT_ASYNC)
static int busy = FALSE;
/* May retry getting characters after an event was handled. */
@@ -5072,18 +5083,24 @@ sigcont_handler SIGDEFARG(sigarg)
if (msec > 0 && (
# ifdef FEAT_XCLIPBOARD
xterm_Shell != (Widget)0
-# if defined(USE_XSMP) || defined(FEAT_MZSCHEME)
+# if defined(USE_XSMP) || defined(FEAT_MZSCHEME) || defined(FEAT_ASYNC)
||
# endif
# endif
# ifdef USE_XSMP
xsmp_icefd != -1
-# ifdef FEAT_MZSCHEME
+# if defined(FEAT_MZSCHEME) || defined(FEAT_ASYNC)
||
# endif
# endif
# ifdef FEAT_MZSCHEME
(mzthreads_allowed() && p_mzq > 0)
+# ifdef FEAT_ASYNC
+ ||
+# endif
+# endif
+# ifdef FEAT_ASYNC
+ TRUE
# endif
))
gettimeofday(&start_tv, NULL);
@@ -5130,6 +5147,12 @@ sigcont_handler SIGDEFARG(sigarg)
mzquantum_used = TRUE;
}
# endif
+# ifdef FEAT_ASYNC
+ call_timeouts();
+ if (p_tt > 0 && (msec < 0 || msec > p_tt)) {
+ towait = p_tt;
+ }
+# endif
fds[0].fd = fd;
fds[0].events = POLLIN;
nfd = 1;
@@ -5257,6 +5280,12 @@ sigcont_handler SIGDEFARG(sigarg)
mzquantum_used = TRUE;
}
# endif
+# ifdef FEAT_ASYNC
+ call_timeouts();
+ if (p_tt > 0 && (msec < 0 || msec > p_tt)) {
+ towait = p_tt;
+ }
+# endif
# ifdef __EMX__
/* don't check for incoming chars if not in raw mode, because select()
* always returns TRUE then (in some version of emx.dll) */
@@ -5369,6 +5398,10 @@ sigcont_handler SIGDEFARG(sigarg)
/* loop if MzThreads must be scheduled and timeout occurred */
finished = FALSE;
# endif
+# ifdef FEAT_ASYNC
+ if (ret == 0 && msec > p_tt)
+ finished = FALSE;
+# endif
# ifdef FEAT_SNIFF
if (ret < 0 )
@@ -7367,5 +7400,4 @@ sig_sysmouse SIGDEFARG(sigarg)
0, 0,229, 0, 0, 0, 0,196, 0, 0, 0, 0,227,228, 0,233,
};
-
#endif
diff --git a/src/proto.h b/src/proto.h
index 191ecd8..135aff9 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -293,3 +293,7 @@
# define _PROTO_H
#endif
#endif /* !PROTO && !NOPROTO */
+
+#ifdef FEAT_ASYNC
+# include "async.pro"
+#endif
\ No newline at end of file
diff --git a/src/proto/async.pro b/src/proto/async.pro
new file mode 100644
index 0000000..006475f
--- /dev/null
+++ b/src/proto/async.pro
@@ -0,0 +1,5 @@
+/* async.c */
+unsigned long long get_monotonic_time __ARGS((void));
+void insert_timeout __ARGS((timeout_T *to));
+void call_timeouts __ARGS((void));
+/* vim: set ft=c : */
diff --git a/src/proto/os_unix.pro b/src/proto/os_unix.pro
index e4cad51..632179e 100644
--- a/src/proto/os_unix.pro
+++ b/src/proto/os_unix.pro
@@ -6,6 +6,7 @@ int mch_char_avail __ARGS((void));
long_u mch_total_mem __ARGS((int special));
void mch_delay __ARGS((long msec, int ignoreinput));
int mch_stackcheck __ARGS((char *p));
+unsigned long long mch_monotonic_time __ARGS((void));
void mch_startjmp __ARGS((void));
void mch_endjmp __ARGS((void));
void mch_didjmp __ARGS((void));
diff --git a/src/structs.h b/src/structs.h
index f74d218..8a0fb2d 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -2540,3 +2540,17 @@ struct VimMenu
UINT32_T state[8];
char_u buffer[64];
} context_sha256_T;
+
+#ifdef FEAT_ASYNC
+/*
+ * Used for async settimeout/interval.
+ */
+struct timeout_T {
+ int id; /* timeout/interval id */
+ int interval; /* interval period if interval, otherwise -1 */
+ unsigned long long tm; /* time to fire (epoch milliseconds) */
+ char_u *cmd; /* vim command to run */
+ struct timeout_T *next; /* pointer to next timeout in linked list */
+};
+typedef struct timeout_T timeout_T;
+#endif
diff --git a/src/version.c b/src/version.c
index ef3f9b1..f98a1b5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -77,6 +77,11 @@
#else
"-arabic",
#endif
+#ifdef FEAT_ASYNC
+ "+async",
+#else
+ "-async",
+#endif
#ifdef FEAT_AUTOCMD
"+autocmd",
#else
--
1.8.4
