Memory allocation fixes.

[perl4caml.git] / perl_c.c

diff --git a/perl_c.c b/perl_c.c
index dc5b93b..772bae2 100644 (file)
--- a/perl_c.c
+++ b/perl_c.c
@@ -1,6 +1,6 @@
 /* Interface to Perl from OCaml.
  * Copyright (C) 2003 Merjis Ltd.
- * $Id: perl_c.c,v 1.12 2003-11-19 16:28:22 rich Exp $
+ * $Id: perl_c.c,v 1.13 2003-12-11 17:41:52 rich Exp $
  */
 
 #include <stdio.h>
@@ -11,6 +11,7 @@
 
 #include <caml/alloc.h>
 #include <caml/callback.h>
+#include <caml/custom.h>
 #include <caml/fail.h>
 #include <caml/memory.h>
 #include <caml/mlvalues.h>
@@ -33,37 +34,29 @@ static PerlInterpreter *my_perl;
 /* Wrap up an arbitrary void pointer in an opaque OCaml object. */
 static value Val_voidptr (void *ptr);
 
+/* Wrap up an SV, AV or HV in a custom OCaml object which will decrement
+ * the reference count on finalization.
+ */
+static value Val_xv (SV *sv);
+
 /* Get the concrete value from an optional field. */
 static value unoption (value option, value deflt);
 
 /* Unwrap an arbitrary void pointer from an opaque OCaml object. */
 #define Voidptr_val(type,rv) ((type *) Field ((rv), 0))
 
+/* Unwrap a custom block. */
+#define Xv_val(rv) (*((void **)Data_custom_val(rv)))
+
 /* Hide Perl types in opaque OCaml objects. */
 #define Val_perl(pl) (Val_voidptr ((pl)))
 #define Perl_val(plv) (Voidptr_val (PerlInterpreter, (plv)))
-#define Val_sv(sv) (Val_voidptr ((sv)))
-#define Sv_val(svv) (Voidptr_val (SV, (svv)))
-#define Val_av(av) (Val_voidptr ((av)))
-#define Av_val(avv) (Voidptr_val (AV, (avv)))
-#define Val_hv(hv) (Val_voidptr ((hv)))
-#define Hv_val(hvv) (Voidptr_val (HV, (hvv)))
-
-CAMLprim value
-perl4caml_init (value unit)
-{
-  CAMLparam1 (unit);
-  PERL_SYS_INIT3 (NULL, NULL, NULL);
-  CAMLreturn (Val_unit);
-}
-
-CAMLprim value
-perl4caml_current_interpreter (value unit)
-{
-  CAMLparam1 (unit);
-  if (my_perl == 0) raise_not_found ();
-  CAMLreturn (Val_perl (my_perl));
-}
+#define Val_sv(sv) (Val_xv ((sv)))
+#define Sv_val(svv) ((SV *) Xv_val (svv))
+#define Val_av(av) (Val_xv ((SV *)(av)))
+#define Av_val(avv) ((AV *) Xv_val (avv))
+#define Val_hv(hv) (Val_xv ((SV *)(hv)))
+#define Hv_val(hvv) ((HV *) Xv_val (hvv))
 
 static void
 xs_init (pTHX)
@@ -75,61 +68,19 @@ xs_init (pTHX)
 }
 
 CAMLprim value
-perl4caml_create (value optargs, value unit)
+perl4caml_init (value unit)
 {
-  CAMLparam2 (optargs, unit);
-  CAMLlocal1 (args);
-  int argc, i;
-  char **argv;
-  static char *no_args[] = { "", "-w", "-e", "0" };
-
-  /* Arguments given? */
-  if (optargs == Val_int (0))  /* "None" */
-    {
-      argc = 4;
-      argv = no_args;
-    }
-  else                         /* "Some args" where args is a string array. */
-    {
-      args = Field (optargs, 0);
-      argc = Wosize_val (args);
-      argv = alloca (argc * sizeof (char *));
-      for (i = 0; i < argc; ++i) argv[i] = String_val (Field (args, i));
-    }
+  CAMLparam1 (unit);
+  int argc = 4;
+  static char *argv[] = { "", "-w", "-e", "0" };
 
+  PERL_SYS_INIT3 (NULL, NULL, NULL);
   my_perl = perl_alloc ();
   perl_construct (my_perl);
   PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
   perl_parse (my_perl, xs_init, argc, argv, NULL);
   /*perl_run (my_perl);*/
 
-  CAMLreturn (Val_perl (my_perl));
-}
-
-CAMLprim value
-perl4caml_destroy (value plv)
-{
-  CAMLparam1 (plv);
-  PerlInterpreter *pl = Perl_val (plv);
-
-  perl_destruct (pl);
-  perl_free (pl);
-
-  /* Current interpreter? */
-  if (my_perl == pl) my_perl = 0;
-
-  CAMLreturn (Val_unit);
-}
-
-CAMLprim value
-perl4caml_set_context (value plv)
-{
-  CAMLparam1 (plv);
-  PerlInterpreter *pl = Perl_val (plv);
-
-  PERL_SET_CONTEXT (pl);
-  my_perl = pl;
-
   CAMLreturn (Val_unit);
 }
 
@@ -701,10 +652,13 @@ perl4caml_call_array (value optsv, value optfnname, value arglist)
    */
   list = Val_int (0);
   for (i = 0; i < count; ++i) {
+    SV *sv;
+
     cons = alloc (2, 0);
     Field (cons, 1) = list;
     list = cons;
-    Field (cons, 0) = Val_sv (newSVsv (POPs));
+    sv = newSVsv (POPs);
+    Field (cons, 0) = Val_sv (sv);
   }
 
   /* Restore the stack. */
@@ -875,10 +829,13 @@ perl4caml_call_method_array (value ref, value name, value arglist)
    */
   list = Val_int (0);
   for (i = 0; i < count; ++i) {
+    SV *sv;
+
     cons = alloc (2, 0);
     Field (cons, 1) = list;
     list = cons;
-    Field (cons, 0) = Val_sv (newSVsv (POPs));
+    sv = newSVsv (POPs);
+    Field (cons, 0) = Val_sv (sv);
   }
 
   /* Restore the stack. */
@@ -1080,9 +1037,36 @@ perl4caml_call_class_method_void (value classname, value name, value arglist)
 static value
 Val_voidptr (void *ptr)
 {
-  value rv = alloc (1, Abstract_tag); /* XXX Is this correct? */
+  CAMLparam0 ();
+  CAMLlocal1 (rv);
+  rv = alloc (1, Abstract_tag);
   Field(rv, 0) = (value) ptr;
-  return rv;
+  CAMLreturn (rv);
+}
+
+static void
+xv_finalize (value v)
+{
+  SvREFCNT_dec ((SV *) Xv_val (v));
+}
+
+static struct custom_operations xv_custom_operations = {
+  "xv_custom_operations",
+  xv_finalize,
+  custom_compare_default,
+  custom_hash_default,
+  custom_serialize_default,
+  custom_deserialize_default
+};
+
+static value
+Val_xv (SV *sv)
+{
+  CAMLparam0 ();
+  CAMLlocal1 (rv);
+  rv = alloc_custom (&xv_custom_operations, sizeof (void *), 0, 1);
+  Xv_val (rv) = sv;
+  CAMLreturn (rv);
 }
 
 static value