add byte code compatiable dune build (#14)

Author: rvantonder

Makefile

@@ -1,150 +1,10 @@
-################################################################################
-#                            Variables to override                             #
-################################################################################
-
-INTERNAL_MODULES=src/stubs
-
-################################################################################
-#                              OS-dependent stuff                              #
-################################################################################
-
-ifeq ($(UNAME_S), Linux)
-  INOTIFY=src/third-party/inotify
-  INOTIFY_STUBS=$(INOTIFY)/inotify_stubs.c
-  FSNOTIFY=src/fsnotify_linux
-  FSNOTIFY_STUBS=
-  RT=rt
-  FRAMEWORKS=
-  EXE=
-endif
-ifeq ($(UNAME_S), Darwin)
-  INOTIFY=src/fsevents
-  INOTIFY_STUBS=$(INOTIFY)/fsevents_stubs.c
-  FSNOTIFY=src/fsnotify_darwin
-  FSNOTIFY_STUBS=
-  RT=
-  FRAMEWORKS=CoreServices CoreFoundation
-  EXE=
-endif
-ifeq ($(UNAME_S), Windows)
-  INOTIFY=
-  INOTIFY_STUBS=
-  FSNOTIFY=src/fsnotify_win
-  FSNOTIFY_STUBS=$(FSNOTIFY)/fsnotify_stubs.c
-  RT=
-  FRAMEWORKS=
-  EXE=.exe
-endif
-
-################################################################################
-#                                 Definitions                                  #
-################################################################################
-
-MODULES=\
-  src/third-party/lz4\
-  src/heap\
-  src/injection/default_injector\
-  src/procs\
-  src/socket\
-  src/third-party/hack_core\
-  src/utils\
-  src/utils/collections\
-  src/utils/disk\
-  src/utils/hh_json\
-  $(INOTIFY)\
-  $(FSNOTIFY)\
-  $(INTERNAL_MODULES)
-
-NATIVE_C_FILES=\
-  $(INOTIFY_STUBS)\
-  $(FSNOTIFY_STUBS)\
-  src/heap/hh_shared.c\
-  src/utils/files.c\
-  src/utils/handle_stubs.c\
-  src/utils/nproc.c\
-  src/utils/realpath.c\
-  src/utils/sysinfo.c\
-  src/utils/priorities.c\
-  $(sort $(wildcard src/third-party/lz4/*.c))
-
-NATIVE_LIBRARIES=\
-  hp\
-  pthread\
-  $(RT)
-
-################################################################################
-#                                    Rules                                     #
-################################################################################
-
-NATIVE_C_DIRS=$(patsubst %/,%,$(sort $(dir $(NATIVE_C_FILES))))
-ALL_HEADER_FILES=$(addprefix _build/,$(shell find $(NATIVE_C_DIRS) -name '*.h'))
-
-
-NATIVE_OBJECT_FILES=$(patsubst %.c,%.o,$(NATIVE_C_FILES))
-
-BUILT_OBJECT_FILES=$(addprefix _build/,$(NATIVE_OBJECT_FILES))
-NATIVE_LIB_OPTS=$(foreach lib, $(NATIVE_LIBRARIES),-cclib -l -cclib $(lib))
-
-LINKER_FLAGS=$(NATIVE_LIB_OPTS)
-
-INCLUDE_OPTS=$(foreach dir,$(MODULES),-I $(dir))
-
-BUILT_C_DIRS=$(addprefix _build/,$(NATIVE_C_DIRS))
-BUILT_C_FILES=$(addprefix _build/,$(NATIVE_C_FILES))
-CC_FLAGS=-DNO_SQLITE3
-CC_OPTS=$(foreach flag, $(CC_FLAGS), -ccopt $(flag))
-
-ALL_INCLUDE_PATHS=$(sort $(realpath $(BUILT_C_DIRS)))
-EXTRA_INCLUDE_OPTS=$(foreach dir, $(ALL_INCLUDE_PATHS),-ccopt -I -ccopt $(dir))
-
-%.h: $(subst _build/,,$@)
-	mkdir -p $(dir $@)
-	cp $(subst _build/,,$@) $@
-
 .PHONY: all
-all: libhp.a 
-	mkdir -p _build/default
-	cp static_libs/libhp.a _build/default/
-	dune build @install -j auto --profile dev
+all:
+	dune build -j auto --profile dev
 
-.PHONY: install
 install:
 	dune install
 
-.PHONY: generate_install
-generate_install:
-	find _build -type f  '('\
-		-name '*.a' -o\
-		-name '*.annot' -o\
-		-name '*.cma' -o\
-		-name '*.cmi' -o\
-		-name '*.cmo' -o\
-		-name '*.cmt' -o\
-		-name '*.cmti' -o\
-		-name '*.cmx' -o\
-		-name '*.cmxa' -o\
-		-name '*.ml' -o\
-		-name '*.mli'\
-		')'\
-		> install.txt
-
-.PHONY: remove
-remove:
-	dune uninstall
-
 .PHONY: clean
 clean:
-	rm -rf static_libs
 	dune clean
-
-$(BUILT_C_FILES): _build/%.c: %.c
-	mkdir -p $(dir $@)
-	cp $< $@
-
-$(BUILT_OBJECT_FILES): %.o: %.c $(ALL_HEADER_FILES)
-	cd $(dir $@) && ocamlopt $(EXTRA_INCLUDE_OPTS) $(CC_OPTS) -c $(notdir $<)
-
-libhp.a: $(BUILT_OBJECT_FILES)
-	ar -cvq libhp.a $(BUILT_OBJECT_FILES)
-	mkdir -p static_libs
-	mv libhp.a static_libs

dune

@@ -1,19 +1,15 @@
-(copy_files# static_libs/*)
-
 (env
  (dev
-  (flags (:standard -w A-3-4-6-27-29-34-32-35-39-40-41-42-44-45-48-49-50-57))))
+  (flags (:standard -w A-3-4-23-40-41-42-44-45-48-49-50-57))
+   (ocamlopt_flags (-g -Oclassic)))
+  (release
+   (flags (:standard -w A-3-4-23-40-41-42-44-45-48-49-50-57))
+   (ocamlopt_flags (-O3))))
 
 (library
- (name hack_parallel)
- (public_name hack_parallel)
- (c_library_flags -L static_libs -l hp)
- (libraries
-  str
-  core
-  hack_parallel.scheduler
-  hack_parallel.memory))
-
-(install
-  (section lib)
-   (files static_libs/libhp.a))
+  (name hack_parallel)
+  (public_name hack_parallel)
+  (library_flags (-cclib -l -cclib pthread -cclib -l -cclib sqlite3))
+  (libraries
+    hack_parallel.scheduler
+    hack_parallel.memory))

dune-project

@@ -0,0 +1,2 @@
+(lang dune 1.11)
+(name hack_parallel)

hack_parallel.opam

@@ -6,15 +6,12 @@ bug-reports: "https://github.com/rvantonder/hack-parallel/issues"
 dev-repo: "git+https://github.com/rvantonder/hack-parallel.git"
 license: "MIT"
 build: [
-  [make "libhp.a"]
   ["dune" "build" "-p" name "-j" jobs "@install"]
 ]
 depends: [
   "core"
   "ocaml" {>= "4.03.0"}
   "ppx_deriving"
-  "ppxlib"
-  "sexplib"
   "str"
 ]
 synopsis: "Parallel and shared memory library"

scripts/dune

@@ -0,0 +1,5 @@
+(rule
+  (targets get_build_id.c)
+  (deps gen_build_id.ml script_utils.ml)
+  (action
+    (run ocaml -I scripts -w -3 -unsafe-string unix.cma gen_build_id.ml get_build_id.c)))

scripts/gen_build_id.ml

@@ -0,0 +1,56 @@
+(**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *)
+
+#use "script_utils.ml"
+
+(**
+ * Computes some build identifiers based on the current commit. These IDs are
+ * used to ensure that clients and servers are the same version, even between
+ * releases. For example, if you build revision A and start a server, then check
+ * out and build revision B, it's convenient for the server to restart itself
+ * using revision B.
+ *
+ * This fails gracefully when neither hg nor git are installed, or when neither
+ * .hg nor .git exist (e.g. when building from a tarball). This is fine because
+ * you can't move between commits in such a snapshot.
+ *)
+let () =
+  let out_file = Sys.argv.(1) in
+  let rev =
+    try read_process_stdout "git" [|"git"; "rev-parse"; "HEAD"|]
+    with Failure msg -> (
+      Printf.eprintf "Failed git rev-parse: %s\n%!" msg;
+      try read_process_stdout "hg" [|"hg"; "id"; "-i"|]
+      with Failure msg -> (
+        Printf.eprintf "Failed hg id: %s\n%!" msg;
+        ""
+      )
+    )
+  in
+  let time =
+    try read_process_stdout "git" [|"git"; "log"; "-1"; "--pretty=tformat:%ct"|]
+    with Failure msg -> (
+      Printf.eprintf "Failed git log: %s\n%!" msg;
+      try
+        let raw = read_process_stdout "hg" [|"hg"; "log"; "-r"; "."; "-T"; "{date|hgdate}\\n"|] in
+        String.sub raw 0 (String.index raw ' ')
+      with
+      | Failure msg -> (
+        Printf.eprintf "Failed hg log: %s\n%!" msg;
+        "0"
+      )
+      | Not_found -> "0"
+    )
+  in
+  let content = Printf.sprintf
+    "const char* const BuildInfo_kRevision = %S;\nconst unsigned long BuildInfo_kRevisionCommitTimeUnix = %sul;\n"
+    rev time in
+  let do_dump =
+    not (Sys.file_exists out_file) || string_of_file out_file <> content in
+  if do_dump then
+    with_out_channel out_file @@ fun oc ->
+    output_string oc content

scripts/script_utils.ml

@@ -0,0 +1,78 @@
+(**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *)
+
+let with_pipe f =
+  let fd_r, fd_w = Unix.pipe () in
+  try
+    let res = f (fd_r, fd_w) in
+    Unix.close fd_r;
+    Unix.close fd_w;
+    res
+  with exn ->
+    Unix.close fd_r;
+    Unix.close fd_w;
+    raise exn
+
+let with_in_channel filename f =
+  let ic = open_in_bin filename in
+  try let res = f ic in close_in ic; res
+  with exn -> close_in ic; raise exn
+
+let with_out_channel filename f =
+  let oc = open_out_bin filename in
+  try let res = f oc in close_out oc; res
+  with exn -> close_out oc; raise exn
+
+let read_process name args (in_r, _in_w) (out_r, out_w) (err_r, err_w) =
+  let pid =
+    try Unix.create_process name args in_r out_w err_w
+    with Unix.Unix_error (Unix.ENOENT, _, _) ->
+      (* On Windows, this is what happens if you call create_process
+       * non_existent_thing *)
+      raise (Failure (name ^ ": command not found"))
+    in
+  match Unix.waitpid [] pid with
+  | _, Unix.WEXITED 0 ->
+      input_line (Unix.in_channel_of_descr out_r)
+  | _, Unix.WEXITED 127 ->
+      (* On Linux & OSX, this is what happens if you call create_process
+       * non_existent_thing *)
+      raise (Failure (name ^ ": command not found"))
+  | _, Unix.WEXITED 128 ->
+      raise (Failure (input_line (Unix.in_channel_of_descr err_r)))
+  | _, Unix.WEXITED code ->
+      raise (Failure (name ^ ": exited code "^(string_of_int code)))
+  | _, Unix.WSIGNALED signal ->
+      raise (Failure (name ^ ": killed by signal " ^ (string_of_int signal)))
+  | _, Unix.WSTOPPED signal ->
+      raise (Failure (name ^ ": stopped by signal " ^ (string_of_int signal)))
+
+(* Read the first line in stdout or stderr of an external command. *)
+let read_process_output name args =
+  with_pipe @@ fun in_pipe ->
+  with_pipe @@ fun out_pipe ->
+  read_process name args in_pipe out_pipe out_pipe
+
+(* Read the first line in stdout of an external command. *)
+let read_process_stdout name args =
+  with_pipe @@ fun in_pipe ->
+  with_pipe @@ fun out_pipe ->
+  with_pipe @@ fun err_pipe ->
+  read_process name args in_pipe out_pipe err_pipe
+
+let string_of_file filename =
+  with_in_channel filename @@ fun ic ->
+  let s = Bytes.create 32759 in
+  let b = Buffer.create 1000 in
+  let rec iter ic b s =
+    let nread = input ic s 0 32759 in
+    if nread > 0 then begin
+      Buffer.add_subbytes b s 0 nread;
+      iter ic b s
+    end in
+  iter ic b s;
+  Buffer.contents b

src/heap/dune

@@ -1,8 +1,16 @@
 (library
- (name heap)
- (public_name hack_parallel.heap)
- (wrapped false)
- (libraries
-  hack_core
-  hack_parallel.stubs
-  hack_parallel.utilities))
+  (name heap)
+  (public_name hack_parallel.heap)
+  (wrapped false)
+  (modules (:standard))
+  (c_names
+    hh_assert
+    hh_shared
+    hh_shared_sqlite)
+  (c_flags (:standard -I%{project_root}/src/third-party/lz4))
+  (c_library_flags (-lsqlite3))
+  (libraries
+    hack_parallel.collections
+    hack_parallel.lz4
+    hack_parallel.stubs
+    hack_parallel.utils))

src/heap/hh_assert.c

@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) 2015, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the "hack" directory of this source tree.
+ *
+ */
+
+#include "hh_assert.h"
+
+#define CAML_NAME_SPACE
+#include <caml/callback.h>
+#include <caml/fail.h>
+
+void raise_assertion_failure(char * msg) {
+  caml_raise_with_string(*caml_named_value("c_assertion_failure"), msg);
+}