summaryrefslogtreecommitdiff
path: root/cpusched.c
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-06-15 17:31:32 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-06-15 17:31:32 +0200
commitc0a4ab36757c590b09b2a9cab8d48235c303d14b (patch)
treed297323a687683d8c0ef047ff453d96a19004091 /cpusched.c
parente48c760ee1d369be0cf15eeb3962d48bab9f97ea (diff)
cpusched: cleanups, refactoring and fix one bug
Fix the bug in "if (!entry == 0 && errno == ENOENT)" and also do some cleanups, make the code more readable and remove useless stuff. Used in curvetun. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'cpusched.c')
-rw-r--r--cpusched.c77
1 files changed, 28 insertions, 49 deletions
diff --git a/cpusched.c b/cpusched.c
index 6df33f2..cc75be7 100644
--- a/cpusched.c
+++ b/cpusched.c
@@ -16,35 +16,18 @@ struct map_entry {
};
static struct hash_table mapper;
-
-static unsigned int *cpu_assigned = NULL;
-
+static unsigned int *cpu_work_map = NULL;
static unsigned int cpu_len = 0;
-
static struct rwlock map_lock;
-void init_cpusched(unsigned int cpus)
-{
- rwlock_init(&map_lock);
- rwlock_wr_lock(&map_lock);
-
- cpu_len = cpus;
- cpu_assigned = xzmalloc(cpus * sizeof(*cpu_assigned));
-
- memset(&mapper, 0, sizeof(mapper));
- init_hash(&mapper);
-
- rwlock_unlock(&map_lock);
-}
-
static int get_appropriate_cpu(void)
{
int i, cpu = 0;
int work = INT_MAX;
for (i = 0; i < cpu_len; ++i) {
- if (cpu_assigned[i] < work) {
- work = cpu_assigned[i];
+ if (cpu_work_map[i] < work) {
+ work = cpu_work_map[i];
cpu = i;
}
}
@@ -57,20 +40,16 @@ unsigned int socket_to_cpu(int fd)
int cpu = 0;
struct map_entry *entry;
- errno = 0;
-
rwlock_rd_lock(&map_lock);
entry = lookup_hash(fd, &mapper);
while (entry && fd != entry->fd)
entry = entry->next;
+
if (entry && fd == entry->fd)
cpu = entry->cpu;
- else
- errno = ENOENT;
rwlock_unlock(&map_lock);
-
return cpu;
}
@@ -85,7 +64,7 @@ unsigned int register_socket(int fd)
entry->fd = fd;
entry->cpu = get_appropriate_cpu();
- cpu_assigned[entry->cpu]++;
+ cpu_work_map[entry->cpu]++;
pos = insert_hash(entry->fd, entry, &mapper);
if (pos) {
@@ -94,7 +73,6 @@ unsigned int register_socket(int fd)
}
rwlock_unlock(&map_lock);
-
return entry->cpu;
}
@@ -102,20 +80,16 @@ static struct map_entry *socket_to_map_entry(int fd)
{
struct map_entry *entry, *ret = NULL;
- errno = 0;
-
rwlock_rd_lock(&map_lock);
entry = lookup_hash(fd, &mapper);
while (entry && fd != entry->fd)
entry = entry->next;
+
if (entry && fd == entry->fd)
ret = entry;
- else
- errno = ENOENT;
rwlock_unlock(&map_lock);
-
return ret;
}
@@ -124,16 +98,17 @@ void unregister_socket(int fd)
struct map_entry *pos;
struct map_entry *entry = socket_to_map_entry(fd);
- if (!entry == 0 && errno == ENOENT)
+ if (entry == NULL)
return;
rwlock_wr_lock(&map_lock);
- cpu_assigned[entry->cpu]--;
+ cpu_work_map[entry->cpu]--;
pos = remove_hash(entry->fd, entry, entry->next, &mapper);
while (pos && pos->next && pos->next != entry)
pos = pos->next;
+
if (pos && pos->next && pos->next == entry)
pos->next = entry->next;
@@ -143,32 +118,36 @@ void unregister_socket(int fd)
rwlock_unlock(&map_lock);
}
-static int cleanup_batch(void *ptr)
+static int cleanup_cpusched_batch(void *ptr)
{
struct map_entry *next;
- struct map_entry *e = ptr;
+ struct map_entry *entry = ptr;
- if (!e)
+ if (!entry)
return 0;
- while ((next = e->next)) {
- e->next = NULL;
- xfree(e);
- e = next;
+
+ while ((next = entry->next)) {
+ entry->next = NULL;
+
+ xfree(entry);
+ entry = next;
}
- xfree(e);
+ xfree(entry);
return 0;
}
-void destroy_cpusched(void)
+void init_cpusched(unsigned int cpus)
{
- rwlock_wr_lock(&map_lock);
+ rwlock_init(&map_lock);
+ cpu_work_map = xzmalloc((cpu_len = cpus) * sizeof(*cpu_work_map));
+ init_hash(&mapper);
+}
- xfree(cpu_assigned);
- cpu_len = 0;
- for_each_hash(&mapper, cleanup_batch);
+void destroy_cpusched(void)
+{
+ xfree(cpu_work_map);
+ for_each_hash(&mapper, cleanup_cpusched_batch);
free_hash(&mapper);
-
- rwlock_unlock(&map_lock);
rwlock_destroy(&map_lock);
}