Imbus/neptune
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename struct: spinlock -> Spinlock

Browse source
This commit is contained in:
Imbus 2025-06-26 12:02:41 +02:00
parent 521217f2b5
commit 71ff137192
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/spinlock.c
View file

@ -39,8 +39,8 @@
* On RISC-V, this emits a fence instruction. * On RISC-V, this emits a fence instruction.
*/ */
/** Initialize spinlock */ /** Initialize Spinlock */
void initlock(struct spinlock *lk, char *name) { void initlock(struct Spinlock *lk, char *name) {
lk->name = name; lk->name = name;
lk->locked = 0; lk->locked = 0;
lk->cpu = 0; lk->cpu = 0;
@ -51,7 +51,7 @@ void initlock(struct spinlock *lk, char *name) {
* Loops (spins) until the lock is acquired. * Loops (spins) until the lock is acquired.
* Panics if the lock is already held by this cpu. * Panics if the lock is already held by this cpu.
*/ */
void acquire(struct spinlock *lk) { void acquire(struct Spinlock *lk) {
push_off(); // disable interrupts to avoid deadlock. push_off(); // disable interrupts to avoid deadlock.
if (holding(lk)) // If the lock is already held, panic. if (holding(lk)) // If the lock is already held, panic.
@ -70,7 +70,7 @@ void acquire(struct spinlock *lk) {
* Release the lock. * Release the lock.
* Panics if the lock is not held. * Panics if the lock is not held.
*/ */
void release(struct spinlock *lk) { void release(struct Spinlock *lk) {
if (!holding(lk)) // If the lock is not held, panic. if (!holding(lk)) // If the lock is not held, panic.
panic("release"); panic("release");
@ -83,7 +83,7 @@ void release(struct spinlock *lk) {
// Check whether this cpu is holding the lock. // Check whether this cpu is holding the lock.
// Interrupts must be off. // Interrupts must be off.
int holding(struct spinlock *lk) { int holding(struct Spinlock *lk) {
int r; int r;
r = (lk->locked && lk->cpu == mycpu()); r = (lk->locked && lk->cpu == mycpu());
return r; return r;

16
lib/spinlock.h
View file

@ -1,10 +1,10 @@
#ifndef KERNEL_SPINLOCK_H #ifndef KERNEL_Spinlock_H
#define KERNEL_SPINLOCK_H #define KERNEL_Spinlock_H
#include "types.h" #include "types.h"
/** Mutual exclusion spin lock */ /** Mutual exclusion spin lock */
struct spinlock { struct Spinlock {
u32 locked; // Is the lock held? u32 locked; // Is the lock held?
// NOTE: Perhaps feature gate this? // NOTE: Perhaps feature gate this?
@ -19,24 +19,24 @@ struct spinlock {
* Loops (spins) until the lock is acquired. * Loops (spins) until the lock is acquired.
* Panics if the lock is already held by this cpu. * Panics if the lock is already held by this cpu.
*/ */
void acquire(struct spinlock *); void acquire(struct Spinlock *);
/** /**
* Check whether this cpu is holding the lock. * Check whether this cpu is holding the lock.
* Interrupts must be off. * Interrupts must be off.
*/ */
int holding(struct spinlock *); int holding(struct Spinlock *);
/** /**
* Initialize spinlock * Initialize Spinlock
*/ */
void initlock(struct spinlock *, char *); void initlock(struct Spinlock *, char *);
/** /**
* Release the lock. * Release the lock.
* Panics if the lock is not held. * Panics if the lock is not held.
*/ */
void release(struct spinlock *); void release(struct Spinlock *);
/** /**
* @brief push_off/pop_off are like intr_off()/intr_on() except that they are * @brief push_off/pop_off are like intr_off()/intr_on() except that they are

2
start.c
View file

@ -15,7 +15,7 @@
char stack0[4096 * NCPU] __attribute__((aligned(16))); char stack0[4096 * NCPU] __attribute__((aligned(16)));
/* Keep this here and sync on it until we have synchronized printf */ /* Keep this here and sync on it until we have synchronized printf */
struct spinlock sl = {0}; struct Spinlock sl = {0};
volatile int greeted = 0; volatile int greeted = 0;
/* This is where entry.S drops us of. All cores land here */ /* This is where entry.S drops us of. All cores land here */