[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.559 by root, Sat Feb 26 12:50:27 2011 UTC vs.
Revision 1.561 by root, Fri Apr 22 06:10:33 2011 UTC

    Carp::cluck "error in event callback: @_";
 };
 #############################################################################
+sub fork_call(&@);
+sub get_slot($;$$);
+#############################################################################
 =head2 UTILITY FUNCTIONS
 =over 4
 =item dumpval $ref
       $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
       $d
    } || "[unable to dump $_[0]: '$@']";
 }
+=item $scalar = load_file $path
+Loads the given file from path and returns its contents. Croaks on error
+and can block.
+=cut
+sub load_file($) {
+   0 <= aio_load $_[0], my $data
+      or Carp::croak "$_[0]: $!";
+   $data
+}
 =item $ref = cf::decode_json $json
 Converts a JSON string into the corresponding perl data structure.
 =item $json = cf::encode_json $ref
 our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
 sub encode_json($) { $json_coder->encode ($_[0]) }
 sub decode_json($) { $json_coder->decode ($_[0]) }
+=item $ref = cf::decode_storable $scalar
+Same as Coro::Storable::thaw, so blocks.
+=cut
+BEGIN { *decode_storable = \&Coro::Storable::thaw }
-=item $ref = cf::yaml_load $scalar
+=item $ref = cf::decode_yaml $scalar
 Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
 =cut
-sub fork_call(&@);
+sub decode_yaml($) {
-sub yaml_load($) {
    fork_call { YAML::XS::Load $_[0] } @_
+}
+=item $scalar = cf::unlzf $scalar
+Same as Compress::LZF::compress, but takes server ticks into account, so
+blocks.
+=cut
+sub unlzf($) {
+   # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
+   cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
+   Compress::LZF::decompress $_[0]
 }
 =item cf::post_init { BLOCK }
 Execute the given codeblock, I<after> all extensions have been (re-)loaded,
    EV::periodic $start, $interval, 0, $cb
 }
 =item cf::get_slot $time[, $priority[, $name]]
-Allocate $time seconds of blocking CPU time at priority C<$priority>:
+Allocate $time seconds of blocking CPU time at priority C<$priority>
-This call blocks and returns only when you have at least C<$time> seconds
+(default: 0):  This call blocks and returns only when you have at least
-of cpu time till the next tick. The slot is only valid till the next cede.
+C<$time> seconds of cpu time till the next tick. The slot is only valid
+till the next cede.
+Background jobs should use a priority les than zero, interactive jobs
+should use 100 or more.
 The optional C<$name> can be used to identify the job to run. It might be
 used for statistical purposes and should identify the same time-class.
 Useful for short background jobs.
       my @data;
       my $md5;
       for (0 .. $#$src) {
-         0 <= aio_load $src->[$_], $data[$_]
+         $data[$_] = load_file $src->[$_];
-            or Carp::croak "$src->[$_]: $!";
       }
       # if processing is expensive, check
       # checksum first
       if (1) {
             while (my ($k, $v) = each %todo) {
                cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
                   if exists $v->{meta}{mandatory};
             }
+            last;
          }
       }
    };
 }
    Carp::cluck "unable to resolve path '$path' (base '$base')";
    ()
 }
+# may re-bless or do other evil things
 sub init {
    my ($self) = @_;
    $self
 }
    my $enc = JSON::XS->new->utf8->canonical->relaxed;
    trace "loading facedata from $path\n";
-   0 < aio_load $path, my $facedata
+   my $facedata = decode_storable load_file $path;
-      or die "$path: $!";
-   $facedata = Coro::Storable::thaw $facedata;
    $facedata->{version} == 2
       or cf::cleanup "$path: version mismatch, cannot proceed.";
    # patch in the exptable
 }
 sub reload_sound {
    trace "loading sound config from $DATADIR/sound\n";
-   0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
-      or die "$DATADIR/sound $!";
-   my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
+   my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
    for (0 .. SOUND_CAST_SPELL_0 - 1) {
       my $sound = $soundconf->{compat}[$_]
          or next;
 }
 sub reload_config {
    trace "reloading config file...\n";
-   0 < aio_load "$CONFDIR/config", my $config
+   my $config = load_file "$CONFDIR/config";
-      or die "$CONFDIR/config: $!";
    utf8::decode $config;
-   *CFG = yaml_load $config;
+   *CFG = decode_yaml $config;
    $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
    $cf::map::MAX_RESET     = $CFG{map_max_reset}     if exists $CFG{map_max_reset};
    $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
 sub main {
    cf::init_globals; # initialise logging
    LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
-   LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
+   LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
    LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
    LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
    $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.559 by root, Sat Feb 26 12:50:27 2011 UTC vs. Revision 1.561 by root, Fri Apr 22 06:10:33 2011 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.559 by root, Sat Feb 26 12:50:27 2011 UTC vs.
Revision 1.561 by root, Fri Apr 22 06:10:33 2011 UTC