X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aft.c;fp=aft.c;h=c8c98e7ab679b5a5254eed9405afa3cca6cf870e;hb=2176cbf10d8f3815f0a17bcc35e4d2e79440d26c;hp=b358c96cd9afd23bfa7f043c8add8bbf8b4bfade;hpb=fed61968a113bd37b196bb86d9f2591d53b15162;p=paraslash.git

diff --git a/aft.c b/aft.c
index b358c96c..c8c98e7a 100644
--- a/aft.c
+++ b/aft.c
@@ -1024,7 +1024,14 @@ out:
 /**
  * Open the audio file with highest score and set up an afd structure.
  *
- * \param afd Result pointer.
+ * This determines and opens the next audio file, verifies that it did not
+ * change by comparing the recomputed the hash value of the file contents
+ * against the value stored in the audio file table. If all goes well, it
+ * creates a shared memory area containing the serialized version of the afd
+ * structure, including the chunk table, if any. The caller can then send the
+ * ID of this area and the open fd to the server process.
+ *
+ * \param fd Result pointer for the file descriptor of the audio file.
  *
  * On success, the numplayed field of the audio file selector info is increased
  * and the lastplayed time is set to the current time. Finally, the score of
@@ -1032,7 +1039,7 @@ out:
  *
  * \return Positive shmid on success, negative on errors.
  */
-int open_and_update_audio_file(struct audio_file_data *afd)
+int open_and_update_audio_file(int *fd)
 {
 	unsigned char file_hash[HASH_SIZE];
 	struct osl_object afsi_obj;
@@ -1042,6 +1049,7 @@ int open_and_update_audio_file(struct audio_file_data *afd)
 	struct osl_object map, chunk_table_obj;
 	struct ls_data *d = &status_item_ls_data;
 	unsigned char *tmp_hash;
+	struct audio_file_data afd;
 again:
 	ret = score_get_best(&current_aft_row, &d->score);
 	if (ret < 0)
@@ -1074,11 +1082,11 @@ again:
 	ret = load_afsi(&d->afsi, &afsi_obj);
 	if (ret < 0)
 		return ret;
-	ret = get_afhi_of_row(current_aft_row, &afd->afhi);
+	ret = get_afhi_of_row(current_aft_row, &afd.afhi);
 	if (ret < 0)
 		return ret;
-	d->afhi = afd->afhi;
-	d->afhi.chunk_table = afd->afhi.chunk_table = NULL;
+	d->afhi = afd.afhi;
+	d->afhi.chunk_table = afd.afhi.chunk_table = NULL;
 	ret = osl(osl_open_disk_object(audio_file_table, current_aft_row,
 		AFTCOL_CHUNKS, &chunk_table_obj));
 	if (ret < 0) {
@@ -1090,7 +1098,7 @@ again:
 	} else {
 		PARA_INFO_LOG("chunk table: %zu bytes\n", chunk_table_obj.size);
 	}
-	ret = mmap_full_file(d->path, O_RDONLY, &map.data, &map.size, &afd->fd);
+	ret = mmap_full_file(d->path, O_RDONLY, &map.data, &map.size, fd);
 	if (ret < 0)
 		goto out;
 	hash_function(map.data, map.size, file_hash);
@@ -1105,8 +1113,8 @@ again:
 	new_afsi.last_played = time(NULL);
 	save_afsi(&new_afsi, &afsi_obj); /* in-place update */
 
-	afd->audio_format_id = d->afsi.audio_format_id;
-	load_chunk_table(&afd->afhi, &chunk_table_obj);
+	afd.audio_format_id = d->afsi.audio_format_id;
+	load_chunk_table(&afd.afhi, &chunk_table_obj);
 	aced.aft_row = current_aft_row;
 	aced.old_afsi = &d->afsi;
 	/*
@@ -1116,9 +1124,9 @@ again:
 	ret = afs_event(AFSI_CHANGE, NULL, &aced);
 	if (ret < 0)
 		goto out;
-	ret = save_afd(afd);
+	ret = save_afd(&afd);
 out:
-	free(afd->afhi.chunk_table);
+	free(afd.afhi.chunk_table);
 	if (chunk_table_obj.data)
 		osl_close_disk_object(&chunk_table_obj);
 	if (ret < 0) {