Browse code

Merge github.com:mulle-objc/mulle-concurrent

Nat! authored on 17/11/2016 18:26:32
Showing 7 changed files
... ...
@@ -2,37 +2,38 @@
2 2
 *~.*
3 3
 *[Bb]uild/
4 4
 .idea/
5
-mulle_mintomic/
5
+*.dSYM/
6
+*.exe
7
+
6 8
 .repos/
7
-xcuserdata/
8
-project.xcworkspace/
9
-mulle-configuration/
10 9
 .bootstrap.auto/
11 10
 .bootstrap.local/
12
-dependencies/
13
-cityhash/
11
+
12
+xcuserdata/
14 13
 old/
15 14
 tmp/
16
-*.dSYM/
17
-*.exe
18
-mulle-tests/
15
+project.xcworkspace/
16
+
17
+/dependencies/
18
+/addictions/
19 19
 /include/
20 20
 /lib/
21
-/addictions/
22
-/bin/mulle-homebrew/
23
-/addictions/
21
+/cityhash/
22
+
23
+/tests/mulle-tests
24
+/bin/mulle-homebrew
25
+/mulle-configuration
26
+
24 27
 /tests/include/
25 28
 /tests/lib/
26 29
 /tests/pointerarray/pointerarray
27 30
 /tests/pointerarray/simple
28 31
 /tests/hashmap/hashmap
29 32
 /tests/hashmap/othersimple
30
-
31
-/tests/mulle-tests/
32 33
 tests/array/example
33 34
 tests/array/pointerarray
34 35
 tests/array/simple
35 36
 tests/hashmap/example
36 37
 tests/array/example.debug
37 38
 tests/hashmap/example.debug
38
-tests/hashmap/hashmap.debug
39 39
\ No newline at end of file
40
+tests/hashmap/hashmap.debug
... ...
@@ -1,7 +1,5 @@
1 1
 # mulle-concurrent
2 2
 
3
-[![Build Status](https://travis-ci.org/mulle-objc/mulle-concurrent.svg)](https://travis-ci.org/mulle-objc/mulle-concurrent)
4
-
5 3
 **mulle-concurrent** is a library for lock- and wait-free data structures.
6 4
 Wait-freeness is a desirable property for "hotly" contested data structures
7 5
 in multi-threaded environments.
... ...
@@ -10,13 +8,18 @@ in multi-threaded environments.
10 10
 > The definition of concurrent and wait-free are from [concurrencyfreaks.blogspot.de](http://concurrencyfreaks.blogspot.de/2013/05/lock-free-and-wait-free-definition-and.html)
11 11
 
12 12
 
13
+Fork      |  Build Status | Release Version
14
+----------|---------------|-----------------------------------
15
+[Mulle kybernetiK](//github.com/mulle-nat/mulle-concurrent) | [![Build Status](https://travis-ci.org/mulle-nat/mulle-concurrent.svg?branch=release)](https://travis-ci.org/mulle-nat/mulle-concurrent) | ![Mulle kybernetiK tag](https://img.shields.io/github/tag/mulle-nat/mulle-concurrent.svg) [![Build Status](https://travis-ci.org/mulle-nat/mulle-concurrent.svg?branch=release)](https://travis-ci.org/mulle-nat/mulle-concurrent)
16
+[Community](https://github.com/mulle-objc/mulle-concurrent/tree/release) | [![Build Status](https://travis-ci.org/mulle-objc/mulle-concurrent.svg)](https://travis-ci.org/mulle-objc/mulle-concurrent) | ![Community tag](https://img.shields.io/github/tag/mulle-objc/mulle-concurrent.svg) [![Build Status](https://travis-ci.org/mulle-objc/mulle-concurrent.svg?branch=release)](https://travis-ci.org/mulle-objc/mulle-concurrent)
17
+
13 18
 
14 19
 ## Data structures
15 20
 
16 21
 API                                                   | Description    | Example
17 22
 ------------------------------------------------------|----------------|---------
18 23
 [`mulle_concurrent_hashmap`](dox/API_POINTERARRAY.md) | A growing, mutable map of pointers, indexed by a hash. A.k.a. hashtable, dictionary, maptable | [Example](tests/hashmap/example.c)
19
-[`mulle_concurrent_pointerarray`](dox/API_HASHMAP.md) | A growing array of pointers                                                                   | [Example](tests/array/example.c)
24
+[`mulle_concurrent_pointerarray`](dox/API_HASHMAP.md) | A growing array of pointers                                                               | [Example](tests/array/example.c)
20 25
 
21 26
 
22 27
 ## Install
... ...
@@ -36,7 +39,7 @@ On other platforms you can use **mulle-install** from
36 36
 to install the library:
37 37
 
38 38
 ```
39
-mulle-install --prefix /usr/local --branch release https://www.mulle-kybernetik.com/repositories/mulle-concurrent
39
+mulle-install --prefix /usr/local --branch release https://github.com/mulle-objc/mulle-concurrent
40 40
 ```
41 41
 
42 42
 Otherwise read:
... ...
@@ -1,3 +1,13 @@
1
+1.1.5
2
+===
3
+
4
+* merge community fixes
5
+
6
+1.1.4
7
+===
8
+
9
+* improve readme, improved packaging
10
+
1 11
 1.1.3
2 12
 ===
3 13
 
4 14
new file mode 100644
... ...
@@ -0,0 +1 @@
0
+repository-info.sh merge=ours
... ...
@@ -1,4 +1,9 @@
1 1
 #! /bin/sh
2
+#
3
+# (c) 2016 Nat! for Mulle kybernetiK
4
+#
5
+# BSD3-License
6
+#
2 7
 
3 8
 PROJECT="MulleConcurrent"    # requires camel-case
4 9
 DESC="Lock- and Wait-free Hashtable (and an Array too) in C"
... ...
@@ -92,9 +92,9 @@ brew install mulle-build
92 92
 ### All: Install mulle-build using git
93 93
 
94 94
 ```
95
-git clone --branch release https://www.mulle-kybernetik.com/repositories/mulle-bootstrap
95
+git clone --branch release https://github.com/mulle-nat/mulle-bootstrap
96 96
 ( cd mulle-bootstrap ; ./install.sh )
97
-git clone --branch release https://www.mulle-kybernetik.com/repositories/mulle-build
97
+git clone --branch release https://github.com/mulle-nat/mulle-build
98 98
 ( cd mulle-build ; ./install.sh )
99 99
 ```
100 100
 
... ...
@@ -104,7 +104,7 @@ git clone --branch release https://www.mulle-kybernetik.com/repositories/mulle-b
104 104
 Grab the latest **mulle-concurrent** release and go into the project directory:
105 105
 
106 106
 ```
107
-git clone --branch release https://www.mulle-kybernetik.com/repositories/mulle-concurrent
107
+git clone --branch release https://github.com/mulle-objc/mulle-concurrent
108 108
 cd mulle-concurrent
109 109
 ```
110 110
 
... ...
@@ -37,7 +37,7 @@
37 37
 //
38 38
 // community version is always even
39 39
 //
40
-#define MULLE_CONCURRENT_VERSION  ((1 << 20) | (1 << 8) | 3)
40
+#define MULLE_CONCURRENT_VERSION  ((1 << 20) | (1 << 8) | 5)
41 41
 
42 42
 #include <mulle_thread/mulle_thread.h>
43 43
 #include <mulle_allocator/mulle_allocator.h>