Changeset 4395

Timestamp:

10/01/06 13:17:25 (2 years ago)

Author:

morris

Message:

Cleanups

Files:

• trackerd/trunk/trackerd/commands.c (modified) (1 diff)
• trackerd/trunk/trackerd/servers.c (modified) (3 diffs)
• trackerd/trunk/trackerd/servers.h (modified) (2 diffs)
• trackerd/trunk/trackerd/tracker.c (modified) (3 diffs)

trackerd/trunk/trackerd/commands.c

@@ -455 +455 @@
-        server->update_time             = 0.0;
-        server->ip                              = wi_retain(client->ip);
-
+servers_
-                ? wi_retain(WI_ARRAY(arguments, 0))
-                : wi_string_init(wi_string_alloc());

trackerd/trunk/trackerd/servers.c

@@ -259 +259 @@
-                                server->name, server->url, interval - update);
-
-_stats_remove
+s_remove_stats_for_server
-                        
-                        wi_array_remove_data_at_index(wt_servers, i);
@@ -278 +278 @@
-                wt_write_servers();
-        }
+}
+
+
+
+#pragma mark -
+
+void wt_servers_add_stats_for_server(wt_server_t *server) {
+        wi_lock_lock(wt_status_lock);
+        wt_current_servers++;
+        wt_current_users += server->users;
+        wt_current_files += server->files;
+        wt_current_size += server->size;
+        wi_lock_unlock(wt_status_lock);
+}
+
+
+
+void wt_servers_remove_stats_for_server(wt_server_t *server) {
+        wi_lock_lock(wt_status_lock);
+        wt_current_servers--;
+        wt_current_users -= server->users;
+        wt_current_files -= server->files;
+        wt_current_size -= server->size;
+        wi_lock_unlock(wt_status_lock);
+}
+
+
+
+#pragma mark -
+
+wi_boolean_t wt_servers_category_is_valid(wi_string_t *category) {
+        wi_file_t               *file;
+        wi_string_t             *string;
+        wi_boolean_t    result = false;
+
+        if(wi_string_length(category) == 0)
+                return true;
+
+        file = wi_file_for_reading(wt_settings.categories);
+        
+        if(!file) {
+                wi_log_err(WI_STR("Could not open %@: %m"), wt_settings.categories);
+                
+                return true;
+        }
+        
+        while((string = wi_file_read_config_line(file))) {
+                if(wi_is_equal(category, string)) {
+                        result = true;
+                        
+                        break;
+                }
+        }
+
+        return result;
-}
-
@@ -423 +478 @@
-        return value;
-}
-
-
-
-#pragma mark -
-
-void wt_server_stats_add(wt_server_t *server) {
-        wi_lock_lock(wt_status_lock);
-        wt_current_servers++;
-        wt_current_users += server->users;
-        wt_current_files += server->files;
-        wt_current_size += server->size;
-        wi_lock_unlock(wt_status_lock);
-}
-
-
-
-void wt_server_stats_remove(wt_server_t *server) {
-        wi_lock_lock(wt_status_lock);
-        wt_current_servers--;
-        wt_current_users -= server->users;
-        wt_current_files -= server->files;
-        wt_current_size -= server->size;
-        wi_lock_unlock(wt_status_lock);
-}
-
-
-
-#pragma mark -
-
-wi_boolean_t wt_category_is_valid(wi_string_t *category) {
-        wi_file_t               *file;
-        wi_string_t             *string;
-        wi_boolean_t    result = false;
-
-        if(wi_string_length(category) == 0)
-                return true;
-
-        file = wi_file_for_reading(wt_settings.categories);
-        
-        if(!file) {
-                wi_log_err(WI_STR("Could not open %@: %m"), wt_settings.categories);
-                
-                return true;
-        }
-        
-        while((string = wi_file_read_config_line(file))) {
-                if(wi_is_equal(category, string)) {
-                        result = true;
-                        
-                        break;
-                }
-        }
-
-        return result;
-}

trackerd/trunk/trackerd/servers.h

@@ -63 +63 @@
-void                                                            wt_write_servers(void);
-
+void                                                            wt_servers_add_stats_for_server(wt_server_t *);
+void                                                            wt_servers_remove_stats_for_server(wt_server_t *);
+
+wi_boolean_t                                            wt_servers_category_is_valid(wi_string_t *);
+
-wt_server_t *                                           wt_server_alloc(void);
-wt_server_t *                                           wt_server_init(wt_server_t *);
@@ -70 +75 @@
-wt_server_t *                                           wt_server_with_key(wi_string_t *);
-
-void                                                            wt_server_stats_add(wt_server_t *);
-void                                                            wt_server_stats_remove(wt_server_t *);
-
-wi_boolean_t                                            wt_category_is_valid(wi_string_t *);
-
-
-extern wi_array_t                                       *wt_servers;

trackerd/trunk/trackerd/tracker.c

@@ -316 +316 @@
-                                                server->name, server->url, interval - server->update_time);
-
-_stats_remove
-
-list
-list
-list
+s_remove_stats_for_server
+
+array
+array
+array
-
-                                        wi_lock_lock(wt_status_lock);
@@ -333 +333 @@
-                        
-                        /* update server */
-_stats_remove
+s_remove_stats_for_server
-                        server->users           = wi_string_uint32(WI_ARRAY(arguments, 1));
-                        server->guest           = wi_string_bool(WI_ARRAY(arguments, 2));
@@ -340 +340 @@
-                        server->size            = wi_string_uint64(WI_ARRAY(arguments, 5));
-                        server->update_time     = interval;
-_stats_add
+s_add_stats_for_server
-
-                        wi_lock_lock(wt_status_lock);