put file senders in a round-robin queue so multiple transfers upload at a uniform pace

src/chat.c

@@ -423,7 +423,7 @@ static void chat_onFileData(ToxWindow *self, Tox *m, int32_t num, uint8_t filenu
     if (!remain || timed_out(friends[num].file_receiver.last_progress[filenum], curtime, 1)) {
         friends[num].file_receiver.last_progress[filenum] = curtime;
         uint64_t size = friends[num].file_receiver.size[filenum];
-        double pct_remain = remain ? (1 - (remain / size)) * 100 : 100;
+        double pct_remain = remain > 0 ? (1 - (remain / size)) * 100 : 100;
         print_progress_bar(self, filenum, num, pct_remain);
         friends[num].file_receiver.bps[filenum] = 0;
     }

src/chat_commands.c

@@ -37,6 +37,7 @@ extern ToxicFriend friends[MAX_FRIENDS_NUM];
 
 extern FileSender file_senders[MAX_FILES];
 extern uint8_t max_file_senders_index;
+extern uint8_t num_active_file_senders;
 
 void cmd_groupinvite(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
@@ -209,6 +210,7 @@ void cmd_sendfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv
 
     for (i = 0; i < MAX_FILES; ++i) {
         if (!file_senders[i].active) {
+            file_senders[i].queue_pos = num_active_file_senders;
             memcpy(file_senders[i].pathname, path, path_len + 1);
             file_senders[i].active = true;
             file_senders[i].toxwin = self;
@@ -223,6 +225,8 @@ void cmd_sendfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv
             const char *msg = "Sending file: '%s'";
             line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, msg, path);
 
+            ++num_active_file_senders;
+
             if (i == max_file_senders_index)
                 ++max_file_senders_index;
 

src/file_senders.c

@@ -35,13 +35,15 @@
 
 FileSender file_senders[MAX_FILES];
 uint8_t max_file_senders_index;
+uint8_t num_active_file_senders;
 extern ToxicFriend friends[MAX_FRIENDS_NUM];
 
 #define KiB 1024
 #define MiB 1048576       /* 1024 ^ 2 */
 #define GiB 1073741824    /* 1024 ^ 3 */
 
-/* creates initial progress line that will be updated during file transfer. */
+/* creates initial progress line that will be updated during file transfer.
+   Assumes progline is of size MAX_STR_SIZE */
 void prep_prog_line(char *progline)
 {
     strcpy(progline, "0.0 B/s [");
@@ -127,6 +129,7 @@ static void close_file_sender(ToxWindow *self, Tox *m, int i, char *msg, int CTR
     fclose(file_senders[i].file);
     memset(&file_senders[i], 0, sizeof(FileSender));
     set_max_file_senders_index();
+    --num_active_file_senders;
 }
 
 void close_all_file_senders(Tox *m)
@@ -145,33 +148,15 @@ void close_all_file_senders(Tox *m)
     }
 }
 
-void do_file_senders(Tox *m)
+static void send_file_data(ToxWindow *self, Tox *m, int i, int32_t friendnum, int filenum, const char *pathname)
 {
     char msg[MAX_STR_SIZE];
-    int i;
-
-    for (i = 0; i < max_file_senders_index; ++i) {
-        if (!file_senders[i].active)
-            continue;
-
-        ToxWindow *self = file_senders[i].toxwin;
-        char *pathname = file_senders[i].pathname;
-        int filenum = file_senders[i].filenum;
-        int32_t friendnum = file_senders[i].friendnum;
     FILE *fp = file_senders[i].file;
 
-        /* If file transfer has timed out kill transfer and send kill control */
-        if (timed_out(file_senders[i].timestamp, get_unix_time(), TIMEOUT_FILESENDER)) {
-            snprintf(msg, sizeof(msg), "File transfer for '%s' timed out.", pathname);
-            close_file_sender(self, m, i, msg, TOX_FILECONTROL_KILL, filenum, friendnum);
-            notify(self, error, NT_NOFOCUS | NT_WNDALERT_2);
-            continue;
-        }
-
     while (true) {
         if (tox_file_send_data(m, friendnum, filenum, (uint8_t *) file_senders[i].nextpiece,
                                file_senders[i].piecelen) == -1)
-                break;
+            return;
 
         uint64_t curtime = get_unix_time();
         file_senders[i].timestamp = curtime;
@@ -184,7 +169,7 @@ void do_file_senders(Tox *m)
         /* refresh line with percentage complete and transfer speed (must be called once per second) */
         if ((self->chatwin != NULL && timed_out(file_senders[i].last_progress, curtime, 1)) || !remain) {
             file_senders[i].last_progress = curtime;
-                double pct_remain = remain ? (1 - (remain / file_senders[i].size)) * 100 : 100;
+            double pct_remain = remain > 0 ? (1 - (remain / file_senders[i].size)) * 100 : 100;
             print_progress_bar(self, i, -1, pct_remain);
             file_senders[i].bps = 0;
         }
@@ -193,8 +178,39 @@ void do_file_senders(Tox *m)
             snprintf(msg, sizeof(msg), "File '%s' successfuly sent.", pathname);
             close_file_sender(self, m, i, msg, TOX_FILECONTROL_FINISHED, filenum, friendnum);
             notify(self, transfer_completed, NT_NOFOCUS | NT_WNDALERT_2);
-                break;
+            return;
         }
     }
 }
+
+void do_file_senders(Tox *m)
+{
+    char msg[MAX_STR_SIZE];
+    int i;
+
+    for (i = 0; i < max_file_senders_index; ++i) {
+        if (!file_senders[i].active)
+            continue;
+
+        if (file_senders[i].queue_pos > 0) {
+            --file_senders[i].queue_pos;
+            continue;
+        }
+
+        ToxWindow *self = file_senders[i].toxwin;
+        char *pathname = file_senders[i].pathname;
+        int filenum = file_senders[i].filenum;
+        int32_t friendnum = file_senders[i].friendnum;
+
+        /* If file transfer has timed out kill transfer and send kill control */
+        if (timed_out(file_senders[i].timestamp, get_unix_time(), TIMEOUT_FILESENDER)) {
+            snprintf(msg, sizeof(msg), "File transfer for '%s' timed out.", pathname);
+            close_file_sender(self, m, i, msg, TOX_FILECONTROL_KILL, filenum, friendnum);
+            notify(self, error, NT_NOFOCUS | NT_WNDALERT_2);
+            continue;
+        }
+
+        file_senders[i].queue_pos = num_active_file_senders - 1;
+        send_file_data(self, m, i, friendnum, filenum, pathname);
+    }
 }

src/file_senders.h

@@ -45,9 +45,11 @@ typedef struct {
     double bps;
     uint64_t size;
     uint32_t line_id;
+    uint8_t queue_pos;
 } FileSender;
 
-/* creates progress line that will be updated during file transfer. */
+/* creates initial progress line that will be updated during file transfer.
+   Assumes progline is of size MAX_STR_SIZE */
 void prep_prog_line(char *progline);
 
 /* prints a progress bar for file transfers.