Changeset 249

Timestamp:

May 3, 2006, 10:09:11 AM (17 years ago)

Author:

joshe

Message:

Some minor code cleanups.
Handle things a little better when quitting.

Location:

trunk/gtk

Files:

• conf.c (modified) (3 diffs)
• dialogs.c (modified) (3 diffs)
• ipc.c (modified) (1 diff)
• main.c (modified) (17 diffs)
• tr_backend.c (modified) (3 diffs)
• tr_backend.h (modified) (1 diff)
• tr_torrent.c (modified) (4 diffs)

trunk/gtk/conf.c

@@ -26 +26 @@
 
 #include <sys/types.h>
-#include <assert.h>
 #include <ctype.h>
 #include <errno.h>
@@ -342 +341 @@
 const char *
 cf_getpref(const char *name) {
-  assert(NULL != gl_prefs);
+  g_assert(NULL != gl_prefs);
 
   return g_tree_lookup(gl_prefs, name);
@@ -349 +348 @@
 void
 cf_setpref(const char *name, const char *value) {
-  assert(NULL != gl_prefs);
+  g_assert(NULL != gl_prefs);
 
   g_tree_insert(gl_prefs, g_strdup(name), g_strdup(value));

trunk/gtk/dialogs.c

@@ -25 +25 @@
 */
 
-#include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -174 +173 @@
 
 #undef RN
-  assert(rowcount == ii);
+  g_assert(rowcount == ii);
 
   gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(wind)->vbox), table);
@@ -496 +495 @@
   INFOSEP(table, ii);
 
-  assert(rowcount == ii);
+  g_assert(rowcount == ii);
 
   gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(wind)->vbox), table);

trunk/gtk/ipc.c

@@ -28 +28 @@
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <assert.h>
 #include <errno.h>
 #include <fcntl.h>

trunk/gtk/main.c

@@ -26 +26 @@
 
 #include <sys/param.h>
-#include <assert.h>
 #include <errno.h>
 #include <signal.h>
@@ -48 +47 @@
 #include "util.h"
 
+/* time in seconds to wait for torrents to stop when exiting */
 #define TRACKER_EXIT_TIMEOUT    5
+
+/* interval in milliseconds to update the torrent list display */
+#define UPDATE_INTERVAL         500
+
+/* interval in milliseconds to check for stopped torrents and update display */
+#define EXIT_CHECK_INTERVAL     500
 
 struct cbdata {
@@ -73 +79 @@
 void
 makewind(GtkWidget *wind, TrBackend *back, benc_val_t *state, GList *args);
+void
+quittransmission(struct cbdata *data);
 GtkWidget *
 makewind_toolbar(struct cbdata *data);
@@ -81 +89 @@
 gboolean
 exitcheck(gpointer gdata);
-void
-stoptransmission(struct cbdata *data);
 void
 setupdrag(GtkWidget *widget, struct cbdata *data);
@@ -163 +169 @@
 
 static sig_atomic_t global_sigcount = 0;
-static int global_lastsig = 0;
 
 int
@@ -286 +291 @@
   data->back = back;
   data->wind = GTK_WINDOW(wind);
-  data->timer = -1;
+  data->timer = 0;
   /* filled in by makewind_list */
   data->model = NULL;
@@ -307 +312 @@
   gtk_box_pack_start(GTK_BOX(vbox), status, FALSE, FALSE, 0);
 
+  gtk_container_set_focus_child(GTK_CONTAINER(vbox), scroll);
   gtk_container_add(GTK_CONTAINER(wind), vbox);
   gtk_window_set_title(data->wind, g_get_application_name());
@@ -315 +321 @@
   addtorrents(data, state, args, NULL, NULL);
 
-  data->timer = g_timeout_add(500, updatemodel, data);
+  data->timer = g_timeout_add(UPDATE_INTERVAL, updatemodel, data);
   updatemodel(data);
 
@@ -333 +339 @@
 
   ipc_socket_setup(GTK_WINDOW(wind), addtorrents, data);
+}
+
+void
+quittransmission(struct cbdata *data) {
+  g_object_unref(G_OBJECT(data->back));
+  gtk_widget_destroy(GTK_WIDGET(data->wind));
+  if(0 < data->timer)
+    g_source_remove(data->timer);
+  if(NULL != data->stupidpopuphack)
+    gtk_widget_destroy(data->stupidpopuphack);
+  g_free(data->buttons);
+  g_free(data);
+  gtk_main_quit();
 }
 
@@ -389 +408 @@
   char *str;
 
-  assert(MC_ROW_COUNT == ALEN(types));
+  g_assert(MC_ROW_COUNT == ALEN(types));
 
   store = gtk_list_store_newv(MC_ROW_COUNT, types);
@@ -434 +453 @@
   struct cbdata *data = gdata;
   struct exitdata *edata;
-  tr_stat_t *st;
-  GtkTreeIter iter;
-  TrTorrent *tor;
-  gboolean going;
-
-  if(0 >= data->timer)
+  unsigned int ii;
+
+  /* stop the update timer */
+  if(0 < data->timer)
     g_source_remove(data->timer);
-  data->timer = -1;
-
-  going = gtk_tree_model_get_iter_first(data->model, &iter);
-  while(going) {
-    gtk_tree_model_get(data->model, &iter, MC_TORRENT, &tor, -1);
-    st = tr_torrent_stat(tor);
-    if(TR_STATUS_ACTIVE & st->status) {
-      tr_torrentStop(tr_torrent_handle(tor));
-      going = gtk_tree_model_iter_next(data->model, &iter);
-    } else {
-      going = gtk_list_store_remove(GTK_LIST_STORE(data->model), &iter);
-    }
-    g_object_unref(G_OBJECT(tor));
-  }
-
-  /* XXX should disable widgets or something */
-
-  /* try to wait until torrents stop before exiting */
+  data->timer = 0;
+
+  /* try to stop all the torrents */
+  tr_backend_stop_torrents(data->back);
+
+  /* set things up to wait for torrents to stop */
   edata = g_new0(struct exitdata, 1);
   edata->cbdata = data;
   edata->started = time(NULL);
-  edata->timer = g_timeout_add(500, exitcheck, edata);
+  /* check if torrents are still running */
+  if(exitcheck(edata)) {
+    /* yes, start the exit timer and disable widgets */
+    edata->timer = g_timeout_add(EXIT_CHECK_INTERVAL, exitcheck, edata);
+    for(ii = 0; ii < ALEN(actionitems); ii++)
+      gtk_widget_set_sensitive(data->buttons[ii], FALSE);
+    gtk_widget_set_sensitive(GTK_WIDGET(data->view), FALSE);
+  }
 
   /* returning FALSE means to destroy the window */
@@ -471 +483 @@
 exitcheck(gpointer gdata) {
   struct exitdata *data = gdata;
-  tr_stat_t *st;
-  GtkTreeIter iter;
-  TrTorrent *tor;
-  gboolean go;
-
-  go = gtk_tree_model_get_iter_first(data->cbdata->model, &iter);
-  while(go) {
-    gtk_tree_model_get(data->cbdata->model, &iter, MC_TORRENT, &tor, -1);
-    st = tr_torrent_stat(tor);
-    if(!(TR_STATUS_PAUSE & st->status))
-      go = gtk_tree_model_iter_next(data->cbdata->model, &iter);
-    else {
-      go = gtk_list_store_remove(GTK_LIST_STORE(data->cbdata->model), &iter);
-    }
-    g_object_unref(G_OBJECT(tor));
-  }
 
   /* keep going if we still have torrents and haven't hit the exit timeout */
-  if(0 < tr_torrentCount(tr_backend_handle(data->cbdata->back)) &&
-     time(NULL) - data->started < TRACKER_EXIT_TIMEOUT) {
-    assert(gtk_tree_model_get_iter_first(data->cbdata->model, &iter));
+  if(time(NULL) - data->started < TRACKER_EXIT_TIMEOUT &&
+     !tr_backend_torrents_stopped(data->cbdata->back)) {
     updatemodel(data->cbdata);
     return TRUE;
@@ -497 +492 @@
 
   /* exit otherwise */
-
-  if(0 >= data->timer)
+  if(0 < data->timer)
     g_source_remove(data->timer);
-  data->timer = -1;
-
-  stoptransmission(data->cbdata);
-
-  gtk_widget_destroy(GTK_WIDGET(data->cbdata->wind));
-  if(NULL != data->cbdata->stupidpopuphack)
-    gtk_widget_destroy(data->cbdata->stupidpopuphack);
-  g_free(data->cbdata->buttons);
-  g_free(data->cbdata);
+  quittransmission(data->cbdata);
   g_free(data);
-  gtk_main_quit();
 
   return FALSE;
-}
-
-void
-stoptransmission(struct cbdata *data) {
-  GtkTreeIter iter;
-  TrTorrent *tor;
-  gboolean go;
-
-  go = gtk_tree_model_get_iter_first(data->model, &iter);
-  while(go) {
-    gtk_tree_model_get(data->model, &iter, MC_TORRENT, &tor, -1);
-    go = gtk_list_store_remove(GTK_LIST_STORE(data->model), &iter);
-    g_object_unref(G_OBJECT(tor));
-  }
-  g_assert(0 == tr_torrentCount(tr_backend_handle(data->back)));
-
-  g_object_unref(G_OBJECT(data->back));
 }
 
@@ -696 +664 @@
   else {
     top = g_strdup("");
-    assert("XXX unknown status");
+    g_assert_not_reached();
   }
 
@@ -763 +731 @@
 
   if(0 < global_sigcount) {
-    stoptransmission(data);
-    global_sigcount = SIGCOUNT_MAX;
-    raise(global_lastsig);
+    quittransmission(data);
+    return FALSE;
   }
 
@@ -929 +896 @@
     if(actionitems[info.off].act == info.act)
       break;
-  assert(info.off < ALEN(actionitems));
+  g_assert(info.off < ALEN(actionitems));
 
   gtk_tree_selection_selected_foreach(sel, popupaction, &info);
 
   for(ii = info.dead; NULL != ii; ii = ii->next) {
-    assert(gtk_tree_row_reference_valid(ii->data));
+    g_assert(gtk_tree_row_reference_valid(ii->data));
     path = gtk_tree_row_reference_get_path(ii->data);
     gtk_tree_selection_unselect_path(info.sel, path);
     if(gtk_tree_model_get_iter(data->model, &iter, path))
        gtk_list_store_remove(GTK_LIST_STORE(data->model), &iter);
-    else
-      assert(!"bad path");
+    else {
+      g_assert_not_reached();
+    }
     gtk_tree_path_free(path);
     gtk_tree_row_reference_free(ii->data);
@@ -1142 +1110 @@
   struct sigaction sa;
 
-  global_lastsig = sig;
-
   if(SIGCOUNT_MAX <= ++global_sigcount) {
     bzero(&sa, sizeof(sa));

trunk/gtk/tr_backend.c

@@ -136 +136 @@
   self->disposed = TRUE;
 
-  fprintf(stderr, "back dispose %p\n", self);
-
   if(NULL != self->torrents) {
     for(ii = self->torrents; NULL != ii; ii = ii->next)
@@ -153 +151 @@
   GObjectClass *parent = g_type_class_peek(g_type_parent(TR_BACKEND_TYPE));
   TrBackend *self = (TrBackend *)obj;
-
-  fprintf(stderr, "back finalize %p\n", self);
 
   if(NULL != self->handle)
@@ -237 +233 @@
   back->torrents = g_list_remove(back->torrents, tor);
 }
+
+void
+tr_backend_stop_torrents(TrBackend *back) {
+  GList *ii;
+
+  TR_IS_BACKEND(back);
+
+  for(ii = back->torrents; NULL != ii; ii = ii->next)
+    if(TR_STATUS_ACTIVE & tr_torrent_stat(ii->data)->status)
+      tr_torrentStop(tr_torrent_handle(ii->data));
+}
+
+gboolean
+tr_backend_torrents_stopped(TrBackend *back) {
+  GList *ii;
+
+  TR_IS_BACKEND(back);
+
+  for(ii = back->torrents; NULL != ii; ii = ii->next)
+    if(TR_STATUS_ACTIVE & tr_torrent_stat(ii->data)->status)
+      return FALSE;
+
+  return TRUE;
+}

trunk/gtk/tr_backend.h

@@ -49 +49 @@
 tr_backend_load_state(TrBackend *back, benc_val_t *state, GList **errors);
 
+void
+tr_backend_stop_torrents(TrBackend *back);
+
+gboolean
+tr_backend_torrents_stopped(TrBackend *back);
+
 #ifdef TR_WANT_BACKEND_PRIVATE
 void

trunk/gtk/tr_torrent.c

@@ -33 +33 @@
 static void
 tr_torrent_dispose(GObject *obj);
-static void
-tr_torrent_finalize(GObject *obj);
 static void
 tr_torrent_set_folder(TrTorrent *tor);
@@ -71 +69 @@
   gobject_class->get_property = tr_torrent_get_property;
   gobject_class->dispose = tr_torrent_dispose;
-  gobject_class->finalize = tr_torrent_finalize;
 
   pspec = g_param_spec_pointer("torrent-handle", "Torrent handle",
@@ -179 +176 @@
   self->disposed = TRUE;
 
-  fprintf(stderr, "tor dispose %p\n", self);
-
   if(NULL != self->handle) {
     if(!tr_torrent_paused(self))
@@ -195 +190 @@
   /* Chain up to the parent class */
   parent->dispose(obj);
-}
-
-static void
-tr_torrent_finalize(GObject *obj) {
-  GObjectClass *parent = g_type_class_peek(g_type_parent(TR_TORRENT_TYPE));
-  TrTorrent *self = (TrTorrent *)obj;
-
-  fprintf(stderr, "tor finalize %p\n", self);
-
-  /* Chain up to the parent class */
-  parent->finalize(obj);
 }