X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fsession.c;h=c84edcbfdb27ed0c9119727dbf00ba2c5db40b07;hb=be64f90b53d09d9720dc6e06ff8ab61d96c03932;hp=0035a7844f327f6ed0b8172222d9c5cf6b95241c;hpb=5de0fc55a6ac8da084caf427f6131482a40855dc;p=libsigrok.git

diff --git a/src/session.c b/src/session.c
index 0035a784..c84edcbf 100644
--- a/src/session.c
+++ b/src/session.c
@@ -556,41 +556,38 @@ static int verify_trigger(struct sr_trigger *trigger)
  */
 static int set_main_context(struct sr_session *session)
 {
-	GMainContext *def_context;
+	GMainContext *main_context;
+
+	g_mutex_lock(&session->main_mutex);
 
 	/* May happen if sr_session_start() is called a second time
 	 * while the session is still running.
 	 */
 	if (session->main_context) {
 		sr_err("Main context already set.");
+
+		g_mutex_unlock(&session->main_mutex);
 		return SR_ERR;
 	}
-
-	g_mutex_lock(&session->main_mutex);
-
-	def_context = g_main_context_get_thread_default();
-
-	if (!def_context)
-		def_context = g_main_context_default();
+	main_context = g_main_context_ref_thread_default();
 	/*
 	 * Try to use an existing main context if possible, but only if we
 	 * can make it owned by the current thread. Otherwise, create our
 	 * own main context so that event source callbacks can execute in
 	 * the session thread.
 	 */
-	if (g_main_context_acquire(def_context)) {
-		g_main_context_release(def_context);
+	if (g_main_context_acquire(main_context)) {
+		g_main_context_release(main_context);
 
 		sr_dbg("Using thread-default main context.");
-
-		session->main_context = def_context;
-		session->main_context_is_default = TRUE;
 	} else {
-		sr_dbg("Creating our own main context.");
+		g_main_context_unref(main_context);
 
-		session->main_context = g_main_context_new();
-		session->main_context_is_default = FALSE;
+		sr_dbg("Creating our own main context.");
+		main_context = g_main_context_new();
 	}
+	session->main_context = main_context;
+
 	g_mutex_unlock(&session->main_mutex);
 
 	return SR_OK;
@@ -611,9 +608,7 @@ static int unset_main_context(struct sr_session *session)
 	g_mutex_lock(&session->main_mutex);
 
 	if (session->main_context) {
-		if (!session->main_context_is_default)
-			g_main_context_unref(session->main_context);
-
+		g_main_context_unref(session->main_context);
 		session->main_context = NULL;
 		ret = SR_OK;
 	} else {
@@ -1005,8 +1000,8 @@ SR_API int sr_session_stopped_callback_set(struct sr_session *session,
 static void datafeed_dump(const struct sr_datafeed_packet *packet)
 {
 	const struct sr_datafeed_logic *logic;
+	const struct sr_datafeed_analog_old *analog_old;
 	const struct sr_datafeed_analog *analog;
-	const struct sr_datafeed_analog2 *analog2;
 
 	/* Please use the same order as in libsigrok.h. */
 	switch (packet->type) {
@@ -1027,10 +1022,10 @@ static void datafeed_dump(const struct sr_datafeed_packet *packet)
 		sr_dbg("bus: Received SR_DF_LOGIC packet (%" PRIu64 " bytes, "
 		       "unitsize = %d).", logic->length, logic->unitsize);
 		break;
-	case SR_DF_ANALOG:
-		analog = packet->payload;
-		sr_dbg("bus: Received SR_DF_ANALOG packet (%d samples).",
-		       analog->num_samples);
+	case SR_DF_ANALOG_OLD:
+		analog_old = packet->payload;
+		sr_dbg("bus: Received SR_DF_ANALOG_OLD packet (%d samples).",
+		       analog_old->num_samples);
 		break;
 	case SR_DF_FRAME_BEGIN:
 		sr_dbg("bus: Received SR_DF_FRAME_BEGIN packet.");
@@ -1038,10 +1033,10 @@ static void datafeed_dump(const struct sr_datafeed_packet *packet)
 	case SR_DF_FRAME_END:
 		sr_dbg("bus: Received SR_DF_FRAME_END packet.");
 		break;
-	case SR_DF_ANALOG2:
-		analog2 = packet->payload;
-		sr_dbg("bus: Received SR_DF_ANALOG2 packet (%d samples).",
-		       analog2->num_samples);
+	case SR_DF_ANALOG:
+		analog = packet->payload;
+		sr_dbg("bus: Received SR_DF_ANALOG packet (%d samples).",
+		       analog->num_samples);
 		break;
 	default:
 		sr_dbg("bus: Received unknown packet type: %d.", packet->type);
@@ -1086,6 +1081,43 @@ SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
 		return SR_ERR_BUG;
 	}
 
+	if (packet->type == SR_DF_ANALOG_OLD) {
+		/* Convert to SR_DF_ANALOG. */
+		const struct sr_datafeed_analog_old *analog_old = packet->payload;
+		struct sr_analog_encoding encoding;
+		struct sr_analog_meaning meaning;
+		struct sr_analog_spec spec;
+		struct sr_datafeed_analog analog;
+		struct sr_datafeed_packet new_packet;
+		new_packet.type = SR_DF_ANALOG;
+		new_packet.payload = &analog;
+		analog.data = analog_old->data;
+		analog.num_samples = analog_old->num_samples;
+		analog.encoding = &encoding;
+		analog.meaning = &meaning;
+		analog.spec = &spec;
+		encoding.unitsize = sizeof(float);
+		encoding.is_signed = TRUE;
+		encoding.is_float = TRUE;
+#ifdef WORDS_BIGENDIAN
+		encoding.is_bigendian = TRUE;
+#else
+		encoding.is_bigendian = FALSE;
+#endif
+		encoding.digits = 0;
+		encoding.is_digits_decimal = FALSE;
+		encoding.scale.p = 1;
+		encoding.scale.q = 1;
+		encoding.offset.p = 0;
+		encoding.offset.q = 1;
+		meaning.mq = analog_old->mq;
+		meaning.unit = analog_old->unit;
+		meaning.mqflags = analog_old->mqflags;
+		meaning.channels = analog_old->channels;
+		spec.spec_digits = 0;
+		return sr_session_send(sdi, &new_packet);
+	}
+
 	/*
 	 * Pass the packet to the first transform module. If that returns
 	 * another packet (instead of NULL), pass that packet to the next
@@ -1137,10 +1169,13 @@ SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
  * @param session The session to use. Must not be NULL.
  * @param key The key which identifies the event source.
  * @param source An event source object. Must not be NULL.
+ *
  * @retval SR_OK Success.
  * @retval SR_ERR_ARG Invalid argument.
  * @retval SR_ERR_BUG Event source with @a key already installed.
  * @retval SR_ERR Other error.
+ *
+ * @private
  */
 SR_PRIV int sr_session_source_add_internal(struct sr_session *session,
 		void *key, GSource *source)
@@ -1197,8 +1232,9 @@ SR_PRIV int sr_session_fd_source_add(struct sr_session *session,
  * @retval SR_ERR_ARG Invalid argument.
  *
  * @since 0.3.0
+ * @private
  */
-SR_API int sr_session_source_add(struct sr_session *session, int fd,
+SR_PRIV int sr_session_source_add(struct sr_session *session, int fd,
 		int events, int timeout, sr_receive_data_callback cb, void *cb_data)
 {
 	if (fd < 0 && timeout < 0) {
@@ -1223,8 +1259,9 @@ SR_API int sr_session_source_add(struct sr_session *session, int fd,
  * @retval SR_ERR_ARG Invalid argument.
  *
  * @since 0.3.0
+ * @private
  */
-SR_API int sr_session_source_add_pollfd(struct sr_session *session,
+SR_PRIV int sr_session_source_add_pollfd(struct sr_session *session,
 		GPollFD *pollfd, int timeout, sr_receive_data_callback cb,
 		void *cb_data)
 {
@@ -1251,8 +1288,9 @@ SR_API int sr_session_source_add_pollfd(struct sr_session *session,
  * @retval SR_ERR_ARG Invalid argument.
  *
  * @since 0.3.0
+ * @private
  */
-SR_API int sr_session_source_add_channel(struct sr_session *session,
+SR_PRIV int sr_session_source_add_channel(struct sr_session *session,
 		GIOChannel *channel, int events, int timeout,
 		sr_receive_data_callback cb, void *cb_data)
 {
@@ -1283,6 +1321,8 @@ SR_API int sr_session_source_add_channel(struct sr_session *session,
  *
  * @retval SR_OK Success
  * @retval SR_ERR_BUG No event source for poll_object found.
+ *
+ * @private
  */
 SR_PRIV int sr_session_source_remove_internal(struct sr_session *session,
 		void *key)
@@ -1314,8 +1354,9 @@ SR_PRIV int sr_session_source_remove_internal(struct sr_session *session,
  * @retval SR_ERR_BUG Internal error.
  *
  * @since 0.3.0
+ * @private
  */
-SR_API int sr_session_source_remove(struct sr_session *session, int fd)
+SR_PRIV int sr_session_source_remove(struct sr_session *session, int fd)
 {
 	return sr_session_source_remove_internal(session, GINT_TO_POINTER(fd));
 }
@@ -1331,8 +1372,9 @@ SR_API int sr_session_source_remove(struct sr_session *session, int fd)
  *         internal errors.
  *
  * @since 0.2.0
+ * @private
  */
-SR_API int sr_session_source_remove_pollfd(struct sr_session *session,
+SR_PRIV int sr_session_source_remove_pollfd(struct sr_session *session,
 		GPollFD *pollfd)
 {
 	if (!pollfd) {
@@ -1353,8 +1395,9 @@ SR_API int sr_session_source_remove_pollfd(struct sr_session *session,
  * @return SR_ERR_BUG Internal error.
  *
  * @since 0.2.0
+ * @private
  */
-SR_API int sr_session_source_remove_channel(struct sr_session *session,
+SR_PRIV int sr_session_source_remove_channel(struct sr_session *session,
 		GIOChannel *channel)
 {
 	if (!channel) {
@@ -1375,6 +1418,8 @@ SR_API int sr_session_source_remove_channel(struct sr_session *session,
  * @retval SR_OK Success.
  * @retval SR_ERR_BUG Event source for @a key does not match @a source.
  * @retval SR_ERR Other error.
+ *
+ * @private
  */
 SR_PRIV int sr_session_source_destroyed(struct sr_session *session,
 		void *key, GSource *source)
@@ -1421,10 +1466,10 @@ SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet,
 	struct sr_datafeed_meta *meta_copy;
 	const struct sr_datafeed_logic *logic;
 	struct sr_datafeed_logic *logic_copy;
+	const struct sr_datafeed_analog_old *analog_old;
+	struct sr_datafeed_analog_old *analog_old_copy;
 	const struct sr_datafeed_analog *analog;
 	struct sr_datafeed_analog *analog_copy;
-	const struct sr_datafeed_analog2 *analog2;
-	struct sr_datafeed_analog2 *analog2_copy;
 	uint8_t *payload;
 
 	*copy = g_malloc0(sizeof(struct sr_datafeed_packet));
@@ -1454,36 +1499,36 @@ SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet,
 		memcpy(logic_copy->data, logic->data, logic->length * logic->unitsize);
 		(*copy)->payload = logic_copy;
 		break;
+	case SR_DF_ANALOG_OLD:
+		analog_old = packet->payload;
+		analog_old_copy = g_malloc(sizeof(analog_old));
+		analog_old_copy->channels = g_slist_copy(analog_old->channels);
+		analog_old_copy->num_samples = analog_old->num_samples;
+		analog_old_copy->mq = analog_old->mq;
+		analog_old_copy->unit = analog_old->unit;
+		analog_old_copy->mqflags = analog_old->mqflags;
+		analog_old_copy->data = g_malloc(analog_old->num_samples * sizeof(float));
+		memcpy(analog_old_copy->data, analog_old->data,
+				analog_old->num_samples * sizeof(float));
+		(*copy)->payload = analog_old_copy;
+		break;
 	case SR_DF_ANALOG:
 		analog = packet->payload;
 		analog_copy = g_malloc(sizeof(analog));
-		analog_copy->channels = g_slist_copy(analog->channels);
-		analog_copy->num_samples = analog->num_samples;
-		analog_copy->mq = analog->mq;
-		analog_copy->unit = analog->unit;
-		analog_copy->mqflags = analog->mqflags;
-		analog_copy->data = g_malloc(analog->num_samples * sizeof(float));
+		analog_copy->data = g_malloc(
+				analog->encoding->unitsize * analog->num_samples);
 		memcpy(analog_copy->data, analog->data,
-				analog->num_samples * sizeof(float));
-		(*copy)->payload = analog_copy;
-		break;
-	case SR_DF_ANALOG2:
-		analog2 = packet->payload;
-		analog2_copy = g_malloc(sizeof(analog2));
-		analog2_copy->data = g_malloc(
-				analog2->encoding->unitsize * analog2->num_samples);
-		memcpy(analog2_copy->data, analog2->data,
-				analog2->encoding->unitsize * analog2->num_samples);
-		analog2_copy->num_samples = analog2->num_samples;
-		analog2_copy->encoding = g_memdup(analog2->encoding,
+				analog->encoding->unitsize * analog->num_samples);
+		analog_copy->num_samples = analog->num_samples;
+		analog_copy->encoding = g_memdup(analog->encoding,
 				sizeof(struct sr_analog_encoding));
-		analog2_copy->meaning = g_memdup(analog2->meaning,
+		analog_copy->meaning = g_memdup(analog->meaning,
 				sizeof(struct sr_analog_meaning));
-		analog2_copy->meaning->channels = g_slist_copy(
-				analog2->meaning->channels);
-		analog2_copy->spec = g_memdup(analog2->spec,
+		analog_copy->meaning->channels = g_slist_copy(
+				analog->meaning->channels);
+		analog_copy->spec = g_memdup(analog->spec,
 				sizeof(struct sr_analog_spec));
-		(*copy)->payload = analog2_copy;
+		(*copy)->payload = analog_copy;
 		break;
 	default:
 		sr_err("Unknown packet type %d", packet->type);
@@ -1497,8 +1542,8 @@ void sr_packet_free(struct sr_datafeed_packet *packet)
 {
 	const struct sr_datafeed_meta *meta;
 	const struct sr_datafeed_logic *logic;
+	const struct sr_datafeed_analog_old *analog_old;
 	const struct sr_datafeed_analog *analog;
-	const struct sr_datafeed_analog2 *analog2;
 	struct sr_config *src;
 	GSList *l;
 
@@ -1526,19 +1571,19 @@ void sr_packet_free(struct sr_datafeed_packet *packet)
 		g_free(logic->data);
 		g_free((void *)packet->payload);
 		break;
+	case SR_DF_ANALOG_OLD:
+		analog_old = packet->payload;
+		g_slist_free(analog_old->channels);
+		g_free(analog_old->data);
+		g_free((void *)packet->payload);
+		break;
 	case SR_DF_ANALOG:
 		analog = packet->payload;
-		g_slist_free(analog->channels);
 		g_free(analog->data);
-		g_free((void *)packet->payload);
-		break;
-	case SR_DF_ANALOG2:
-		analog2 = packet->payload;
-		g_free(analog2->data);
-		g_free(analog2->encoding);
-		g_slist_free(analog2->meaning->channels);
-		g_free(analog2->meaning);
-		g_free(analog2->spec);
+		g_free(analog->encoding);
+		g_slist_free(analog->meaning->channels);
+		g_free(analog->meaning);
+		g_free(analog->spec);
 		g_free((void *)packet->payload);
 		break;
 	default: