Changeset 3872

Timestamp:

08/20/10 14:12:55 (1 year ago)

Author:

janl

Message:

* munin-html: Start using fork to save some wall-clock time. Option --fork us now active and max_html_jobs is recognized by munin-html as the maximum number of paralell processes.

Files:

• branches/1.4-stable/common/lib/Munin/Common/Config.pm (modified) (1 diff)
• branches/1.4-stable/master/lib/Munin/Master/HTMLOld.pm (modified) (6 diffs)

branches/1.4-stable/common/lib/Munin/Common/Config.pm

@@ -38 +38 @@
-        "onlynullcdef", "group_order", "pipe", "pipe_command",
-        "unknown_limit", "num_unknowns", "dropdownlimit",
-
+
+
-
-my %bools = map { $_ => 1} qw(yes no true false on off 1 0);

branches/1.4-stable/master/lib/Munin/Master/HTMLOld.pm

@@ -90 +90 @@
-
-my $do_dump = 0;
-
+
+
+
+
-
-sub html_startup {
@@ -123 +126 @@
-    $htmldir = $config->{htmldir};
-
+    $max_running = &munin_get($config, "max_html_jobs", $max_running);
+
-    %comparisontemplates = instanciate_comparison_templates($tmpldir);
-
@@ -163 +168 @@
-    my $groups = get_group_tree($config);
-
-    
-
-    if (!defined($groups) or scalar(%{$groups} eq '0')) {
-        LOGCROAK "[FATAL] There is nothing to do here, since there are no nodes with any plugins.  Please refer to http://munin-monitoring.org/wiki/FAQ_no_graphs";
-    };
-        
-
-    if (defined $groups->{"name"} and $groups->{"name"} eq "root") {
-        $groups = $groups->{"groups"};    # root->groups
@@ -181 +183 @@
-        exit 0;
-    }
-
-    
-
-    generate_group_templates($groups);
@@ -824 +824 @@
-
-
+sub fork_and_work {
+    my ($work) = @_;
+
+    if (!$do_fork) {
+
+        # We're not forking.  Do work and return.
+        DEBUG "[DEBUG] Doing work synchrnonously";
+        &$work;
+        return;
+    }
+
+    # Make sure we don't fork too much
+    while ($running >= $max_running) {
+        DEBUG
+            "[DEBUG] Too many forks ($running/$max_running), wait for something to get done";
+        look_for_child("block");
+        --$running;
+    }
+
+    my $pid = fork();
+
+    if (!defined $pid) {
+        ERROR "[ERROR] fork failed: $!";
+        die "fork failed: $!";
+    }
+
+    if ($pid == 0) {
+
+        # This block does the real work.  Since we're forking exit
+        # afterwards.
+
+        &$work;
+
+        # See?!
+
+        exit 0;
+
+    }
+    else {
+        ++$running;
+        DEBUG "[DEBUG] Forked: $pid. Now running $running/$max_running";
+        while ($running and look_for_child()) {
+            --$running;
+        }
+    }
+}
+
+
-sub generate_group_templates {
-    my $arr = shift || return;
@@ -837 +885 @@
-            if (defined $key->{'ngroups'} and $key->{'ngroups'}) {
-                # WTF: $key->{'groups'} = $key->{'groups'};
-generate_group_templates($key->{'groups'
+fork_and_work(sub {generate_group_templates($key->{'groups'})
-
-                emit_group_template($key);