Auto merge of #1433 - RalfJung:condattr-setclock, r=RalfJung

macOS does not have pthread_condattr_setclock/getclock

src/shims/foreign_items/posix.rs

@@ -335,16 +335,6 @@ fn emulate_foreign_item_by_name(
                 let result = this.pthread_condattr_init(attr)?;
                 this.write_scalar(Scalar::from_i32(result), dest)?;
             }
-            "pthread_condattr_setclock" => {
-                let &[attr, clock_id] = check_arg_count(args)?;
-                let result = this.pthread_condattr_setclock(attr, clock_id)?;
-                this.write_scalar(Scalar::from_i32(result), dest)?;
-            }
-            "pthread_condattr_getclock" => {
-                let &[attr, clock_id] = check_arg_count(args)?;
-                let result = this.pthread_condattr_getclock(attr, clock_id)?;
-                this.write_scalar(Scalar::from_i32(result), dest)?;
-            }
             "pthread_condattr_destroy" => {
                 let &[attr] = check_arg_count(args)?;
                 let result = this.pthread_condattr_destroy(attr)?;

src/shims/foreign_items/posix/linux.rs

@@ -90,6 +90,16 @@ fn emulate_foreign_item_by_name(
                 let result = this.prctl(option, arg2, arg3, arg4, arg5)?;
                 this.write_scalar(Scalar::from_i32(result), dest)?;
             }
+            "pthread_condattr_setclock" => {
+                let &[attr, clock_id] = check_arg_count(args)?;
+                let result = this.pthread_condattr_setclock(attr, clock_id)?;
+                this.write_scalar(Scalar::from_i32(result), dest)?;
+            }
+            "pthread_condattr_getclock" => {
+                let &[attr, clock_id] = check_arg_count(args)?;
+                let result = this.pthread_condattr_getclock(attr, clock_id)?;
+                this.write_scalar(Scalar::from_i32(result), dest)?;
+            }
 
             // Dynamically invoked syscalls
             "syscall" => {

src/sync.rs

@@ -238,6 +238,7 @@ fn rwlock_reader_unlock(&mut self, id: RwLockId, reader: ThreadId) -> bool {
         match this.machine.threads.sync.rwlocks[id].readers.entry(reader) {
             Entry::Occupied(mut entry) => {
                 let count = entry.get_mut();
+                assert!(*count > 0, "rwlock locked with count == 0");
                 *count -= 1;
                 if *count == 0 {
                     entry.remove();