Multicore/use addrmap hash table for marshaling by shakthimaan · Pull Request #1 · shakthimaan/ocaml

shakthimaan · 2020-01-27T08:43:40Z

No description provided.

shakthimaan · 2020-01-27T08:49:17Z

runtime/extern.c

      uintnat sz_32, sz_64;
      char * size_header;
-      char const * ident = Custom_ops_val(v)->identifier;
+      char * ident = Custom_ops_val(v)->identifier;


Check use of const from trunk.

Fixed in 3d07255.

shakthimaan · 2020-01-27T08:51:02Z

runtime/caml/misc.h

 #endif

+#ifndef CAML_AVOID_CONFLICTS
+#define Assert CAMLassert


Change all usage of Assert to CAMLassert.

Fixed in 5f4ec29.

shakthimaan · 2020-01-27T08:52:02Z

runtime/extern.c

-          caml_fatal_error(
+          caml_fatal_error_arg(
            "output_value: incorrect fixed sizes specified by %s",
            ident);


Use caml_fatal_error.

Fixed in ffc6c50

shakthimaan · 2020-01-27T08:53:25Z

runtime/extern.c

  extern_ptr[0] = code;
-  store16(extern_ptr + 1, (int) val);
+  store16(extern_ptr + 1, val);
  extern_ptr += 3;


Re-add (int) type cast.

Fixed in af82c91.

shakthimaan · 2020-01-27T08:55:19Z

runtime/extern.c

    } else
      writecode32(CODE_INT32, n);
    goto next_item;
-  }


Re-add Is_in_value_area and caml_extern_allow_out_of_heap.

Fixed in 066b486.

shakthimaan · 2020-01-27T08:59:10Z

runtime/extern.c

    /* Check if already seen */
-    if (Color_hd(hd) == Caml_blue) {
-      uintnat d = obj_counter - (uintnat) Field(v, 0);
+    if (extern_flags & NO_SHARING) {


Why NO_SHARING? Only else case should always happen.

Fixed in 09391c5.

shakthimaan · 2020-01-27T09:00:31Z

runtime/extern.c

    case Abstract_tag:
      extern_invalid_argument("output_value: abstract value (Abstract)");
      break;
+    case Closure_tag:


Remove Closure_tag.

Fixed in 2dfe33a.

shakthimaan · 2020-01-27T09:01:35Z

runtime/extern.c

        sp++;
        if (sp >= extern_stack_limit) sp = extern_resize_stack(sp);
-        sp->v = &Field(v,1);
+        sp->v = Op_val(v) + 1;


Use &Field(v, 1);

Fixed in db97dab.

shakthimaan · 2020-01-27T09:02:10Z

runtime/extern.c

      v = field0;
      continue;
    }
-    }


Retain the else if.

This is only an indentation fix.

shakthimaan · 2020-01-27T09:04:47Z

runtime/extern.c

@@ -750,7 +668,30 @@ CAMLprim value caml_output_value_to_bytes(value v, value flags)

 CAMLprim value caml_output_value_to_string(value v, value flags)
 {


Re-use caml_output_value_to_bytes.

Fixed in 7ef0a4c.

shakthimaan · 2020-01-27T09:05:23Z

runtime/extern.c

  res += header_len;
  for (blk = extern_output_first; blk != NULL; blk = blk->next) {
-    intnat n = blk->end - blk->data;
+    int n = blk->end - blk->data;


Type should be intnat.

Fixed in af82c91.

shakthimaan · 2020-01-27T09:05:38Z

runtime/misc.c

  abort();
 }

+CAMLexport void caml_fatal_error_arg (const char *fmt, const char *arg)


Can be removed.

Fixed in ffc6c50.

This job did actually do two different things: 1. Check that the compiler can be built without the world.opt target 2. Run sanitizers This commit thus splits the extra-checks job into two separate ones that are defined as Jenkins pipeline jobs named sanitizers and step-by-step-build.

shakthimaan added 9 commits January 19, 2020 19:50

Added runtime/caml/addrmap.h

0066e70

Add and compile runtime/addrmap.c

e7f0fae

Remove extern_replay_trail & update extern_* with caml_addrmap_clear

9721fee

Remove int typecast in extern.c:writecode16() function

2261e8f

Replace trail_{entry, block} with caml_addrmap_* functions

c758320

Update caml_output_value_to_{string, malloc} functions

93a2318

Add Closure_tag case in extern.c with caml_failwith

08fabc8

Re-add caml_output_value_to_bytes ()

f4a5d35

Add copyright notice and fix 80 column width alignment

dc16a0f

shakthimaan commented Jan 27, 2020

View reviewed changes

shakthimaan added 9 commits February 2, 2020 10:36

Use CAMLassert instead of Assert

5f4ec29

Retain type cast from OCaml trunk over Multicore OCaml

af82c91

Use Field over Op_val

db97dab

Remove Closure_tag case in extern.c

2dfe33a

Use only camly_fatal_error

ffc6c50

Re-instantiate const for char * ident in extern.c

3d07255

Re-instantiate the if check for external heap

066b486

Explicitly initialize output_location

09391c5

Specify caml_output_value_to_string using caml_output_value_to_bytes

7ef0a4c

shakthimaan added 15 commits February 3, 2020 15:25

Re-instantiate code_fragment to handle closures

b99f375

Re-instantiate char const for *identifier in custom.h

777a491

Restore compatibility for older MSVC

79ac103

Updated Changes file

4826c96

Use CAML_INTERNALS as suggested by @dra27 and trim spaces

b8c1955

define CAML_INTERNALS in addrmap.c

06f5cac

Added caml_addrmap_initialize function

884a25b

Use large memory and key in addrmap

d7eed00

Remove unused code

2502f03

Use caml_init_intern_addrmap_size

2f56371

Partial compilation with ocamlrun fail

314a36e

Use Init_intern_addrmap_def

105d4d9

Update shift and mask in resize logic

fd2a5b5

Use load factor 0.9

354171d

Remove unused code in addrmap.h

342dd3c

shakthimaan pushed a commit that referenced this pull request Sep 22, 2020

Use a pipeline to define the bootstrap Jenkins job, take #1

d0d8ace

shakthimaan pushed a commit that referenced this pull request Sep 22, 2020

Define Inria CI's Risc-V job as a Jenkins pipeline, take #1

5cdc807

shakthimaan pushed a commit that referenced this pull request Sep 22, 2020

Define Inria CI's other-configs job as a Jenkins pipeline, take #1

b1ffaf6

		@@ -750,7 +668,30 @@ CAMLprim value caml_output_value_to_bytes(value v, value flags)

		CAMLprim value caml_output_value_to_string(value v, value flags)
		{

Comments

Conversation

shakthimaan commented Jan 27, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

shakthimaan Feb 3, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

shakthimaan Feb 3, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

shakthimaan Feb 2, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

shakthimaan Feb 3, 2020 •

edited

Loading

shakthimaan Feb 3, 2020 •

edited

Loading

shakthimaan Feb 2, 2020 •

edited

Loading