Changeset 269

Timestamp:

May 31, 2006, 11:20:59 PM (17 years ago)

Author:

joshe

Message:

Wait and try to send a stopped event when removing a torrent.

Location:

trunk/gtk

Files:

• main.c (modified) (9 diffs)
• tr_backend.c (modified) (3 diffs)
• tr_torrent.c (modified) (5 diffs)
• tr_torrent.h (modified) (3 diffs)

trunk/gtk/main.c

@@ -68 +68 @@
   gboolean prefsopen;
   GtkWidget *stupidpopuphack;
+  gboolean closing;
 };
 
@@ -117 +118 @@
 void
 actionclick(GtkWidget *widget, gpointer gdata);
-void
-popupaction(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
-            gpointer gdata);
 gint
 intrevcmp(gconstpointer a, gconstpointer b);
@@ -302 +300 @@
   data->prefsopen = FALSE;
   data->stupidpopuphack = NULL;
+  data->closing = FALSE;
 
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll), GTK_POLICY_NEVER,
@@ -460 +459 @@
   struct exitdata *edata;
   unsigned int ii;
+  GtkTreeIter iter;
+  TrTorrent *tor;
+
+  data->closing = TRUE;
 
   /* stop the update timer */
@@ -466 +469 @@
   data->timer = 0;
 
-  /* try to stop all the torrents */
+  /*
+    Add a reference to all torrents in the list, which will be removed
+    when the politely-stopped signal is emitted.  This is necessary
+    because actionclick() adds a reference when it removes a torrent
+    from the model and calls tr_torrent_stop_polite() on it.
+  */
+  if(gtk_tree_model_get_iter_first(data->model, &iter)) {
+    do
+      gtk_tree_model_get(data->model, &iter, MC_TORRENT, &tor, -1);
+    while(gtk_tree_model_iter_next(data->model, &iter));
+  }
+
+  /* try to politely stop all the torrents */
   tr_backend_stop_torrents(data->back);
 
@@ -773 +788 @@
   fixbuttons(NULL, data);
 
+  /* check for politely stopped torrents unless we're exiting */
+  if(!data->closing)
+    tr_backend_torrents_stopped(data->back);
+
   return TRUE;
 }
@@ -857 +876 @@
 }
 
-struct actioninfo {
-  GtkWindow *wind;
-  enum listact act;
-  unsigned int off;
-  GtkTreeSelection *sel;
-  TrBackend *back;
-  gboolean changed;
-  GList *dead;
-};
-
 void
 actionclick(GtkWidget *widget, gpointer gdata) {
   struct cbdata *data = gdata;
-  struct actioninfo info = {
-    data->wind,
-    GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), LIST_ACTION)),
-    0,
-    gtk_tree_view_get_selection(data->view),
-    data->back,
-    FALSE,
-    NULL,
-  };
-  GtkTreeSelection *sel = gtk_tree_view_get_selection(data->view);
-  GList *ii;
+  enum listact act;
+  GtkTreeSelection *sel;
+  GList *rows, *ii;
+  GtkTreeRowReference *ref;
   GtkTreePath *path;
   GtkTreeIter iter;
-
-  switch(info.act) {
+  TrTorrent *tor;
+  unsigned int actoff, status;
+  gboolean changed;
+
+  act = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), LIST_ACTION));
+
+  switch(act) {
     case ACT_OPEN:
       makeaddwind(data->wind, addtorrents, data);
@@ -899 +906 @@
   }
 
-  for(info.off = 0; info.off < ALEN(actionitems); info.off++)
-    if(actionitems[info.off].act == info.act)
+  sel = gtk_tree_view_get_selection(data->view);
+  rows = gtk_tree_selection_get_selected_rows(sel, NULL);
+
+  for(ii = rows; NULL != ii; ii = ii->next) {
+    ref = gtk_tree_row_reference_new(data->model, ii->data);
+    gtk_tree_path_free(ii->data);
+    ii->data = ref;
+  }
+
+  for(actoff = 0; actoff < ALEN(actionitems); actoff++)
+    if(actionitems[actoff].act == act)
       break;
-  g_assert(info.off < ALEN(actionitems));
-
-  gtk_tree_selection_selected_foreach(sel, popupaction, &info);
-
-  for(ii = info.dead; NULL != ii; ii = ii->next) {
-    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 {
-      g_assert_not_reached();
+  g_assert(actoff < ALEN(actionitems));
+
+  changed = FALSE;
+  for(ii = rows; NULL != ii; ii = ii->next) {
+    if(NULL != (path = gtk_tree_row_reference_get_path(ii->data)) &&
+       gtk_tree_model_get_iter(data->model, &iter, path)) {
+      gtk_tree_model_get(data->model, &iter, MC_TORRENT, &tor,
+                         MC_STAT, &status, -1);
+      /* check if this action is valid for this torrent */
+      if((!actionitems[actoff].avail || actionitems[actoff].avail & status) &&
+         !actionitems[actoff].nomenu) {
+        switch(act) {
+          case ACT_START:
+            tr_torrentStart(tr_torrent_handle(tor));
+            changed = TRUE;
+            break;
+          case ACT_STOP:
+            tr_torrentStop(tr_torrent_handle(tor));
+            changed = TRUE;
+            break;
+          case ACT_DELETE:
+            /* tor will be unref'd in the politely_stopped signal handler */
+            g_object_ref(tor);
+            tr_torrent_stop_politely(tor);
+            gtk_list_store_remove(GTK_LIST_STORE(data->model), &iter);
+            changed = TRUE;
+            break;
+          case ACT_INFO:
+            makeinfowind(data->wind, tor);
+            break;
+          case ACT_OPEN:
+          case ACT_PREF:
+            break;
+        }
+      }
+      g_object_unref(tor);
     }
-    gtk_tree_path_free(path);
+    if(NULL != path)
+      gtk_tree_path_free(path);
     gtk_tree_row_reference_free(ii->data);
   }
-  g_list_free(info.dead);
-
-  if(info.changed) {
+  g_list_free(rows);
+
+  if(changed) {
     savetorrents(data);
     updatemodel(data);
   }
-}
-
-void
-popupaction(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
-            gpointer gdata) {
-  struct actioninfo *in = gdata;
-  TrTorrent *tor;
-  int status;
-
-  gtk_tree_model_get(model, iter, MC_TORRENT, &tor, MC_STAT, &status, -1);
-
-  /* check if this action is valid for this torrent */
-  if((!actionitems[in->off].avail || actionitems[in->off].avail & status) &&
-     !actionitems[in->off].nomenu) {
-    switch(in->act) {
-      case ACT_START:
-        tr_torrentStart(tr_torrent_handle(tor));
-        in->changed = TRUE;
-        break;
-      case ACT_STOP:
-        tr_torrentStop(tr_torrent_handle(tor));
-        in->changed = TRUE;
-        break;
-      case ACT_DELETE:
-        in->dead = g_list_append(in->dead,
-                                 gtk_tree_row_reference_new(model, path));
-        in->changed = TRUE;
-        break;
-      case ACT_INFO:
-        makeinfowind(in->wind, tor);
-        break;
-      case ACT_OPEN:
-      case ACT_PREF:
-        break;
-    }
-  }
-
-  g_object_unref(tor);
 }
 
@@ -1035 +1038 @@
     gtk_list_store_set(GTK_LIST_STORE(data->model), &iter,
                        MC_TORRENT, ii->data, -1);
+    /* we will always ref a torrent before politely stopping it */
+    g_signal_connect(ii->data, "politely_stopped",
+                     G_CALLBACK(g_object_unref), data);
     g_object_unref(ii->data);
   }

trunk/gtk/tr_backend.c

@@ -202 +202 @@
 tr_backend_save_state(TrBackend *back, char **errstr) {
   benc_val_t state;
-  int ii;
-  GList *jj;
+  GList *ii;
 
   TR_IS_BACKEND(back);
@@ -209 +208 @@
   bzero(&state, sizeof(state));
   state.type = TYPE_LIST;
-  state.val.l.alloc = state.val.l.count = g_list_length(back->torrents);
+  state.val.l.alloc = g_list_length(back->torrents);
   state.val.l.vals = g_new0(benc_val_t, state.val.l.alloc);
 
-  for(ii = 0, jj = back->torrents; NULL != jj; ii++, jj = jj->next)
-    tr_torrent_get_state(jj->data, state.val.l.vals + ii);
+  for(ii = back->torrents; NULL != ii; ii = ii->next) {
+    tr_torrent_get_state(ii->data, state.val.l.vals + state.val.l.count);
+    if(0 != state.val.l.vals[state.val.l.count].type)
+      state.val.l.count++;
+  }
 
   cf_savestate(&state, errstr);
@@ -269 +271 @@
 
   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));
+    tr_torrent_stop_politely(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;
-}
+  GList *ii, *list;
+  gboolean ret = TRUE;
+
+  TR_IS_BACKEND(back);
+
+  list = g_list_copy(back->torrents);
+  for(ii = list; NULL != ii; ii = ii->next)
+    if(!(TR_STATUS_PAUSE & tr_torrent_stat_polite(ii->data)->status))
+      ret = FALSE;
+  g_list_free(list);
+
+  return ret;
+}

trunk/gtk/tr_torrent.c

@@ -91 +91 @@
 tr_torrent_class_init(gpointer g_class, gpointer g_class_data SHUTUP) {
   GObjectClass *gobject_class = G_OBJECT_CLASS(g_class);
-  //TrTorrentClass *klass = TR_TORRENT_CLASS(g_class);
+  TrTorrentClass *klass = TR_TORRENT_CLASS(g_class);
   GParamSpec *pspec;
 
@@ -118 +118 @@
                                G_PARAM_READWRITE);
   g_object_class_install_property(gobject_class, TR_TORRENT_PAUSED, pspec);
+
+  klass->paused_signal_id = g_signal_newv("politely-stopped",
+                                          G_TYPE_FROM_CLASS(g_class),
+                                          G_SIGNAL_RUN_LAST, NULL, NULL, NULL,
+                                          g_cclosure_marshal_VOID__VOID,
+                                          G_TYPE_NONE, 0, NULL);
 }
 
@@ -127 +133 @@
   self->back = NULL;
   self->dir = NULL;
+  self->closing = FALSE;
   self->disposed = FALSE;
 }
@@ -341 +348 @@
     return;
 
+  if(tor->closing)
+    return;
+
   state->type = TYPE_DICT;
   state->val.l.vals = g_new0(benc_val_t, len);
@@ -379 +389 @@
   return (TR_STATUS_INACTIVE & st->status ? TRUE : FALSE);
 }
+
+void
+tr_torrent_stop_politely(TrTorrent *tor) {
+  tr_stat_t *st;
+
+  TR_IS_TORRENT(tor);
+
+  if(tor->disposed)
+    return;
+
+  if(!tor->closing) {
+    st = tr_torrent_stat(tor);
+    tor->closing = TRUE;
+    if(TR_STATUS_ACTIVE & st->status)
+      tr_torrentStop(tor->handle);
+  }
+}
+
+tr_stat_t *
+tr_torrent_stat_polite(TrTorrent *tor) {
+  TrTorrentClass *klass;
+  tr_stat_t *st = tr_torrentStat(tor->handle);
+
+  if(tor->disposed)
+    return st;
+
+  if(tor->closing && TR_STATUS_PAUSE & st->status) {
+    tor->closing = FALSE;
+    klass = g_type_class_peek(TR_TORRENT_TYPE);
+    g_signal_emit(tor, klass->paused_signal_id, 0, NULL);
+  }
+
+  return st;
+}

trunk/gtk/tr_torrent.h

@@ -56 +56 @@
   GObject *back;
   char *dir;
+  gboolean closing;
   gboolean disposed;
 };
@@ -61 +62 @@
 struct _TrTorrentClass {
   GObjectClass parent;
+  int paused_signal_id;
 };
 
@@ -82 +84 @@
 tr_torrent_new_with_state(GObject *backend, benc_val_t *state, char **err);
 
+void
+tr_torrent_stop_politely(TrTorrent *tor);
+
+tr_stat_t *
+tr_torrent_stat_polite(TrTorrent *tor);
+
 #ifdef TR_WANT_TORRENT_PRIVATE
 void