X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=02b6b56db561d5a7ef2f9464dc2c1f1c54f35fec;hp=bc42026e460ac7ba5f38f992ae17e1f18a3c5ce9;hb=9692b4241bc316665bd5b6810ea8af83057a0a89;hpb=63b57e3e60923cea4e3e1808e3133789db2dc83a

diff --git a/afs.c b/afs.c
index bc42026e..02b6b56d 100644
--- a/afs.c
+++ b/afs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -75,6 +75,7 @@ struct command_task {
 	struct task task;
 };
 
+extern int mmd_mutex;
 extern struct misc_meta_data *mmd;
 
 static int server_socket;
@@ -571,15 +572,15 @@ static int activate_mood_or_playlist(char *arg, int *num_admissible)
 		free(current_mop);
 		if (arg) {
 			current_mop = para_strdup(arg);
-			mmd_lock();
+			mutex_lock(mmd_mutex);
 			strncpy(mmd->afs_mode_string, arg,
 				sizeof(mmd->afs_mode_string));
 			mmd->afs_mode_string[sizeof(mmd->afs_mode_string) - 1] = '\0';
-			mmd_unlock();
+			mutex_unlock(mmd_mutex);
 		} else {
-			mmd_lock();
+			mutex_lock(mmd_mutex);
 			strcpy(mmd->afs_mode_string, "dummy");
-			mmd_unlock();
+			mutex_unlock(mmd_mutex);
 			current_mop = NULL;
 		}
 	}
@@ -891,7 +892,7 @@ static int call_callback(int fd, int query_shmid)
 	query.data = (char *)query_shm + sizeof(*cq);
 	query.size = cq->query_size;
 	cq->handler(fd, &query);
-	return 1;
+	return shm_detach(query_shm);
 }
 
 static int execute_server_command(void)
@@ -1022,7 +1023,7 @@ static void register_command_task(uint32_t cookie)
  */
 __noreturn void afs_init(uint32_t cookie, int socket_fd)
 {
-	struct sched s;
+	static struct sched s;
 	int i, ret;
 
 	register_signal_task();
@@ -1104,7 +1105,7 @@ int com_init(int fd, int argc, char * const * const argv)
 				return -E_BAD_TABLE_NAME;
 		}
 	}
-	ret = send_callback_request(create_tables_callback, &query, NULL, NULL);
+	ret = send_callback_request(create_tables_callback, &query, &send_result, &fd);
 	if (ret < 0)
 		return send_va_buffer(fd, "%s\n", para_strerror(-ret));
 	return ret;
@@ -1184,7 +1185,8 @@ void afs_event(enum afs_events event, struct para_buffer *pb,
 			continue;
 		ret = t->event_handler(event, pb, data);
 		if (ret < 0)
-			PARA_CRIT_LOG("%s\n", para_strerror(-ret));
+			PARA_CRIT_LOG("table %s, event %d: %s\n", t->name,
+				event, para_strerror(-ret));
 	}
 }