Skip to content

Commit 3b855c6

Browse files
committed
Upgrade dependencies and use (implicit_transitive_deps false)
1 parent 29e71b2 commit 3b855c6

File tree

12 files changed

+47
-27
lines changed

12 files changed

+47
-27
lines changed

bench/dune

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
(package kcas_data)
44
(libraries
55
kcas_data
6+
domain-local-await
7+
multicore-magic
68
yojson
79
domain_shims
810
mtime
9-
mtime.clock.os
10-
multicore-magic))
11+
mtime.clock.os))

dune-project

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
(lang dune 3.3)
1+
(lang dune 3.8)
22
(name kcas)
33
(generate_opam_files true)
44
(source (github ocaml-multicore/kcas))
55
(authors "KC Sivaramakrishnan <[email protected]>")
66
(maintainers "Vesa Karvonen <[email protected]>" "KC Sivaramakrishnan <[email protected]>")
77
(homepage "https://github.com/ocaml-multicore/kcas")
88
(license ISC)
9+
(implicit_transitive_deps false)
910
(package (name kcas)
1011
(synopsis "Software transactional memory based on lock-free multi-word compare-and-set")
1112
(description "A software transactional memory (STM) implementation based on an atomic lock-free multi-word compare-and-set (MCAS) algorithm enhanced with read-only compare operations and ability to block awaiting for changes.")
1213
(depends
1314
(ocaml (>= 4.13.0))
1415
(backoff (>= 0.1.0))
15-
(domain-local-await (>= 0.2.0))
16-
(domain-local-timeout (>= 0.1.0))
17-
(multicore-magic (>= 1.0.0))
16+
(domain-local-await (>= 1.0.0))
17+
(domain-local-timeout (>= 1.0.0))
18+
(multicore-magic (>= 2.0.0))
1819
(domain_shims (and (>= 0.1.0) :with-test))
1920
(alcotest (and (>= 1.7.0) :with-test))
2021
(mdx (and (>= 2.3.0) :with-test))
@@ -24,11 +25,12 @@
2425
(description "A library of compositional lock-free data structures and primitives for communication and synchronization implemented using kcas.")
2526
(depends
2627
(kcas (= :version))
27-
(multicore-magic (>= 1.0.0))
28+
(multicore-magic (>= 2.0.0))
29+
(domain-local-await (and (>= 1.0.0) :with-test))
2830
(domain_shims (and (>= 0.1.0) :with-test))
2931
(mtime (and (>= 2.0.0) :with-test))
3032
(alcotest (and (>= 1.7.0) :with-test))
3133
(mdx (and (>= 2.3.0) :with-test))
3234
(yojson (and (>= 2.1.0) :with-test))
3335
(odoc (and (>= 2.2.0) :with-doc))))
34-
(using mdx 0.2)
36+
(using mdx 0.4)

kcas.opam

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ license: "ISC"
1313
homepage: "https://github.com/ocaml-multicore/kcas"
1414
bug-reports: "https://github.com/ocaml-multicore/kcas/issues"
1515
depends: [
16-
"dune" {>= "3.3"}
16+
"dune" {>= "3.8"}
1717
"ocaml" {>= "4.13.0"}
1818
"backoff" {>= "0.1.0"}
19-
"domain-local-await" {>= "0.2.0"}
20-
"domain-local-timeout" {>= "0.1.0"}
21-
"multicore-magic" {>= "1.0.0"}
19+
"domain-local-await" {>= "1.0.0"}
20+
"domain-local-timeout" {>= "1.0.0"}
21+
"multicore-magic" {>= "2.0.0"}
2222
"domain_shims" {>= "0.1.0" & with-test}
2323
"alcotest" {>= "1.7.0" & with-test}
2424
"mdx" {>= "2.3.0" & with-test}

kcas_data.opam

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ license: "ISC"
1313
homepage: "https://github.com/ocaml-multicore/kcas"
1414
bug-reports: "https://github.com/ocaml-multicore/kcas/issues"
1515
depends: [
16-
"dune" {>= "3.3"}
16+
"dune" {>= "3.8"}
1717
"kcas" {= version}
18-
"multicore-magic" {>= "1.0.0"}
18+
"multicore-magic" {>= "2.0.0"}
19+
"domain-local-await" {>= "1.0.0" & with-test}
1920
"domain_shims" {>= "0.1.0" & with-test}
2021
"mtime" {>= "2.0.0" & with-test}
2122
"alcotest" {>= "1.7.0" & with-test}

src/kcas/dune

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@
77
(package kcas)
88
(deps
99
(package kcas))
10-
(preludes kcas.prelude.ml)
1110
(libraries kcas backoff domain_shims)
1211
(files kcas.mli))

src/kcas/kcas.mli

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,13 @@
3333
3434
{1 A quick tour}
3535
36-
To use the library one first creates shared memory locations:
36+
Let's first open the library for convenience:
37+
38+
{[
39+
open Kcas
40+
]}
41+
42+
To use the library one creates shared memory locations:
3743
3844
{[
3945
# let a = Loc.make 0
@@ -166,7 +172,7 @@ end
166172
module except that some of the operations take additional optional
167173
arguments:
168174
169-
- [backoff] specifies the configuration for the {!Backoff} mechanism. In
175+
- [backoff] specifies the configuration for the [Backoff] mechanism. In
170176
special cases, having more detailed knowledge of the application, one
171177
might adjust the configuration to improve performance.
172178

src/kcas/kcas.prelude.ml

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/kcas_data/dune

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
(library
22
(name kcas_data)
33
(public_name kcas_data)
4-
(libraries kcas multicore-magic))
4+
(libraries
5+
(re_export kcas)
6+
multicore-magic))
57

68
(rule
79
(targets domain.ml)
@@ -17,6 +19,5 @@
1719
(deps
1820
(package kcas)
1921
(package kcas_data))
20-
(preludes kcas_data.prelude.ml)
2122
(libraries kcas kcas_data)
2223
(files kcas_data.mli))

src/kcas_data/kcas_data.mli

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,16 @@
2929
But why should you care about composability?
3030
3131
As an example, consider the implementation of a least-recently-used (LRU)
32-
cache or a bounded associative map. A simple sequential approach to
33-
implement a LRU cache is to use a hash table and a doubly-linked list and
34-
keep track of the amount of space in the cache:
32+
cache or a bounded associative map, but first, let's open the libraries
33+
for convenience:
34+
35+
{[
36+
open Kcas
37+
open Kcas_data
38+
]}
39+
40+
A simple sequential approach to implement a LRU cache is to use a hash table
41+
and a doubly-linked list and keep track of the amount of space in the cache:
3542
3643
{[
3744
type ('k, 'v) cache =

src/kcas_data/kcas_data.prelude.ml

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)