X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=5d4e64773e8a7e7011ef88bb69771a21bd285a1b;hp=15769d55498b9b5ad6aa11f86efdebde31afc417;hb=f14e5c15c82d4bf3b7ea611eab6bce95d4767b61;hpb=e2167286448ce2ed9a01a548e7e9832563035088

diff --git a/aft.c b/aft.c
index 15769d55..5d4e6477 100644
--- a/aft.c
+++ b/aft.c
@@ -42,6 +42,7 @@ struct ls_data {
  */
 static struct osl_table *audio_file_table; /* NULL if table not open */
 static struct osl_row *current_aft_row; /* NULL if no audio file open */
+static unsigned char current_hash[HASH_SIZE]; /* only used on sighup */
 
 static char *status_items;
 static char *parser_friendly_status_items;
@@ -2479,28 +2480,30 @@ int aft_check_attributes(uint64_t att_mask, struct para_buffer *pb)
 	return audio_file_loop(&acad, check_atts_of_audio_file);
 }
 
-/**
- * Close the audio file table.
- *
- * \param flags Usual flags that are passed to osl_close_table().
- *
- * \sa \ref osl_close_table().
+/*
+ * This sets audio_file_table to NULL, but leaves current_aft_row unmodified,
+ * though stale (pointing to unmapped memory). If the table is being closed
+ * because we received SIGHUP, the table will be reopened after the config file
+ * has been reloaded. We remember the hash of the current audio file here so
+ * that aft_open() can initialize current_aft_row by looking up the saved hash.
  */
 static void aft_close(void)
 {
+	int ret;
+	unsigned char *p;
+
+	if (current_aft_row) {
+		ret = get_hash_of_row(current_aft_row, &p);
+		if (ret < 0) {
+			PARA_WARNING_LOG("hash lookup failure\n");
+			current_aft_row = NULL;
+		} else
+			memcpy(current_hash, p, HASH_SIZE);
+	}
 	osl_close_table(audio_file_table, OSL_MARK_CLEAN);
 	audio_file_table = NULL;
 }
 
-/**
- * Open the audio file table.
- *
- * \param dir The database directory.
- *
- * \return Standard.
- *
- * \sa \ref osl_open_table().
- */
 static int aft_open(const char *dir)
 {
 	int ret;
@@ -2511,7 +2514,20 @@ static int aft_open(const char *dir)
 		unsigned num;
 		osl_get_num_rows(audio_file_table, &num);
 		PARA_INFO_LOG("audio file table contains %u files\n", num);
-		return ret;
+		if (!current_aft_row) {
+			PARA_DEBUG_LOG("no current aft row\n");
+			return 1;
+		}
+		/* SIGHUP case, update current_aft_row */
+		ret = aft_get_row_of_hash(current_hash, &current_aft_row);
+		if (ret < 0) { /* not fatal */
+			PARA_WARNING_LOG("current hash lookup failure: %s\n",
+				para_strerror(-ret));
+			current_aft_row = NULL;
+			return 1;
+		}
+		PARA_NOTICE_LOG("current audio file hash lookup: success\n");
+		return 1;
 	}
 	PARA_NOTICE_LOG("failed to open audio file table\n");
 	audio_file_table = NULL;
@@ -2567,6 +2583,16 @@ static int aft_event_handler(enum afs_events event, struct para_buffer *pb,
 		status_item_ls_data.afsi.last_played = old_last_played;
 		make_status_items();
 		return 1;
+	} case AUDIO_FILE_RENAME: {
+		char *path;
+		if (data != current_aft_row)
+			return 0;
+		ret = get_audio_file_path_of_row(current_aft_row, &path);
+		if (ret < 0)
+			return ret;
+		status_item_ls_data.path = path;
+		make_status_items();
+		return 1;
 	} case AFHI_CHANGE: {
 		if (data != current_aft_row)
 			return 0;
@@ -2575,6 +2601,10 @@ static int aft_event_handler(enum afs_events event, struct para_buffer *pb,
 			return ret;
 		make_status_items();
 		return 1;
+	} case AUDIO_FILE_REMOVE: {
+		if (data == current_aft_row)
+			current_aft_row = NULL;
+		return 0;
 	}
 	case BLOB_RENAME:
 	case BLOB_REMOVE: