some fixes in ivy-ocaml tag 1.2

1 files changed, 70 insertions, 0 deletions

diff --git a/trunk/civyloop.c b/trunk/civyloop.c
new file mode 100644
index 0000000..083b104
--- /dev/null
+++ b/trunk/civyloop.c
@@ -0,0 +1,70 @@
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <getopt.h>
+#include <Ivy/ivy.h>
+#include <Ivy/ivyloop.h>
+#include <Ivy/timer.h>
+#include <Ivy/version.h>
+#include <caml/mlvalues.h>
+#include <caml/fail.h>
+#include <caml/callback.h>
+#include <caml/memory.h>
+#include <caml/alloc.h>
+
+value ivy_mainLoop(value unit)
+{
+#if IVYMINOR_VERSION == 8
+  IvyMainLoop (NULL,NULL);
+#else
+  IvyMainLoop ();
+#endif
+  return Val_unit;
+}
+
+void timer_cb(TimerId id, void *data, unsigned long delta)
+{
+  value closure = *(value*)data;
+  callback(closure, Val_long(id));
+}
+
+value ivy_timerRepeatafter(value nb_ticks,value delay, value closure_name)
+{
+  value * closure = caml_named_value(String_val(closure_name));
+  TimerId id = TimerRepeatAfter(Int_val(nb_ticks), Int_val(delay), timer_cb, (void*)closure);
+  return Val_int(id);
+}
+
+/* Data associated to Channel callbacks is the couple of delete and
+read closures */
+
+extern void cb_delete_channel(void *delete_read);
+extern void cb_read_channel(Channel ch, IVY_HANDLE fd, void *closure);
+extern void cb_write_channel(Channel ch, IVY_HANDLE fd, void *closure);
+
+
+value ivy_channelSetUp(value fd, value closure_name)
+{
+  Channel c;
+  value * closure = caml_named_value(String_val(closure_name));
+
+#if IVYMINOR_VERSION == 8
+  c = IvyChannelAdd((IVY_HANDLE)Int_val(fd), (void*)closure, cb_delete_channel, cb_read_channel);
+#else
+  c = IvyChannelAdd((IVY_HANDLE)Int_val(fd), (void*)closure, cb_delete_channel, cb_read_channel, cb_write_channel);
+#endif
+  return Val_int(c);
+}
+
+value ivy_timerRemove(value t)
+{
+  TimerRemove((TimerId)Long_val(t));
+  return Val_unit;
+}
+
+
+value ivy_channelClose(value ch)
+{
+  IvyChannelRemove((Channel)Long_val(ch));
+  return Val_unit;
+}