demo: Rename GENMODE_DEFAULT to GENMODE_SIGROK.

[libsigrok.git] / session_driver.c

diff --git a/session_driver.c b/session_driver.c
index fa1b9065dac8c381744a97cff728b0127bd8fcef..9ad4fb8ab8678f8a7760f52ff89ddabdd13326eb 100644 (file)
--- a/session_driver.c
+++ b/session_driver.c
@@ -24,6 +24,7 @@
 #include <sys/time.h>
 #include <zip.h>
 #include <sigrok.h>
+#include <sigrok-internal.h>
 
 /* size of payloads sent across the session bus */
 #define CHUNKSIZE 4096
@@ -72,7 +73,7 @@ static int feed_chunk(int fd, int revents, void *user_data)
        fd = fd;
        revents = revents;
 
-       g_debug("session_driver: feed chunk");
+       sr_dbg("session_driver: feed chunk");
 
        got_data = FALSE;
        for (l = device_instances; l; l = l->next) {
@@ -82,7 +83,12 @@ static int feed_chunk(int fd, int revents, void *user_data)
                        /* already done with this instance */
                        continue;
 
-               buf = g_malloc(CHUNKSIZE);
+               if (!(buf = g_try_malloc(CHUNKSIZE))) {
+                       sr_err("session: %s: buf malloc failed", __func__);
+                       // return SR_ERR_MALLOC;
+                       return FALSE;
+               }
+
                ret = zip_fread(vdevice->capfile, buf, CHUNKSIZE);
                if (ret > 0) {
                        got_data = TRUE;
@@ -138,9 +144,12 @@ static int hw_opendev(int device_index)
                NULL, NULL, NULL);
        if (!sdi)
                return SR_ERR;
-       sdi->priv = g_malloc0(sizeof(struct session_vdevice));
-       if (!sdi->priv)
-               return SR_ERR;
+
+       if (!(sdi->priv = g_try_malloc0(sizeof(struct session_vdevice)))) {
+               sr_err("session: %s: sdi->priv malloc failed", __func__);
+               return SR_ERR_MALLOC;
+       }
+
        device_instances = g_slist_append(device_instances, sdi);
 
        return SR_OK;
@@ -225,35 +234,41 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        if (!(vdevice = get_vdevice_by_index(device_index)))
                return SR_ERR;
 
-       g_message("session_driver: opening archive %s file %s",
-                       sessionfile, vdevice->capturefile);
+       sr_info("session_driver: opening archive %s file %s", sessionfile,
+               vdevice->capturefile);
 
        if (!(vdevice->archive = zip_open(sessionfile, 0, &err))) {
-               g_warning("Failed to open session file '%s': zip error %d\n",
-                               sessionfile, err);
+               sr_warn("Failed to open session file '%s': zip error %d\n",
+                       sessionfile, err);
                return SR_ERR;
        }
 
        if (zip_stat(vdevice->archive, vdevice->capturefile, 0, &zs) == -1) {
-               g_warning("Failed to check capture file '%s' in session file '%s'.",
-                               vdevice->capturefile, sessionfile);
+               sr_warn("Failed to check capture file '%s' in session file '%s'.",
+                       vdevice->capturefile, sessionfile);
                return SR_ERR;
        }
 
        if (!(vdevice->capfile = zip_fopen(vdevice->archive, vdevice->capturefile, 0))) {
-               g_warning("Failed to open capture file '%s' in session file '%s'.",
-                               vdevice->capturefile, sessionfile);
+               sr_warn("Failed to open capture file '%s' in session file '%s'.",
+                       vdevice->capturefile, sessionfile);
                return SR_ERR;
        }
 
        /* freewheeling source */
        sr_session_source_add(-1, 0, 0, feed_chunk, session_device_id);
 
+       if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
+               sr_err("session: %s: packet malloc failed", __func__);
+               return SR_ERR_MALLOC;
+       }
+
+       if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) {
+               sr_err("session: %s: header malloc failed", __func__);
+               return SR_ERR_MALLOC;
+       }
+
        /* Send header packet to the session bus. */
-       packet = g_malloc(sizeof(struct sr_datafeed_packet));
-       header = g_malloc(sizeof(struct sr_datafeed_header));
-       if (!packet || !header)
-               return SR_ERR;
        packet->type = SR_DF_HEADER;
        packet->length = sizeof(struct sr_datafeed_header);
        packet->payload = (unsigned char *)header;
@@ -270,7 +285,6 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        return SR_OK;
 }
 
-
 struct sr_device_plugin session_driver = {
        "session",
        "Session-emulating driver",