Diff of /trunk/src/geotoad.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 199 by harbaum, Thu Nov 19 13:33:35 2009 UTC revision 210 by harbaum, Tue Nov 24 20:19:08 2009 UTC
# Line 19  Line 19 
19    
20  #include "gpxview.h"  #include "gpxview.h"
21    
22    #define __USE_GNU
23    #include <string.h>
24    
25  #include <fcntl.h>  #include <fcntl.h>
26  #include <sys/types.h>  #include <sys/types.h>
27  #include <sys/wait.h>  #include <sys/wait.h>
# Line 37  Line 40 
40    
41  #define BUFFER_SIZE  256  #define BUFFER_SIZE  256
42    
43    typedef enum {
44      GT_STATE_ILLEGAL = 0,
45      GT_STATE_STARTED,
46      GT_STATE_PREMATURE_END,
47      GT_STATE_SAVE_FOUND,
48    } gt_state_t;
49    
50  typedef struct {  typedef struct {
51    appdata_t *appdata;    appdata_t *appdata;
52    
53      GPtrArray *argv;
54      gchar *info, *color;
55      GMutex *update_mutex;
56      GCond *update_cond;
57    
58    GtkWidget *dialog;    gt_state_t state;
59    
60    char buf[BUFFER_SIZE];    GtkWidget *dialog;
   int bused;  
61    
62    /** gdk input tag for async IO */    long pid;
   gint stdout_tag, stderr_tag;  
   gint stdin_fd, stdout_fd, stderr_fd;  
63    
64    struct log_s {    struct log_s {
65      GtkTextBuffer *buffer;      GtkTextBuffer *buffer;
# Line 56  typedef struct { Line 68  typedef struct {
68    
69    GtkWidget *username, *password, *filename;    GtkWidget *username, *password, *filename;
70    GtkWidget *lat, *lon, *dst;    GtkWidget *lat, *lon, *dst;
71    
72      int use_cnt;
73    
74  } gt_context_t;  } gt_context_t;
75    
76    static void arg_free(gpointer data, gpointer user_data) {
77      if(data) g_free(data);
78    }
79    
80    static void context_free(gt_context_t *context) {
81      context->use_cnt--;
82    
83      if(context->use_cnt > 0)
84        printf("still in use by %d, keeping context\n", context->use_cnt);
85      else {
86        printf("freeing context\n");
87    
88        if(context->info) g_free(context->info);
89    
90        g_ptr_array_foreach(context->argv, arg_free, NULL);
91        g_ptr_array_free (context->argv, TRUE);
92    
93        g_free(context);
94      }
95    }
96    
97  static void appendf(struct log_s *log, char *colname,  static void appendf(struct log_s *log, char *colname,
98                      const char *fmt, ...) {                      const char *fmt, ...) {
99    va_list args;    va_list args;
# Line 66  static void appendf(struct log_s *log, c Line 101  static void appendf(struct log_s *log, c
101    char *buf = g_strdup_vprintf(fmt, args);    char *buf = g_strdup_vprintf(fmt, args);
102    va_end( args );    va_end( args );
103    
104    printf("append: %s", buf);    //  printf("append: %s", buf);
105    
106    GtkTextTag *tag = NULL;    GtkTextTag *tag = NULL;
107    if(colname)    if(colname)
# Line 83  static void appendf(struct log_s *log, c Line 118  static void appendf(struct log_s *log, c
118    
119    g_free(buf);    g_free(buf);
120    
   gtk_text_buffer_get_end_iter(log->buffer, &end);  
121    gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(log->view),    gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(log->view),
122                                 &end, 0.0, FALSE, 0, 0);                                 &end, 0.0, TRUE, 0, 1.0);
123  }  }
124    
125  /* watch child process and receive events */  // This function receives a requst from a worker thread asking to
126  static void child_state_cb(GPid pid, gint status, gpointer data) {  // update the gui with the required info.
127    gt_context_t *context = (gt_context_t*)data;  gboolean cb_update_job(gt_context_t *context) {
128      if (context->info) {
129    puts("child state");  
130        /* check if client reports "saved to ..." */
131        if(strstr(context->info, "Saved to "))
132          context->state = GT_STATE_SAVE_FOUND;
133    
134    if(WIFEXITED(status)) {      appendf(&context->log, context->color, context->info);
135      printf("child exited with return code %d\n", WEXITSTATUS(status));  
136    } else      g_free(context->info);
137      printf("child failed\n");      context->info = NULL;
138      }
139    
140      // Indicate that the update is done
141      g_mutex_lock(context->update_mutex);
142      g_cond_signal(context->update_cond);
143      g_mutex_unlock(context->update_mutex);
144    
145      return FALSE;
146    }
147    
148    puts("gt exited");  // A helper function run in the job thread receiving the string that
149    // should be displayed in the textview.
150    void append_parentf(gt_context_t *context, char *colname,
151                 const char *fmt, ...) {
152      va_list args;
153      va_start( args, fmt );
154      context->info = g_strdup_vprintf(fmt, args);
155      va_end( args );
156    
157    appendf(&context->log, COLOR_SYSTEM, "GeoToad finished\n");    if(colname)
158        context->color = colname;
159      else
160        context->color = NULL;
161    
162    appendf(&context->log, COLOR_SYSTEM, "TODO: free context!!!\n");    // Lock mutex to make sure that we will receive the condition signal
163    //    printf("freeing context\n");    g_mutex_lock(context->update_mutex);
   //    g_free(context);  
164    
165    /* Reap child if needed. */    g_idle_add((GSourceFunc)cb_update_job, context);
166    waitpid (pid, NULL, WNOHANG);  
167      // Wait for cb_update_job to tell me that the update is done
168      g_cond_wait(context->update_cond, context->update_mutex);
169      g_mutex_unlock(context->update_mutex);
170  }  }
171    
172  static gboolean child_input_cb(GIOChannel *source,  /* custom version of popen to get access to the pid and to be able */
173                                 GIOCondition condition,  /* to slaughter the child process */
174                                 gpointer data) {  static FILE *gt_popen(gt_context_t *context, char **args,
175    gt_context_t *context = (gt_context_t*)data;                        const char *type, long *tid) {
176    int fd = g_io_channel_unix_get_fd(source);    int   p[2];
177    ssize_t bytes;    FILE *fp;
178    
179    g_assert(condition == G_IO_IN);    if (*type != 'r' && *type != 'w')
180        return NULL;
181    /* append to current buffer content */  
182    while( (bytes = read(fd, context->buf+context->bused,    if (pipe(p) < 0)
183                   sizeof(context->buf) - context->bused - 1)) > 0) {      return NULL;
184      context->bused += bytes;  
185      context->buf[context->bused]='\0';    if ((*tid = fork()) > 0) { /* then we are the parent */
186        if (*type == 'r') {
187          close(p[1]);
188          fp = fdopen(p[0], type);
189        } else {
190          close(p[0]);
191          fp = fdopen(p[1], type);
192        }
193    
194        return fp;
195      } else if (*tid == 0) {  /* we're the child */
196    
197      /* consume line by line */      /* make our thread id the process group leader */
198      gchar *ptr = context->buf;      setpgid(0, 0);
199    
200        if (*type == 'r') {
201          fflush(stdout);
202          fflush(stderr);
203          close(1);
204          if (dup(p[1]) < 0)
205            perror("dup of write side of pipe failed");
206          close(2);
207          if (dup(p[1]) < 0)
208            perror("dup of write side of pipe failed");
209        } else {
210          close(0);
211          if (dup(p[0]) < 0)
212            perror("dup of read side of pipe failed");
213        }
214    
215        close(p[0]); /* close since we dup()'ed what we needed */
216        close(p[1]);
217    
218        execve(args[0], args, NULL);
219    
220      /* parse as long as the buffer contains a newline */      /* this printf will actually be redirected through the pipe */
221      while( strchr(ptr, '\n') != NULL) {      printf("Error: Failed to execute!\n");
222        char *p = strchr(ptr, '\n');      exit(1);
223        *p = '\0';    } else {         /* we're having major problems... */
224        close(p[0]);
225        char *color = NULL;      close(p[1]);
       if(strstr(ptr, "Saved to ") != NULL)  
         color = COLOR_OK;  
226    
227        appendf(&context->log, color, "%s\n", ptr);      /* this printf will actually be redirected through the pipe??? No! */
228        printf("Error: Failed to fork!\n");
229      }
230    
231      return NULL;
232    }
233    
234        ptr = p+1;  // The thread entry point. It will do the job, send the data to the
235      }  // GUI and self destruct when it is done.
236    static gpointer thread_worker(gt_context_t *context)
237    {
238      FILE *fh;
239      GIOStatus status;
240      GError *error = NULL;
241      gsize length;
242      gsize terminator_pos;
243      gchar *str_return;
244    
245      fh = gt_popen(context, (char**)(context->argv->pdata),"r", &context->pid);
246      if(!fh) {
247        printf("fail free\n");
248        context_free(context);
249        //    g_thread_exit(NULL);
250        return NULL;
251      }
252    
253      /* move remaining bytes down the buffer */    /* the client is running */
254      memmove(context->buf, ptr, sizeof(context->buf)-(ptr-context->buf));    printf("client inc use_cnt\n");
255      context->bused -= ptr - context->buf;    context->use_cnt++;
256    
257      /* check if buffer is full but doesn't contain any newline */    /* switch to line buffered mode */
258      if(context->bused >= sizeof(context->buf)-1) {    if(setvbuf(fh, NULL, _IOLBF, 0))
259        printf("ERROR: reply buffer overflow\n");      perror("setvbuf(_IOLBF)");
260        context->bused = 0;  
261      }    GIOChannel *gh = g_io_channel_unix_new(fileno(fh));
262    
263      while( (status = g_io_channel_read_line(gh,
264                                              &str_return,
265                                              &length,
266                                              &terminator_pos,
267                                              &error)) == G_IO_STATUS_NORMAL) {
268        char *color = NULL;
269        if(strstr(str_return, "Saved to "))  color = COLOR_OK;
270        if(strcasestr(str_return, "error"))  color = COLOR_ERR;
271    
272        append_parentf(context, color, str_return);
273        g_free(str_return);
274    }    }
275    
276      g_io_channel_unref(gh);
277      pclose(fh);
278      append_parentf(context, COLOR_SYSTEM, "Job done!");
279    
280      context_free(context);
281    
282      g_thread_exit(NULL);
283      return NULL;
284    }
285    
286    
287    return TRUE;  static void arg_dsp(gpointer data, gpointer user_data) {
288      gt_context_t *context = (gt_context_t*)user_data;
289    
290      if(data)
291        appendf(&context->log, COLOR_SYSTEM, "%s\n", data);
292  }  }
293    
294  static void run(gt_context_t *context) {  static void run(gt_context_t *context) {
295    /* setup context */    GError *error = NULL;
296    context->bused = 0;    char str[8];
   context->stdout_tag = -1;  
   context->stderr_tag = -1;  
   context->stdin_fd  = -1;  
   context->stderr_fd = -1;  
   context->stderr_fd = -1;  
297    
298    /* build list of arguments to call geotoad */    /* build list of arguments to call geotoad */
299    GPtrArray *gt_argv = g_ptr_array_new();    context->argv = g_ptr_array_new();
300    g_ptr_array_add (gt_argv, GEOTOAD);    g_ptr_array_add (context->argv, g_strdup_printf(GEOTOAD));
301    g_ptr_array_add (gt_argv, "--distanceMax=1.0");    g_ascii_dtostr(str, sizeof(str), context->appdata->gt.distance);
302    g_ptr_array_add (gt_argv, "--output=gtoad.gpx");    g_ptr_array_add (context->argv,
303    g_ptr_array_add (gt_argv, "--password=winterblume");               g_strdup_printf("--distanceMax=%s", str));
304    g_ptr_array_add (gt_argv, "--queryType=coord");    g_ptr_array_add (context->argv,
305    g_ptr_array_add (gt_argv, "--user=Tantil");               g_strdup_printf("--output=%s", context->appdata->gt.filename));
306      g_ptr_array_add (context->argv,
307                 g_strdup_printf("--password=%s", context->appdata->gt.password));
308      g_ptr_array_add (context->argv,
309                 g_strdup_printf("--queryType=coord"));
310      g_ptr_array_add (context->argv,
311                 g_strdup_printf("--user=%s", context->appdata->username));
312    
313    /* check if we need to add proxy config */    /* check if we need to add proxy config */
314    char *proxy = NULL;    char *proxy = NULL;
# Line 182  static void run(gt_context_t *context) { Line 317  static void run(gt_context_t *context) {
317         context->appdata->proxy->authentication_user &&         context->appdata->proxy->authentication_user &&
318         context->appdata->proxy->authentication_password)         context->appdata->proxy->authentication_password)
319        proxy = g_strdup_printf("--proxy=http://%s:%s@%s:%d",        proxy = g_strdup_printf("--proxy=http://%s:%s@%s:%d",
320                                context->appdata->proxy->authentication_user,                                context->appdata->proxy->authentication_user,
321                                context->appdata->proxy->authentication_password,                                context->appdata->proxy->authentication_password,
322                                context->appdata->proxy->host,                                context->appdata->proxy->host,
323                                context->appdata->proxy->port);                                context->appdata->proxy->port);
324      else      else
325        proxy = g_strdup_printf("--proxy=http://%s:%d",        proxy = g_strdup_printf("--proxy=http://%s:%d",
326                                context->appdata->proxy->host,                                context->appdata->proxy->host,
327                                context->appdata->proxy->port);                                context->appdata->proxy->port);
328    
329      appendf(&context->log, COLOR_SYSTEM, "Using proxy: %s\n", proxy);      g_ptr_array_add (context->argv, proxy);
     g_ptr_array_add (gt_argv, proxy);  
330    }    }
331    
332    g_ptr_array_add (gt_argv, "N49 00.000 E008 23.000");    /* convert coordinates into simple ascii format */
333    g_ptr_array_add (gt_argv, NULL);    char n = (context->appdata->gt.lat >= 0)?'N':'S';
334      char e = (context->appdata->gt.lon >= 0)?'E':'W';
335    GError *error=NULL;    float lat = fabs(context->appdata->gt.lat);
336    GPid pid;    float lon = fabs(context->appdata->gt.lon);
337    GSource *gt_watch;    float lat_mint, lat_int, lat_frac = modff(lat, &lat_int);
338      float lon_mint, lon_int, lon_frac = modff(lon, &lon_int);
339    if (!g_spawn_async_with_pipes (NULL, /* CWD */    lat_frac = modff(lat_frac*60.0, &lat_mint);
340                                   (char **) gt_argv->pdata, /* argv */    lon_frac = modff(lon_frac*60.0, &lon_mint);
341                                   NULL, /* envp */  
342                                   G_SPAWN_DO_NOT_REAP_CHILD, /* flags */    g_ptr_array_add (context->argv,
343                                   NULL, /* child setup */             g_strdup_printf("%c%02u %02u.%03u %c%03u %02u.%03u",
344                                   NULL, /* user data */             n, (int)lat_int, (int)lat_mint, (int)(lat_frac*1000.0+0.5),
345                                   &pid,             e, (int)lon_int, (int)lon_mint, (int)(lon_frac*1000.0+0.5)));
346                                   &context->stdin_fd,  
347                                   &context->stdout_fd,    g_ptr_array_add (context->argv, NULL);
348                                   &context->stderr_fd,  
349                                   &error)) {    /* show all entries */
350      g_ptr_array_free(gt_argv, TRUE);    g_ptr_array_foreach(context->argv, arg_dsp, context);
351      if(proxy) g_free(proxy);  
352      appendf(&context->log, COLOR_ERR,    g_thread_create((GThreadFunc)thread_worker, context, FALSE, &error);
353              _("GeoToad failed to start!\n%s\n"), error->message);    if (error) {
354        appendf(&context->log, COLOR_ERR, "Error: %s\n", error->message);
355      g_error_free(error);      g_error_free(error);
     return;  
356    }    }
   
   g_ptr_array_free (gt_argv, TRUE);  
   if(proxy) g_free(proxy);  
   
   gt_watch = g_child_watch_source_new(pid);  
   g_source_set_callback(gt_watch, (GSourceFunc) child_state_cb, context, NULL);  
   
   g_source_attach(gt_watch, NULL);  
   g_source_unref(gt_watch);  
   
   /* make nonblocking */  
   if(fcntl(context->stdout_fd, F_SETFL, O_NONBLOCK) == -1)  
     perror("fcntl failed");  
   
   if(fcntl(context->stderr_fd, F_SETFL, O_NONBLOCK) == -1)  
     perror("fcntl failed");  
   
   GIOChannel *ioc = g_io_channel_unix_new(context->stdout_fd);  
   g_io_channel_set_close_on_unref (ioc, TRUE);  
   g_io_channel_set_encoding (ioc, NULL, NULL);  
   g_io_add_watch(ioc, G_IO_IN,  child_input_cb, context);  
   g_io_channel_unref(ioc);  
   
   //  ioc = g_io_channel_unix_new(context->stderr_fd);  
   //  g_io_add_watch(ioc, G_IO_IN,  child_input_cb, context);  
   //  g_io_channel_unref(ioc);  
357  }  }
358    
359  /* show text window and display output of running geotoad */  /* show text window and display output of running geotoad */
# Line 299  static void gui_run(gt_context_t *contex Line 407  static void gui_run(gt_context_t *contex
407    gtk_dialog_run(GTK_DIALOG(dialog));    gtk_dialog_run(GTK_DIALOG(dialog));
408    
409    gtk_widget_destroy(dialog);    gtk_widget_destroy(dialog);
410    
411      errorf("Fertig!\n");
412    
413  }  }
414    
415  static void on_browse(GtkWidget *widget, gpointer data) {  static void on_browse(GtkWidget *widget, gpointer data) {
# Line 385  static gboolean gui_setup(gt_context_t * Line 496  static gboolean gui_setup(gt_context_t *
496    context->lon = lon_entry_new(appdata->gt.lon);    context->lon = lon_entry_new(appdata->gt.lon);
497    gtk_box_pack_start_defaults(GTK_BOX(ihbox), context->lon);    gtk_box_pack_start_defaults(GTK_BOX(ihbox), context->lon);
498    gtk_box_pack_start_defaults(GTK_BOX(vbox), ihbox);    gtk_box_pack_start_defaults(GTK_BOX(vbox), ihbox);
499    context->dst = dist_entry_new(appdata->gt.distance, appdata->imperial);    float dst = appdata->gt.distance;  // distance is given in kilometers
500      if(appdata->imperial) dst /= 1.609344;
501      context->dst = dist_entry_new(dst, appdata->imperial);
502    gtk_box_pack_start_defaults(GTK_BOX(vbox), context->dst);    gtk_box_pack_start_defaults(GTK_BOX(vbox), context->dst);
503    gtk_box_pack_start_defaults(GTK_BOX(hbox), vbox);    gtk_box_pack_start_defaults(GTK_BOX(hbox), vbox);
504    
# Line 419  static gboolean gui_setup(gt_context_t * Line 532  static gboolean gui_setup(gt_context_t *
532    gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
533    
534    vbox = gtk_vbox_new(FALSE, 0);    vbox = gtk_vbox_new(FALSE, 0);
535  #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  #ifndef FREMANTLE
536    context->username = gtk_entry_new();    context->username = gtk_entry_new();
537    context->password = gtk_entry_new();    context->password = gtk_entry_new();
538  #else  #else
# Line 433  static gboolean gui_setup(gt_context_t * Line 546  static gboolean gui_setup(gt_context_t *
546    gtk_entry_set_visibility(GTK_ENTRY(context->password), FALSE);    gtk_entry_set_visibility(GTK_ENTRY(context->password), FALSE);
547    
548    /* set saved defaults */    /* set saved defaults */
549    if(appdata->gt.username)    if(appdata->username)
550      gtk_entry_set_text(GTK_ENTRY(context->username),      gtk_entry_set_text(GTK_ENTRY(context->username),
551                         appdata->gt.username);                         appdata->username);
552    
553    if(appdata->gt.password)    if(appdata->gt.password)
554      gtk_entry_set_text(GTK_ENTRY(context->password),      gtk_entry_set_text(GTK_ENTRY(context->password),
# Line 453  static gboolean gui_setup(gt_context_t * Line 566  static gboolean gui_setup(gt_context_t *
566    
567    if(gtk_dialog_run(GTK_DIALOG(context->dialog)) == GTK_RESPONSE_OK) {    if(gtk_dialog_run(GTK_DIALOG(context->dialog)) == GTK_RESPONSE_OK) {
568    
569        /* parse coordinates */
570        appdata->gt.lat = lat_get(context->lat);
571        appdata->gt.lon = lon_get(context->lon);
572    
573      /* save values */      /* save values */
574      if(appdata->gt.username) g_free(appdata->gt.username);      if(appdata->username) g_free(appdata->username);
575      appdata->gt.username =      appdata->username =
576        g_strdup(gtk_entry_get_text(GTK_ENTRY(context->username)));        g_strdup(gtk_entry_get_text(GTK_ENTRY(context->username)));
577    
578      if(appdata->gt.password) g_free(appdata->gt.password);      if(appdata->gt.password) g_free(appdata->gt.password);
# Line 466  static gboolean gui_setup(gt_context_t * Line 583  static gboolean gui_setup(gt_context_t *
583      appdata->gt.filename =      appdata->gt.filename =
584        g_strdup(gtk_label_get_text(GTK_LABEL(context->filename)));        g_strdup(gtk_label_get_text(GTK_LABEL(context->filename)));
585    
586      ok = TRUE;      /* get distance in kilometers */
587        appdata->gt.distance = dist_get(context->dst, FALSE);
588    
589    
590        /* check for valid entries */
591        if(isnan(appdata->gt.lat) || isnan(appdata->gt.lon) ||
592           isnan(appdata->gt.distance) || !appdata->gt.filename ||
593           !appdata->username || !appdata->gt.password)
594          errorf(_("GeoToad setup not complete"));
595        else
596          ok = TRUE;
597    }    }
598    
599    gtk_widget_destroy(context->dialog);    gtk_widget_destroy(context->dialog);
# Line 483  void geotoad(appdata_t *appdata) { Line 610  void geotoad(appdata_t *appdata) {
610    
611    gt_context_t *context = g_new0(gt_context_t, 1);    gt_context_t *context = g_new0(gt_context_t, 1);
612    context->appdata = appdata;    context->appdata = appdata;
613      context->use_cnt++;          // parent still uses this
614    
615      context->update_mutex = g_mutex_new();
616      context->update_cond = g_cond_new();
617      //  context->mutex_to_run = mutex_to_run;
618    
619    printf("geoToad\n");    printf("geoToad\n");
620    
621    if(gui_setup(context))    if(gui_setup(context))
622      gui_run(context);      gui_run(context);
623    
624      printf("main context free\n");
625      context_free(context);
626  }  }
627    
628  gboolean geotoad_available(void) {  gboolean geotoad_available(void) {
Legend:
Removed from v.199  
changed lines
  Added in v.210