Browse code

use uintptr_t in internal struct for debugger

Nat! authored on 06-07-2016 15:59:58
Showing 6 changed files
... ...
@@ -1,3 +1,8 @@
1
+# v0.5
2
+
3
+* changed internal representation of mask from unsigned int to uintptr_t,
4
+  because it's easier to read by the debugger
5
+  
1 6
 # v0.4
2 7
 
3 8
 * does not use `errno` directly anymore, but instead returns the errno codes
4 9
deleted file mode 100755
... ...
@@ -1,32 +0,0 @@
1
-#! /bin/sh
2
-
3
-mulle-bootstrap build "$@"
4
-
5
-#
6
-# fucking Xcode stupidity if we build with -scheme
7
-# stuff gets dumped into "build/Products/Release"
8
-# w/o -scheme stuff gets dumped into "build/Release"
9
-#
10
-MAKE=`which "make"`
11
-CMAKE=`which "cmake"`
12
-
13
-#
14
-# Just build stuff, let user install manually
15
-#
16
-if [ "`uname`"  = "Darwin" ]
17
-then
18
-   xcodebuild -configuration Debug -scheme Libraries -project mulle-concurrent.xcodeproj
19
-   xcodebuild -configuration Release -scheme Libraries -project mulle-concurrent.xcodeproj
20
-else
21
-   if [ ! -z "${CMAKE}" ]
22
-   then
23
-      mkdir -p build 2> /dev/null
24
-      cd build || exit 1
25
-      cmake ..
26
-
27
-      if [ ! -z "${MAKE}" ]
28
-      then
29
-         make
30
-      fi
31
-   fi
32
-fi
... ...
@@ -109,7 +109,6 @@
109 109
 
110 110
 /* Begin PBXFileReference section */
111 111
 		411A28C11BCD446E00D39FF7 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
112
-		414A61D41C8F1B2E0011AA7E /* build.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = build.sh; sourceTree = "<group>"; };
113 112
 		417C02651BD8404E005A3751 /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
114 113
 		417C02681BD8404E005A3751 /* Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
115 114
 		417C026A1BD8404E005A3751 /* StaticLibraryIOS.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = StaticLibraryIOS.xcconfig; sourceTree = "<group>"; };
... ...
@@ -175,7 +174,6 @@
175 174
 		414785231ABAF290002DBAE4 = {
176 175
 			isa = PBXGroup;
177 176
 			children = (
178
-				414A61D41C8F1B2E0011AA7E /* build.sh */,
179 177
 				41CAEB091C8DB97F003C2C7B /* README.md */,
180 178
 				41D04AB71C8DD69000CC8F11 /* RELEASENOTES.md */,
181 179
 				411A28C11BCD446E00D39FF7 /* CMakeLists.txt */,
... ...
@@ -512,7 +510,8 @@
512 510
 			isa = XCBuildConfiguration;
513 511
 			baseConfigurationReference = 417C02651BD8404E005A3751 /* Debug.xcconfig */;
514 512
 			buildSettings = {
515
-				CURRENT_PROJECT_VERSION = 0.4;
513
+				CURRENT_PROJECT_VERSION = 0.5;
514
+				GCC_WARN_PEDANTIC = YES;
516 515
 			};
517 516
 			name = Debug;
518 517
 		};
... ...
@@ -520,7 +519,8 @@
520 519
 			isa = XCBuildConfiguration;
521 520
 			baseConfigurationReference = 417C02681BD8404E005A3751 /* Release.xcconfig */;
522 521
 			buildSettings = {
523
-				CURRENT_PROJECT_VERSION = 0.4;
522
+				CURRENT_PROJECT_VERSION = 0.5;
523
+				GCC_WARN_PEDANTIC = YES;
524 524
 			};
525 525
 			name = Release;
526 526
 		};
... ...
@@ -544,9 +544,9 @@
544 544
 			buildSettings = {
545 545
 				OTHER_LDFLAGS = (
546 546
 					"-force_load",
547
-					"$(DEPENDENCIES_DIR)/lib/$(CONFIGURATION)/libmulle_test_allocator.a",
547
+					"$(DEPENDENCIES_DIR)/lib/libmulle_test_allocator.a",
548 548
 					"-force_load",
549
-					"$(DEPENDENCIES_DIR)/lib/$(CONFIGURATION)/libmulle_aba.a",
549
+					"$(DEPENDENCIES_DIR)/lib/libmulle_aba.a",
550 550
 					"-force_load",
551 551
 					"$(CONFIGURATION_BUILD_DIR)/libmulle_concurrent.a",
552 552
 				);
... ...
@@ -584,10 +584,7 @@
584 584
 			isa = XCBuildConfiguration;
585 585
 			baseConfigurationReference = 417C026C1BD8404E005A3751 /* ToolOSX.xcconfig */;
586 586
 			buildSettings = {
587
-				LIBRARY_SEARCH_PATHS = (
588
-					"$(inherited)",
589
-					"$(PROJECT_DIR)/dependencies/lib/Debug",
590
-				);
587
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
591 588
 			};
592 589
 			name = Debug;
593 590
 		};
... ...
@@ -595,10 +592,7 @@
595 592
 			isa = XCBuildConfiguration;
596 593
 			baseConfigurationReference = 417C026C1BD8404E005A3751 /* ToolOSX.xcconfig */;
597 594
 			buildSettings = {
598
-				LIBRARY_SEARCH_PATHS = (
599
-					"$(inherited)",
600
-					"$(PROJECT_DIR)/dependencies/lib/Debug",
601
-				);
595
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
602 596
 			};
603 597
 			name = Release;
604 598
 		};
... ...
@@ -608,7 +602,7 @@
608 602
 			buildSettings = {
609 603
 				LIBRARY_SEARCH_PATHS = (
610 604
 					"$(inherited)",
611
-					"$(PROJECT_DIR)/dependencies/lib/Debug",
605
+					"$(PROJECT_DIR)/dependencies/lib",
612 606
 				);
613 607
 			};
614 608
 			name = Debug;
... ...
@@ -619,7 +613,7 @@
619 613
 			buildSettings = {
620 614
 				LIBRARY_SEARCH_PATHS = (
621 615
 					"$(inherited)",
622
-					"$(PROJECT_DIR)/dependencies/lib/Debug",
616
+					"$(PROJECT_DIR)/dependencies/lib",
623 617
 				);
624 618
 			};
625 619
 			name = Release;
... ...
@@ -50,7 +50,7 @@ struct _mulle_concurrent_hashvaluepair
50 50
 struct _mulle_concurrent_hashmapstorage
51 51
 {
52 52
    mulle_atomic_pointer_t   n_hashs;  // with possibly empty values
53
-   unsigned int             mask;
53
+   uintptr_t                mask;     // easier to read from debugger if void * size
54 54
    
55 55
    struct _mulle_concurrent_hashvaluepair  entries[ 1];
56 56
 };
... ...
@@ -35,7 +35,7 @@
35 35
 #define mulle_concurrent_h__
36 36
 
37 37
 
38
-#define MULLE_CONCURRENT_VERSION  ((0 << 20) | (4 << 8) | 0)
38
+#define MULLE_CONCURRENT_VERSION  ((0 << 20) | (5 << 8) | 0)
39 39
 
40 40
 #include <mulle_thread/mulle_thread.h>
41 41
 #include <mulle_allocator/mulle_allocator.h>
... ...
@@ -43,7 +43,7 @@
43 43
 struct _mulle_concurrent_pointerarraystorage
44 44
 {
45 45
    mulle_atomic_pointer_t   n;
46
-   unsigned int             size;
46
+   uintptr_t                size;
47 47
    
48 48
    mulle_atomic_pointer_t   entries[ 1];
49 49
 };