Deleted Added
full compact
kern_sx.c (167163) kern_sx.c (167365)
1/*-
2 * Copyright (C) 2001 Jason Evans <jasone@freebsd.org>. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice(s), this list of conditions and the following disclaimer as

--- 20 unchanged lines hidden (view full) ---

29 * Shared/exclusive locks. This implementation assures deterministic lock
30 * granting behavior, so that slocks and xlocks are interleaved.
31 *
32 * Priority propagation will not generally raise the priority of lock holders,
33 * so should not be relied upon in combination with sx locks.
34 */
35
36#include <sys/cdefs.h>
1/*-
2 * Copyright (C) 2001 Jason Evans <jasone@freebsd.org>. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice(s), this list of conditions and the following disclaimer as

--- 20 unchanged lines hidden (view full) ---

29 * Shared/exclusive locks. This implementation assures deterministic lock
30 * granting behavior, so that slocks and xlocks are interleaved.
31 *
32 * Priority propagation will not generally raise the priority of lock holders,
33 * so should not be relied upon in combination with sx locks.
34 */
35
36#include <sys/cdefs.h>
37__FBSDID("$FreeBSD: head/sys/kern/kern_sx.c 167163 2007-03-02 07:21:20Z kmacy $");
37__FBSDID("$FreeBSD: head/sys/kern/kern_sx.c 167365 2007-03-09 16:04:44Z jhb $");
38
39#include "opt_ddb.h"
40
41#include <sys/param.h>
42#include <sys/systm.h>
43#include <sys/ktr.h>
44#include <sys/linker_set.h>
45#include <sys/condvar.h>

--- 5 unchanged lines hidden (view full) ---

51
52#ifdef DDB
53#include <ddb/ddb.h>
54
55static void db_show_sx(struct lock_object *lock);
56#endif
57
58struct lock_class lock_class_sx = {
38
39#include "opt_ddb.h"
40
41#include <sys/param.h>
42#include <sys/systm.h>
43#include <sys/ktr.h>
44#include <sys/linker_set.h>
45#include <sys/condvar.h>

--- 5 unchanged lines hidden (view full) ---

51
52#ifdef DDB
53#include <ddb/ddb.h>
54
55static void db_show_sx(struct lock_object *lock);
56#endif
57
58struct lock_class lock_class_sx = {
59 "sx",
60 LC_SLEEPLOCK | LC_SLEEPABLE | LC_RECURSABLE | LC_UPGRADABLE,
59 .lc_name = "sx",
60 .lc_flags = LC_SLEEPLOCK | LC_SLEEPABLE | LC_RECURSABLE | LC_UPGRADABLE,
61#ifdef DDB
61#ifdef DDB
62 db_show_sx
62 .lc_ddb_show = db_show_sx,
63#endif
64};
65
66#ifndef INVARIANTS
67#define _sx_assert(sx, what, file, line)
68#endif
69
70void

--- 397 unchanged lines hidden ---
63#endif
64};
65
66#ifndef INVARIANTS
67#define _sx_assert(sx, what, file, line)
68#endif
69
70void

--- 397 unchanged lines hidden ---