CVS commit: src/external/cddl/osnet/lib/libumem

[Adam Hamsik]

Module Name:src
Committed By:   haad
Date:   Tue Dec 14 01:25:37 UTC 2010

Modified Files:
src/external/cddl/osnet/lib/libumem: stub_stand.c

Log Message:
Define mutex_owned.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/lib/libumem/stub_stand.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/cddl/osnet/lib/libumem/stub_stand.c
diff -u src/external/cddl/osnet/lib/libumem/stub_stand.c:1.1 src/external/cddl/osnet/lib/libumem/stub_stand.c:1.2
--- src/external/cddl/osnet/lib/libumem/stub_stand.c:1.1	Sun Feb 28 22:45:45 2010
+++ src/external/cddl/osnet/lib/libumem/stub_stand.c	Tue Dec 14 01:25:37 2010
@@ -55,6 +55,12 @@
 	return (1);
 }
 
+int
+mutex_owned(mutex_t *mp)
+{
+	return (1);
+}
+
 /*ARGSUSED*/
 int
 mutex_lock(mutex_t *mp)

CVS commit: src/external/cddl/osnet/lib/libumem

[Adam Hamsik]

Module Name:src
Committed By:   haad
Date:   Mon May 10 06:27:57 UTC 2010

Modified Files:
src/external/cddl/osnet/lib/libumem: Makefile

Log Message:
Disable building of stub_stand.c we build all locking primitives in libzpool.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/lib/libumem/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/cddl/osnet/lib/libumem/Makefile
diff -u src/external/cddl/osnet/lib/libumem/Makefile:1.4 src/external/cddl/osnet/lib/libumem/Makefile:1.5
--- src/external/cddl/osnet/lib/libumem/Makefile:1.4	Sun Feb 28 22:45:45 2010
+++ src/external/cddl/osnet/lib/libumem/Makefile	Mon May 10 06:27:57 2010
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile,v 1.4 2010/02/28 22:45:45 haad Exp $
+#	$NetBSD: Makefile,v 1.5 2010/05/10 06:27:57 haad Exp $
 
 LIB=	umem
-SRCS=	umem.c stub_stand.c
+SRCS=	umem.c
 
 .include "../../Makefile.zfs"
 .include 

CVS commit: src/external/cddl/osnet/lib/libumem

[Adam Hamsik]

Module Name:src
Committed By:   haad
Date:   Sun May  2 23:59:54 UTC 2010

Modified Files:
src/external/cddl/osnet/lib/libumem: umem.c

Log Message:
In NetBSD pool cache constructor/destructor routines has inverted arguments.

C


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/lib/libumem/umem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/cddl/osnet/lib/libumem/umem.c
diff -u src/external/cddl/osnet/lib/libumem/umem.c:1.1 src/external/cddl/osnet/lib/libumem/umem.c:1.2
--- src/external/cddl/osnet/lib/libumem/umem.c:1.1	Fri Aug  7 20:57:56 2009
+++ src/external/cddl/osnet/lib/libumem/umem.c	Sun May  2 23:59:54 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: umem.c,v 1.1 2009/08/07 20:57:56 haad Exp $	*/
+/*	$NetBSD: umem.c,v 1.2 2010/05/02 23:59:54 haad Exp $	*/
 
 /*
  * CDDL HEADER START
@@ -135,7 +135,8 @@
 	}
 
 	if(cache->constructor != NULL) {
-		if(cache->constructor(buf, cache->callback_data, flags) != 0) {
+		/* XXX NetBSD pool cache costructor has switched arguments. */
+		if(cache->constructor(cache->callback_data, buf, flags) != 0) {
 			free(buf);
 			if(!(flags & UMEM_NOFAIL))
 return NULL;
@@ -155,7 +156,8 @@
 void umem_cache_free(umem_cache_t *cache, void *buffer)
 {
 	if(cache->destructor != NULL)
-		cache->destructor(buffer, cache->callback_data);
+		/* XXX NetBSD pool cache costructor has switched arguments. */
+		cache->destructor(cache->callback_data, buffer);
 
 	free(buffer);
 }