Skip to content

Commit

Permalink
a few compile errors fixed with the utils.
Browse files Browse the repository at this point in the history
  • Loading branch information
Nikhil Samith Bysani committed Jan 16, 2009
1 parent 74dd619 commit 1681241
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 20 deletions.
18 changes: 9 additions & 9 deletions src/base/bang-com.c
Expand Up @@ -200,11 +200,11 @@ static peer **peers = NULL;
static int *keys = NULL;

static void acquire_peers_read_lock() {
BANG_acquire_read_lock(&peer_readers,&peers_read_lock,&peers_change_lock);
BANG_acquire_read_lock(&peers_readers,&peers_read_lock,&peers_change_lock);
}

static void release_peers_read_lock() {
BANG_release_read_lock(&peer_readers,&peers_read_lock,&peers_change_lock);
BANG_release_read_lock(&peers_readers,&peers_read_lock,&peers_change_lock);
}

static void free_peer(peer *p) {
Expand Down Expand Up @@ -536,9 +536,9 @@ static void send_module_peer_request(peer *self, BANG_request request) {
static void register_module_name(peer *self, char *my_module_name) {
/* TODO: LOCKS */
pthread_mutex_lock(&(self->my_modules_lock));
self->my_modules = realloc(self->my_modules_len++ * sizeof(char*) + 1);
modules->my_modules[self->my_modules_len - 1] = my_module_name;
modules->my_modules[self->my_modules_len] = NULL;
self->my_modules = realloc(self->my_modules, self->my_modules_len++ * sizeof(char*) + 1);
self->my_modules[self->my_modules_len - 1] = my_module_name;
self->my_modules[self->my_modules_len] = NULL;
}

void* BANG_write_peer_thread(void *self_info) {
Expand Down Expand Up @@ -585,8 +585,8 @@ void* BANG_write_peer_thread(void *self_info) {
break;

case BANG_MODULE_REGISTER_REQUEST:
register_module_name(self,*((char*)current->request.request));
free(request.request);
register_module_name(self,(char*)current->request.request);
free(current->request.request);
break;

default:
Expand Down Expand Up @@ -678,8 +678,8 @@ static peer* new_peer() {
new->requests = new_BANG_requests();
new->my_modules_len = 0;
new->remote_modules_len = 0;
pthread_mutex_init(&(new->remote_modules_lock));
pthread_mutex_init(&(new->my_modules_lock));
pthread_mutex_init(&(new->remote_modules_lock),NULL);
pthread_mutex_init(&(new->my_modules_lock),NULL);
return new;
}

Expand Down
13 changes: 3 additions & 10 deletions src/base/bang-signals.c
Expand Up @@ -7,6 +7,7 @@
* no particular order.
*/
#include"bang-signals.h"
#include"bang-utils.h"
#include"bang-types.h"
#include<errno.h>
#include<pthread.h>
Expand Down Expand Up @@ -51,19 +52,11 @@ static void recursive_sig_free(signal_node *head) {
}

static void acquire_sig_lock(int signal) {
pthread_mutex_lock(&send_sig_lock[signal]);
if (sig_senders[signal] == 0)
pthread_mutex_lock(&add_handler_lock[signal]);
++sig_senders[signal];
pthread_mutex_unlock(&send_sig_lock[signal]);
BANG_acquire_read_lock(&(sig_senders[signal]),&(send_sig_lock[signal]),&(add_handler_lock[signal]));
}

static void release_sig_lock(int signal) {
pthread_mutex_lock(&send_sig_lock[signal]);
--sig_senders[signal];
if (sig_senders[signal] == 0)
pthread_mutex_unlock(&add_handler_lock[signal]);
pthread_mutex_unlock(&send_sig_lock[signal]);
BANG_release_read_lock(&(sig_senders[signal]),&(send_sig_lock[signal]),&(add_handler_lock[signal]));
}

void BANG_sig_init() {
Expand Down
4 changes: 3 additions & 1 deletion src/base/bang-utils.c
@@ -1,8 +1,10 @@
#include"bang-utils.h"
#include<string.h>

int BANG_module_name_cmp(const char *m1, const char *m2) {
int cmp = strcmp(m1,m2);
int length = strlen(m1),
length2 = strlent(m2);
length2 = strlen(m2);
cmp += m1[length + 1] - m2[length2 + 1];
cmp += m1[length + 2] - m2[length2 + 2];
cmp += m1[length + 3] - m2[length2 + 3];
Expand Down
1 change: 1 addition & 0 deletions src/base/bang-utils.h
@@ -1,5 +1,6 @@
#ifndef __BANG_UTILS_H
#define __BANG_UTILS_H
#include<pthread.h>
int BANG_module_name_cmp(const char *m1, const char *m2);
void BANG_acquire_read_lock(int *readers, pthread_mutex_t *readers_lock, pthread_mutex_t *writers_lock);
void BANG_release_read_lock(int *readers, pthread_mutex_t *readers_lock, pthread_mutex_t *writers_lock);
Expand Down

0 comments on commit 1681241

Please sign in to comment.