From bf073fa00ea1c6e871fad6bc6b5ebba6deab609d Mon Sep 17 00:00:00 2001
From: Martin Pulec <pulec@cesnet.cz>
Date: Fri, 3 Aug 2012 11:10:31 +0200
Subject: [PATCH] SAGE: allow set config file

---
 src/video_display/sage.c           | 42 +++++++++++++++++++++++++-----
 src/video_display/sage_wrapper.cxx |  5 ++--
 src/video_display/sage_wrapper.h   |  6 +++--
 3 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/src/video_display/sage.c b/src/video_display/sage.c
index aae933426..bce838986 100644
--- a/src/video_display/sage.c
+++ b/src/video_display/sage.c
@@ -46,9 +46,11 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #include "config_unix.h"
 #include "config_win32.h"
+#endif // HAVE_CONFIG_H
 
 #include "debug.h"
 #include "video_codec.h"
@@ -92,6 +94,8 @@ struct state_sage {
         
         void *sage_state;
 
+        const char             *confName;
+
         int                     frames;
         struct timeval          t, t0;
 };
@@ -144,12 +148,37 @@ void *display_sage_init(char *fmt, unsigned int flags)
         UNUSED(flags);
         struct state_sage *s;
 
-        if(fmt && strcmp(fmt, "help") == 0) {
-                printf("No configuration needed for SAGE\n");
-                return NULL;
-        }
-        
         s = (struct state_sage *)malloc(sizeof(struct state_sage));
+        assert(s != NULL);
+
+        s->confName = "ultragrid.conf";
+
+        if(fmt) {
+                if(strcmp(fmt, "help") == 0) {
+                        printf("SAGE usage:\n");
+                        printf("\tuv -t sage:[config=<config_file>]\n");
+                        printf("\t                      <config_file> - SAGE app config file, default \"ultragrid.conf\"\n");
+                        return NULL;
+                } else {
+                        char *save_ptr = NULL;
+                        char *item;
+
+                        while((item = strtok_r(fmt, ":", &save_ptr))) {
+                                fmt = NULL;
+                                if(strncmp(item, "config=", strlen("config=")) == 0) {
+                                        s->confName = item + strlen("config=");
+                                } else {
+                                        fprintf(stderr, "[SAGE] unrecognized configuration: %s\n",
+                                                        item);
+                                        free(s);
+                                        return NULL;
+                                }
+                        }
+                }
+        }
+
+        printf("[SAGE] Using config file %s.\n", s->confName);
+        
         s->magic = MAGIC_SAGE;
 
         gettimeofday(&s->t0, NULL);
@@ -280,7 +309,8 @@ int display_sage_reconfigure(void *state, struct video_desc desc)
                 sage_shutdown(s->sage_state);
         }
 
-        s->sage_state = initSage(s->appID, s->nodeID, s->tile->width, s->tile->height, desc.color_spec);
+        s->sage_state = initSage(s->confName, s->appID, s->nodeID,
+                        s->tile->width, s->tile->height, desc.color_spec);
 
         s->tile->data = (char *) sage_getBuffer(s->sage_state);
         s->tile->data_len = vc_get_linesize(s->tile->width, desc.color_spec) * s->tile->height;
diff --git a/src/video_display/sage_wrapper.cxx b/src/video_display/sage_wrapper.cxx
index 8d24dd8a9..50488a14a 100644
--- a/src/video_display/sage_wrapper.cxx
+++ b/src/video_display/sage_wrapper.cxx
@@ -53,13 +53,14 @@ extern "C" {
 #include "host.h"
 }
 
-void *initSage(int appID, int nodeID, int width, int height, codec_t codec)
+void *initSage(const char *confName, int appID, int nodeID, int width,
+                int height, codec_t codec)
 {
         sail *sageInf; // sage sail object
 
         sageInf = new sail;
         sailConfig sailCfg;
-        sailCfg.init("ultragrid.conf");
+        sailCfg.init(confName);
         sailCfg.setAppName("ultragrid");
         sailCfg.rank = nodeID;
         sailCfg.resX = width;
diff --git a/src/video_display/sage_wrapper.h b/src/video_display/sage_wrapper.h
index 40dde9059..0c2012556 100644
--- a/src/video_display/sage_wrapper.h
+++ b/src/video_display/sage_wrapper.h
@@ -57,13 +57,15 @@
 
 // SAGE headers
 #ifdef __cplusplus
-extern "C" void *initSage(int appID, int nodeID, int width, int height, codec_t codec);
+extern "C" void *initSage(const char *confName, int appID, int nodeID,
+                int width, int height, codec_t codec);
 extern "C" void sage_shutdown(void *);
 extern "C" void sage_swapBuffer(void *);
 extern "C" GLubyte * sage_getBuffer(void *);
 extern "C" void sage_delete(void *);
 #else
-void* initSage(int appID, int nodeID, int width, int height, codec_t codec);
+void* initSage(const char *confName, int appID, int nodeID, int width,
+                int height, codec_t codec);
 void sage_swapBuffer(void *);
 GLubyte * sage_getBuffer(void *);
 void sage_shutdown(void *);