X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=63a40d790f602c81d6f28e71e02b6d46d907cd5d;hp=3190a9bafa5e4fdd0ef750f3fcf4160057ce7ddf;hb=b1c682279994fd35a590a925a0f51647771d2002;hpb=27b5b500c5fac0660d0ef0eaf1bea81a091300cc

diff --git a/aft.c b/aft.c
index 3190a9ba..63a40d79 100644
--- a/aft.c
+++ b/aft.c
@@ -138,7 +138,7 @@ struct ls_options {
 /**
  * Describes the layout of the mmapped-afs info struct.
  *
- * \sa struct afs_info.
+ * \sa struct \ref afs_info.
  */
 enum afsi_offsets {
 	/** Where .last_played is stored. */
@@ -167,7 +167,7 @@ enum afsi_offsets {
  * \param afsi Pointer to the audio file info to be converted.
  * \param obj Result pointer.
  *
- * \sa load_afsi().
+ * \sa \ref load_afsi().
  */
 static void save_afsi(struct afs_info *afsi, struct osl_object *obj)
 {
@@ -192,7 +192,7 @@ static void save_afsi(struct afs_info *afsi, struct osl_object *obj)
  *
  * \return Standard.
  *
- * \sa save_afsi().
+ * \sa \ref save_afsi().
  */
 static int load_afsi(struct afs_info *afsi, struct osl_object *obj)
 {
@@ -320,8 +320,8 @@ enum afhi_offsets {
 	CHUNKS_TOTAL_OFFSET = 20,
 	/** The length of the audio file header (4 bytes). */
 	HEADER_LEN_OFFSET = 24,
-	/** Was: The start of the audio file header (4 bytes). */
-	AFHI_UNUSED2_OFFSET = 28,
+	/** Size of the largest chunk in bytes. (4 bytes). */
+	AFHI_MAX_CHUNK_SIZE_OFFSET = 28,
 	/** The seconds part of the chunk time (4 bytes). */
 	CHUNK_TV_TV_SEC_OFFSET = 32,
 	/** The microseconds part of the chunk time (4 bytes). */
@@ -361,11 +361,14 @@ static void save_afhi(struct afh_info *afhi, char *buf)
 	write_u8(buf + AFHI_CHANNELS_OFFSET, afhi->channels);
 	write_u32(buf + CHUNKS_TOTAL_OFFSET, afhi->chunks_total);
 	write_u32(buf + HEADER_LEN_OFFSET, afhi->header_len);
-	write_u32(buf + AFHI_UNUSED2_OFFSET, 0);
+	write_u32(buf + AFHI_MAX_CHUNK_SIZE_OFFSET, afhi->max_chunk_size);
 	write_u32(buf + CHUNK_TV_TV_SEC_OFFSET, afhi->chunk_tv.tv_sec);
 	write_u32(buf + CHUNK_TV_TV_USEC_OFFSET, afhi->chunk_tv.tv_usec);
 	p = buf + AFHI_INFO_STRING_OFFSET;
-	/* The sprintf's below are OK as our caller made sure that buf is large enough */
+	/*
+	 * The below sprintf(3) calls are OK because our caller already made
+	 * sure that buf is large enough.
+	 */
 	p += sprintf(p, "%s", afhi->techinfo) + 1;
 	p += sprintf(p, "%s", afhi->tags.artist) + 1;
 	p += sprintf(p, "%s", afhi->tags.title) + 1;
@@ -374,6 +377,7 @@ static void save_afhi(struct afh_info *afhi, char *buf)
 	sprintf(p, "%s", afhi->tags.comment);
 }
 
+/* does not load the chunk table */
 static void load_afhi(const char *buf, struct afh_info *afhi)
 {
 	afhi->seconds_total = read_u32(buf + AFHI_SECONDS_TOTAL_OFFSET);
@@ -383,6 +387,7 @@ static void load_afhi(const char *buf, struct afh_info *afhi)
 	afhi->channels = read_u8(buf + AFHI_CHANNELS_OFFSET);
 	afhi->chunks_total = read_u32(buf + CHUNKS_TOTAL_OFFSET);
 	afhi->header_len = read_u32(buf + HEADER_LEN_OFFSET);
+	afhi->max_chunk_size = read_u32(buf + AFHI_MAX_CHUNK_SIZE_OFFSET);
 	afhi->chunk_tv.tv_sec = read_u32(buf + CHUNK_TV_TV_SEC_OFFSET);
 	afhi->chunk_tv.tv_usec = read_u32(buf + CHUNK_TV_TV_USEC_OFFSET);
 	afhi->techinfo = (char *)buf + AFHI_INFO_STRING_OFFSET;
@@ -393,42 +398,37 @@ static void load_afhi(const char *buf, struct afh_info *afhi)
 	afhi->tags.comment = afhi->tags.album + strlen(afhi->tags.album) + 1;
 }
 
+/* Only used for saving the chunk table, but not for loading. */
 static unsigned sizeof_chunk_table(struct afh_info *afhi)
 {
-	if (!afhi)
+	if (!afhi || !afhi->chunk_table)
 		return 0;
 	return 4 * (afhi->chunks_total + 1);
 }
 
-static uint32_t save_chunk_table(struct afh_info *afhi, char *buf)
+static void save_chunk_table(struct afh_info *afhi, char *buf)
 {
-	int i;
-	uint32_t max = 0, old = 0;
-
-	for (i = 0; i <= afhi->chunks_total; i++) {
-		uint32_t val = afhi->chunk_table[i];
-		write_u32(buf + 4 * i, val);
-		/*
-		 * If the first chunk is the header, do not consider it for the
-		 * calculation of the largest chunk size.
-		 */
-		if (i == 0 || (i == 1 && afhi->header_len > 0)) {
-			old = val;
-			continue;
-		}
-		max = PARA_MAX(max, val - old);
-		old = val;
-	}
-	return max;
+	uint32_t n;
+
+	if (!afhi->chunk_table)
+		return;
+	for (n = 0; n <= afhi->chunks_total; n++)
+		write_u32(buf + 4 * n, afhi->chunk_table[n]);
 }
 
-static void load_chunk_table(struct afh_info *afhi, char *buf)
+static void load_chunk_table(struct afh_info *afhi, const struct osl_object *ct)
 {
 	int i;
+	size_t sz;
 
-	afhi->chunk_table = para_malloc(sizeof_chunk_table(afhi));
-	for (i = 0; i <= afhi->chunks_total; i++)
-		afhi->chunk_table[i] = read_u32(buf + 4 * i);
+	if (!ct->data || ct->size < 4) {
+		afhi->chunk_table = NULL;
+		return;
+	}
+	sz  = PARA_MIN(((size_t)afhi->chunks_total + 1) * 4, ct->size) + 1;
+	afhi->chunk_table = para_malloc(sz);
+	for (i = 0; i <= afhi->chunks_total && i * 4 + 3 < ct->size; i++)
+		afhi->chunk_table[i] = read_u32(ct->data + 4 * i);
 }
 
 /**
@@ -532,7 +532,7 @@ static int get_afsi_of_path(const char *path, struct afs_info *afsi)
  * \param row Pointer to a row in the audio file table.
  * \param path Result pointer.
  *
- * The result is a pointer to mmapped data. The caller must not attempt
+ * The result is a pointer to memory-mapped data. The caller must not attempt
  * to free it.
  *
  * \return Standard.
@@ -556,7 +556,7 @@ int get_audio_file_path_of_row(const struct osl_row *row, char **path)
  *
  * \return The return value of the underlying call to osl_get_object().
  *
- * \sa get_hash_of_row().
+ * \sa \ref get_hash_of_row().
  */
 static int get_hash_object_of_aft_row(const struct osl_row *row,
 		struct osl_object *obj)
@@ -594,7 +594,9 @@ static int get_hash_of_row(const struct osl_row *row, unsigned char **hash)
  *
  * \return The return value of the underlying call to osl_get_object().
  *
- * \sa get_chunk_table_of_row().
+ * After the call the members of the afhi structure point to mapped memory
+ * which is owned by the osl table, Hence the caller must not attempt to free
+ * this memory by calling \ref clear_afhi().
  */
 int get_afhi_of_row(const struct osl_row *row, struct afh_info *afhi)
 {
@@ -623,7 +625,13 @@ static int save_afd(struct audio_file_data *afd)
 		goto err;
 	buf = shm_afd;
 	buf += sizeof(*afd);
-	afd->max_chunk_size = save_chunk_table(&afd->afhi, buf);
+	save_chunk_table(&afd->afhi, buf);
+	if (afd->afhi.max_chunk_size == 0) { /* v0.5.x on-disk afhi */
+		set_max_chunk_size(&afd->afhi);
+		PARA_NOTICE_LOG("max chunk size unset, re-add required\n");
+	} else
+		PARA_INFO_LOG("using max chunk size from afhi\n");
+	afd->max_chunk_size = afd->afhi.max_chunk_size;
 	*(struct audio_file_data *)shm_afd = *afd;
 	shm_detach(shm_afd);
 	return shmid;
@@ -648,14 +656,22 @@ int load_afd(int shmid, struct audio_file_data *afd)
 {
 	void *shm_afd;
 	int ret;
+	struct osl_object obj;
 
 	ret = shm_attach(shmid, ATTACH_RO, &shm_afd);
 	if (ret < 0)
 		return ret;
+	ret = shm_size(shmid, &obj.size);
+	if (ret < 0)
+		goto detach;
 	*afd = *(struct audio_file_data *)shm_afd;
-	load_chunk_table(&afd->afhi, shm_afd + sizeof(*afd));
+	obj.data = shm_afd + sizeof(*afd);
+	obj.size -= sizeof(*afd);
+	load_chunk_table(&afd->afhi, &obj);
+	ret = 1;
+detach:
 	shm_detach(shm_afd);
-	return 1;
+	return ret;
 }
 
 static int get_local_time(uint64_t *seconds, char *buf, size_t size,
@@ -684,7 +700,7 @@ static int get_local_time(uint64_t *seconds, char *buf, size_t size,
 	/*
 	 * If the given time is more than six month away from the current time,
 	 * we print only the year. The additional space character in the format
-	 * string below makes the formated date align nicely with dates that
+	 * string below makes the formatted date align nicely with dates that
 	 * contain the time (those written by the above strftime() statement).
 	 */
 	if (!strftime(buf, size, "%b %e  %Y", tm))
@@ -805,7 +821,11 @@ static int print_chunk_table(struct ls_data *d, struct para_buffer *b)
 		(long unsigned) d->afhi.chunk_tv.tv_usec
 	);
 	buf = chunk_table_obj.data;
-	for (i = 0; i <= d->afhi.chunks_total; i++)
+	for (
+		i = 0;
+		i <= d->afhi.chunks_total && 4 * i + 3 < chunk_table_obj.size;
+		i++
+	)
 		para_printf(b, "%u ", (unsigned) read_u32(buf + 4 * i));
 	para_printf(b, "\n");
 	ret = 1;
@@ -915,6 +935,8 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 	WRITE_STATUS_ITEM(b, SI_CHUNK_TIME, "%lu\n", tv2ms(&afhi->chunk_tv));
 	WRITE_STATUS_ITEM(b, SI_NUM_CHUNKS, "%" PRIu32 "\n",
 		afhi->chunks_total);
+	WRITE_STATUS_ITEM(b, SI_MAX_CHUNK_SIZE, "%" PRIu32 "\n",
+		afhi->max_chunk_size);
 	WRITE_STATUS_ITEM(b, SI_TECHINFO, "%s\n", afhi->techinfo);
 	WRITE_STATUS_ITEM(b, SI_ARTIST, "%s\n", afhi->tags.artist);
 	WRITE_STATUS_ITEM(b, SI_TITLE, "%s\n", afhi->tags.title);
@@ -1039,8 +1061,15 @@ again:
 	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)
-		return ret;
+	if (ret < 0) {
+		if (!afh_supports_dynamic_chunks(d->afsi.audio_format_id))
+			return ret;
+		PARA_INFO_LOG("no chunk table for %s\n", d->path);
+		chunk_table_obj.data = NULL;
+		chunk_table_obj.size = 0;
+	} 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);
 	if (ret < 0)
 		goto out;
@@ -1057,7 +1086,7 @@ again:
 	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.data);
+	load_chunk_table(&afd->afhi, &chunk_table_obj);
 	aced.aft_row = current_aft_row;
 	aced.old_afsi = &d->afsi;
 	/*
@@ -1070,7 +1099,8 @@ again:
 	ret = save_afd(afd);
 out:
 	free(afd->afhi.chunk_table);
-	osl_close_disk_object(&chunk_table_obj);
+	if (chunk_table_obj.data)
+		osl_close_disk_object(&chunk_table_obj);
 	if (ret < 0) {
 		PARA_ERROR_LOG("%s: %s\n", d->path, para_strerror(-ret));
 		ret = score_delete(current_aft_row);
@@ -1080,6 +1110,12 @@ out:
 	return ret;
 }
 
+static int ls_hash_compare(const void *a, const void *b)
+{
+	struct ls_data *d1 = *(struct ls_data **)a, *d2 = *(struct ls_data **)b;
+	return memcmp(d1->hash, d2->hash, HASH_SIZE);
+}
+
 static int ls_audio_format_compare(const void *a, const void *b)
 {
 	struct ls_data *d1 = *(struct ls_data **)a, *d2 = *(struct ls_data **)b;
@@ -1197,6 +1233,8 @@ static int sort_matching_paths(struct ls_options *options)
 		compar = ls_duration_compare; break;
 	case LS_SORT_BY_AUDIO_FORMAT:
 		compar = ls_audio_format_compare; break;
+	case LS_SORT_BY_HASH:
+		compar = ls_hash_compare; break;
 	default:
 		return -E_BAD_SORT;
 	}
@@ -1345,7 +1383,6 @@ out:
 	return ret;
 }
 
-/* TODO: flags -h (sort by hash) */
 static int com_ls(struct command_context *cc, struct lls_parse_result *lpr)
 {
 	const struct lls_command *cmd = SERVER_CMD_CMD_PTR(LS);
@@ -1411,6 +1448,8 @@ static int com_ls(struct command_context *cc, struct lls_parse_result *lpr)
 			opts->sorting = LS_SORT_BY_DURATION;
 		else if (!strcmp(val, "a") || !strcmp(val, "audio-format"))
 			opts->sorting = LS_SORT_BY_AUDIO_FORMAT;
+		else if (!strcmp(val, "h") || !strcmp(val, "hash"))
+			opts->sorting = LS_SORT_BY_HASH;
 		else {
 			ret = -E_AFT_SYNTAX;
 			goto out;
@@ -1672,6 +1711,7 @@ static int com_add_callback(struct afs_callback_arg *aca)
 			&objs[AFTCOL_AFHI]));
 		if (ret < 0)
 			goto out;
+		/* truncate the file to size zero if there is no chunk table */
 		ret = osl(osl_update_object(audio_file_table, row, AFTCOL_CHUNKS,
 			&objs[AFTCOL_CHUNKS]));
 		if (ret < 0)
@@ -1882,11 +1922,7 @@ out:
 }
 EXPORT_SERVER_CMD_HANDLER(add);
 
-/**
- * Flags used by the touch command.
- *
- * \sa com_touch().
- */
+/** Flags used by the touch command. */
 enum touch_flags {
 	/** Whether the \p FNM_PATHNAME flag should be passed to fnmatch(). */
 	TOUCH_FLAG_FNM_PATHNAME = 1,
@@ -2112,7 +2148,9 @@ static int copy_selector_info(__a_unused struct osl_table *table,
 	ret = get_afsi_object_of_row(row, &target_afsi_obj);
 	if (ret < 0)
 		return ret;
-	load_afsi(&target_afsi, &target_afsi_obj);
+	ret = load_afsi(&target_afsi, &target_afsi_obj);
+	if (ret < 0)
+		return ret;
 	old_afsi = target_afsi;
 	if (cad->copy_all || y_given)
 		target_afsi.lyrics_id = cad->source_afsi.lyrics_id;
@@ -2370,8 +2408,6 @@ static int check_audio_file(struct osl_row *row, void *data)
  * \param aca Only ->pbout is used for diagnostics.
  *
  * \return Standard. Inconsistencies are reported but not regarded as an error.
- *
- * \sa com_check().
  */
 int aft_check_callback(struct afs_callback_arg *aca)
 {
@@ -2440,7 +2476,7 @@ int aft_check_attributes(uint64_t att_mask, struct para_buffer *pb)
  *
  * \param flags Usual flags that are passed to osl_close_table().
  *
- * \sa osl_close_table().
+ * \sa \ref osl_close_table().
  */
 static void aft_close(void)
 {
@@ -2455,7 +2491,7 @@ static void aft_close(void)
  *
  * \return Standard.
  *
- * \sa osl_open_table().
+ * \sa \ref osl_open_table().
  */
 static int aft_open(const char *dir)
 {