-/* $Id$ */
-
-/* Copyright (c) 2007 Arnaud Legrand, Bruno Donnassolo.
- All rights reserved. */
+/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
}
/** @brief Destroys a semaphore */
void SIMIX_sem_destroy(smx_sem_t sem) {
+ smx_action_t action = NULL;
DEBUG1("Destroy semaphore %p", sem);
if (sem == NULL)
return;
- smx_action_t action = NULL;
-
xbt_assert0(xbt_swag_size(sem->sleeping) == 0,
"Cannot destroy semaphore since someone is still using it");
xbt_swag_free(sem->sleeping);
xbt_swag_remove(proc, sem->sleeping);
xbt_swag_insert(proc, simix_global->process_to_run);
}
- sem->capacity == SMX_SEM_NOLIMIT;
+ sem->capacity = SMX_SEM_NOLIMIT;
}
/**
/** @brief Returns true if acquiring this semaphore would block */
XBT_INLINE int SIMIX_sem_would_block(smx_sem_t sem) {
- return (sem->capacity>0);
+ return (sem->capacity<=0);
}
/** @brief Returns the current capacity of the semaphore
DEBUG1("Wait semaphore %p", sem);
- if (sem->capacity == SMX_SEM_NOLIMIT)
+ if (sem->capacity == SMX_SEM_NOLIMIT) {
+ DEBUG1("semaphore %p wide open", sem);
return; /* don't even decrease it if wide open */
+ }
/* If capacity sufficient, decrease it */
if (sem->capacity>0) {
+ DEBUG1("semaphore %p has enough capacity", sem);
sem->capacity--;
return;
}
xbt_assert0(xbt_dynar_length(sems),
"I refuse to commit sucide by locking on an **empty** set of semaphores!!");
- DEBUG1("Wait on semaphore set %p", sems);
+ DEBUG2("Wait on semaphore set %p (containing %ld semaphores)", sems,xbt_dynar_length(sems));
xbt_dynar_foreach(sems,counter,sem) {
- if (!SIMIX_sem_would_block(sem))
+ if (!SIMIX_sem_would_block(sem)) {
+ DEBUG1("Semaphore %p wouldn't block; get it without waiting",sem);
SIMIX_sem_acquire(sem);
- return counter;
+ return counter;
+ }
}
/* Always create an action null in case there is a host failure */
xbt_swag_insert(self, sem->sleeping);
}
SIMIX_process_yield();
+ self->sem = NULL;
while (self->suspended)
SIMIX_process_yield();
/* one of the semaphore unsuspended us -- great, let's search which one (and get out of the others) */
- self->sem = NULL;
xbt_dynar_foreach(sems,counter,sem) {
if (xbt_swag_belongs(self,sem->sleeping))
xbt_swag_remove(self,sem->sleeping);