ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.545 by root, Thu May 6 22:35:41 2010 UTC vs.
Revision 1.565 by root, Sat Apr 30 05:41:17 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
… …
233from wherever your confdir points to. 235from wherever your confdir points to.
234 236
235=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
236 238
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
238returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
239per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
240 247
241=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
242 249
243This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
307} 314}
308 315
309$EV::DIED = sub { 316$EV::DIED = sub {
310 Carp::cluck "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
311}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
312 324
313############################################################################# 325#############################################################################
314 326
315=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
316 328
… …
337 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
338 $d 350 $d
339 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
340} 352}
341 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
342=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
343 369
344Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
345 371
346=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
… …
352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353 379
354sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
355sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
356 382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
357=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
358 415
359Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
361 418
362The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
363is a reload or not. 420is a reload or not.
364 421
365=cut 422=cut
366 423
367sub post_init(&) { 424sub post_init(&) {
368 push @POST_INIT, shift; 425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
369} 443}
370 444
371=item cf::lock_wait $string 445=item cf::lock_wait $string
372 446
373Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
… …
426 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
427} 501}
428 502
429=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
430 504
431Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
432This call blocks and returns only when you have at least C<$time> seconds 506(default: 0): This call blocks and returns only when you have at least
433of cpu time till the next tick. The slot is only valid till the next cede. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
434 512
435The optional C<$name> can be used to identify the job to run. It might be 513The optional C<$name> can be used to identify the job to run. It might be
436used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
437 515
438Useful for short background jobs. 516Useful for short background jobs.
… …
578 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
579 657
580 $coro 658 $coro
581} 659}
582 660
583=item fork_call { }, $args 661=item fork_call { }, @args
584 662
585Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
586process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
587Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
588never block itself or use any form of event handling. 666never block itself or use any form of event handling.
589 667
590=cut 668=cut
591 669
670sub post_fork {
671 reset_signals;
672}
673
592sub fork_call(&@) { 674sub fork_call(&@) {
593 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
594 676
595 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
596 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
597 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
598 680
599 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
600 reset_signals; 682 cf::post_fork;
601 &$cb 683 &$cb
602 }, @args; 684 } @args;
603 685
604 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
605} 687}
606 688
607sub objinfo { 689sub objinfo {
… …
729 811
730 my @data; 812 my @data;
731 my $md5; 813 my $md5;
732 814
733 for (0 .. $#$src) { 815 for (0 .. $#$src) {
734 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
735 or Carp::croak "$src->[$_]: $!";
736 } 817 }
737 818
738 # if processing is expensive, check 819 # if processing is expensive, check
739 # checksum first 820 # checksum first
740 if (1) { 821 if (1) {
… …
1474 1555
1475 while (my ($k, $v) = each %todo) { 1556 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory}; 1558 if exists $v->{meta}{mandatory};
1478 } 1559 }
1560
1561 last;
1479 } 1562 }
1480 } 1563 }
1481 }; 1564 };
1482} 1565}
1483 1566
… …
1641 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1642 1725
1643 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1645 1728
1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1647 $pl->deactivate; 1730 $pl->deactivate;
1731
1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1649 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1650 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1651 1737
1652 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1653 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1654 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1820sub generate_random_map { 1906sub generate_random_map {
1821 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1822 1908
1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1824 1910
1825 # mit "rum" bekleckern, nicht
1826 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1830 $rmp->{exit_on_final_map},
1831 $rmp->{xsize}, $rmp->{ysize},
1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1834 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1835 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1836 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1837 (cf::region::find $rmp->{region}), $rmp->{custom}
1838 )
1839} 1912}
1840 1913
1841=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1842 1915
1843Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
… …
1881 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1882 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1883 # ?random/... random maps 1956 # ?random/... random maps
1884 # /... normal maps 1957 # /... normal maps
1885 # ~user/... per-player map of a specific user 1958 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1886 1960
1887 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1888 1962
1889 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1890 # something that looks reasonable 1964 # something that looks reasonable
1891 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1892 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 1966 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1893 1967
1894 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1895 $path = "$base/$path"; 1969 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1896 } 1984 }
1897 1985
1898 for ($path) { 1986 for ($path) {
1899 redo if s{//}{/};
1900 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1901 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1902 } 1989 }
1903 1990
1904 $path 1991 $path
… …
1922 2009
1923 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1924 () 2011 ()
1925} 2012}
1926 2013
2014# may re-bless or do other evil things
1927sub init { 2015sub init {
1928 my ($self) = @_; 2016 my ($self) = @_;
1929 2017
1930 $self 2018 $self
1931} 2019}
… …
2053sub find { 2141sub find {
2054 my ($path, $origin) = @_; 2142 my ($path, $origin) = @_;
2055 2143
2056 cf::cede_to_tick; 2144 cf::cede_to_tick;
2057 2145
2058 $path = normalise $path, $origin && $origin->path; 2146 $path = normalise $path, $origin;
2059 2147
2060 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2148 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2061 my $guard2 = cf::lock_acquire "map_find:$path"; 2149 my $guard2 = cf::lock_acquire "map_find:$path";
2062 2150
2063 $cf::MAP{$path} || do { 2151 $cf::MAP{$path} || do {
… …
2103 $self->alloc; 2191 $self->alloc;
2104 2192
2105 $self->pre_load; 2193 $self->pre_load;
2106 cf::cede_to_tick; 2194 cf::cede_to_tick;
2107 2195
2196 if (exists $self->{load_path}) {
2108 my $f = new_from_file cf::object::thawer $self->{load_path}; 2197 my $f = new_from_file cf::object::thawer $self->{load_path};
2109 $f->skip_block; 2198 $f->skip_block;
2110 $self->_load_objects ($f) 2199 $self->_load_objects ($f)
2111 or return; 2200 or return;
2112 2201
2113 $self->post_load_original 2202 $self->post_load_original
2114 if delete $self->{load_original}; 2203 if delete $self->{load_original};
2115 2204
2116 if (my $uniq = $self->uniq_path) { 2205 if (my $uniq = $self->uniq_path) {
2117 utf8::encode $uniq; 2206 utf8::encode $uniq;
2118 unless (aio_stat $uniq) { 2207 unless (aio_stat $uniq) {
2119 if (my $f = new_from_file cf::object::thawer $uniq) { 2208 if (my $f = new_from_file cf::object::thawer $uniq) {
2120 $self->clear_unique_items; 2209 $self->clear_unique_items;
2121 $self->_load_objects ($f); 2210 $self->_load_objects ($f);
2122 $f->resolve_delayed_derefs; 2211 $f->resolve_delayed_derefs;
2212 }
2123 } 2213 }
2124 } 2214 }
2125 }
2126 2215
2127 $f->resolve_delayed_derefs; 2216 $f->resolve_delayed_derefs;
2217 }
2128 2218
2129 cf::cede_to_tick; 2219 cf::cede_to_tick;
2130 # now do the right thing for maps 2220 # now do the right thing for maps
2131 $self->link_multipart_objects; 2221 $self->link_multipart_objects;
2132 $self->difficulty ($self->estimate_difficulty) 2222 $self->difficulty ($self->estimate_difficulty)
… …
2146 2236
2147 $self->in_memory (cf::MAP_ACTIVE); 2237 $self->in_memory (cf::MAP_ACTIVE);
2148 } 2238 }
2149 2239
2150 $self->post_load; 2240 $self->post_load;
2241
2242 1
2151} 2243}
2152 2244
2153# customize the map for a given player, i.e. 2245# customize the map for a given player, i.e.
2154# return the _real_ map. used by e.g. per-player 2246# return the _real_ map. used by e.g. per-player
2155# maps to change the path to ~playername/mappath 2247# maps to change the path to ~playername/mappath
… …
2214our $MAP_PREFETCHER = undef; 2306our $MAP_PREFETCHER = undef;
2215 2307
2216sub find_async { 2308sub find_async {
2217 my ($path, $origin, $load) = @_; 2309 my ($path, $origin, $load) = @_;
2218 2310
2219 $path = normalise $path, $origin && $origin->{path}; 2311 $path = normalise $path, $origin;
2220 2312
2221 if (my $map = $cf::MAP{$path}) { 2313 if (my $map = $cf::MAP{$path}) {
2222 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2314 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2223 } 2315 }
2224 2316
… …
2735 ($path, $x, $y) = (undef, undef, undef); 2827 ($path, $x, $y) = (undef, undef, undef);
2736 } 2828 }
2737 } 2829 }
2738 2830
2739 my $map = eval { 2831 my $map = eval {
2740 my $map = defined $path ? cf::map::find $path : undef; 2832 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2741 2833
2742 if ($map) { 2834 if ($map) {
2743 $map = $map->customise_for ($self); 2835 $map = $map->customise_for ($self);
2744 $map = $check->($map, $x, $y, $self) if $check && $map; 2836 $map = $check->($map, $x, $y, $self) if $check && $map;
2745 } else { 2837 } else {
… …
2843 2935
2844 prepare_random_map $exit 2936 prepare_random_map $exit
2845 if $exit->slaying eq "/!"; 2937 if $exit->slaying eq "/!";
2846 } 2938 }
2847 2939
2848 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2940 my $map = cf::map::normalise $exit->slaying, $exit->map;
2849 my $x = $exit->stats->hp; 2941 my $x = $exit->stats->hp;
2850 my $y = $exit->stats->sp; 2942 my $y = $exit->stats->sp;
2851 2943
2852 $self->goto ($map, $x, $y); 2944 $self->goto ($map, $x, $y);
2853 2945
… …
3370 3462
3371 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3463 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3372 3464
3373 trace "loading facedata from $path\n"; 3465 trace "loading facedata from $path\n";
3374 3466
3375 my $facedata; 3467 my $facedata = decode_storable load_file $path;
3376 0 < aio_load $path, $facedata
3377 or die "$path: $!";
3378
3379 $facedata = Coro::Storable::thaw $facedata;
3380 3468
3381 $facedata->{version} == 2 3469 $facedata->{version} == 2
3382 or cf::cleanup "$path: version mismatch, cannot proceed."; 3470 or cf::cleanup "$path: version mismatch, cannot proceed.";
3383 3471
3384 # patch in the exptable 3472 # patch in the exptable
… …
3398 3486
3399 cf::face::set_visibility $idx, $info->{visibility}; 3487 cf::face::set_visibility $idx, $info->{visibility};
3400 cf::face::set_magicmap $idx, $info->{magicmap}; 3488 cf::face::set_magicmap $idx, $info->{magicmap};
3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3489 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3490 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3491 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3403 3492
3404 cf::cede_to_tick; 3493 cf::cede_to_tick;
3405 } 3494 }
3406 3495
3407 while (my ($face, $info) = each %$faces) { 3496 while (my ($face, $info) = each %$faces) {
… …
3502} 3591}
3503 3592
3504sub reload_sound { 3593sub reload_sound {
3505 trace "loading sound config from $DATADIR/sound\n"; 3594 trace "loading sound config from $DATADIR/sound\n";
3506 3595
3507 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3508 or die "$DATADIR/sound $!";
3509
3510 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3596 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3511 3597
3512 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3598 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513 my $sound = $soundconf->{compat}[$_] 3599 my $sound = $soundconf->{compat}[$_]
3514 or next; 3600 or next;
3515 3601
… …
3539} 3625}
3540 3626
3541sub reload_config { 3627sub reload_config {
3542 trace "reloading config file...\n"; 3628 trace "reloading config file...\n";
3543 3629
3544 open my $fh, "<:utf8", "$CONFDIR/config" 3630 my $config = load_file "$CONFDIR/config";
3545 or return; 3631 utf8::decode $config;
3546 3632 *CFG = decode_yaml $config;
3547 local $/;
3548 *CFG = YAML::XS::Load scalar <$fh>;
3549 3633
3550 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3634 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3551 3635
3552 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3636 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3553 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3637 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3557 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3641 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3558 and die "WARNING: m(un)lockall failed: $!\n"; 3642 and die "WARNING: m(un)lockall failed: $!\n";
3559 }; 3643 };
3560 warn $@ if $@; 3644 warn $@ if $@;
3561 } 3645 }
3562
3563 trace "finished reloading resource files\n";
3564} 3646}
3565 3647
3566sub pidfile() { 3648sub pidfile() {
3567 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3649 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3568 or die "$PIDFILE: $!"; 3650 or die "$PIDFILE: $!";
… …
3593 3675
3594sub main { 3676sub main {
3595 cf::init_globals; # initialise logging 3677 cf::init_globals; # initialise logging
3596 3678
3597 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3679 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3598 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3680 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3599 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3681 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3600 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3682 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3601 3683
3602 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3684 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3603 3685
… …
3639 3721
3640 # no (long-running) fork's whatsoever before this point(!) 3722 # no (long-running) fork's whatsoever before this point(!)
3641 use POSIX (); 3723 use POSIX ();
3642 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3724 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3643 3725
3644 (pop @POST_INIT)->(0) while @POST_INIT; 3726 cf::_post_init 0;
3645 }; 3727 };
3646 3728
3647 cf::object::thawer::errors_are_fatal 0; 3729 cf::object::thawer::errors_are_fatal 0;
3648 info "parse errors in files are no longer fatal from this point on.\n"; 3730 info "parse errors in files are no longer fatal from this point on.\n";
3649 3731
… …
3872 3954
3873 my $t1 = AE::time; 3955 my $t1 = AE::time;
3874 3956
3875 while ($RELOAD) { 3957 while ($RELOAD) {
3876 cf::get_slot 0.1, -1, "reload_perl"; 3958 cf::get_slot 0.1, -1, "reload_perl";
3877 info "reloading..."; 3959 info "perl_reload: reloading...";
3878 3960
3879 trace "entering sync_job"; 3961 trace "perl_reload: entering sync_job";
3880 3962
3881 cf::sync_job { 3963 cf::sync_job {
3882 #cf::emergency_save; 3964 #cf::emergency_save;
3883 3965
3884 trace "cancelling all extension coros"; 3966 trace "perl_reload: cancelling all extension coros";
3885 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
3886 %EXT_CORO = (); 3968 %EXT_CORO = ();
3887 3969
3888 trace "removing commands"; 3970 trace "perl_reload: removing commands";
3889 %COMMAND = (); 3971 %COMMAND = ();
3890 3972
3891 trace "removing ext/exti commands"; 3973 trace "perl_reload: removing ext/exti commands";
3892 %EXTCMD = (); 3974 %EXTCMD = ();
3893 %EXTICMD = (); 3975 %EXTICMD = ();
3894 3976
3895 trace "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
3896 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
3897 trace "... unloading $pkg"; 3979 trace "... unloading $pkg";
3898 3980
3899 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
3900 eval { 3982 eval {
… …
3905 3987
3906 trace "... clearing $pkg"; 3988 trace "... clearing $pkg";
3907 clear_package $pkg; 3989 clear_package $pkg;
3908 } 3990 }
3909 3991
3910 trace "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3911 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
3912 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3913 3995
3914 trace "... unloading $k"; 3996 trace "... unloading $k";
3915 delete $INC{$k}; 3997 delete $INC{$k};
… …
3922 } 4004 }
3923 4005
3924 clear_package $k; 4006 clear_package $k;
3925 } 4007 }
3926 4008
3927 trace "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
3928 clear_package "safe::$_" 4010 clear_package "safe::$_"
3929 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4011 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3930 4012
3931 trace "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
3932 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
3933 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3934 4016
3935 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
3936 # and global variables created in xs 4018 # and global variables created in xs
3937 #clear_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
3938 4020
3939 info "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
3940 4022
3941 trace "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
3942 require cf; 4024 require cf;
3943 cf::_connect_to_perl_1; 4025 cf::_connect_to_perl_1;
3944 4026
3945 trace "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
3946 cf::reload_config; 4028 cf::reload_config;
3947 4029
3948 trace "loading extensions"; 4030 trace "perl_reload: loading extensions";
3949 cf::load_extensions; 4031 cf::load_extensions;
3950 4032
3951 if ($REATTACH_ON_RELOAD) { 4033 if ($REATTACH_ON_RELOAD) {
3952 trace "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
3953 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
3954 trace "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
3955 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
3956 trace "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
3957 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
3958 } 4040 }
3959 4041
3960 trace "running post_init jobs"; 4042 cf::_post_init 1;
3961 (pop @POST_INIT)->(1) while @POST_INIT;
3962 4043
3963 trace "leaving sync_job"; 4044 trace "perl_reload: leaving sync_job";
3964 4045
3965 1 4046 1
3966 } or do { 4047 } or do {
3967 error $@; 4048 error $@;
3968 cf::cleanup "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
3969 }; 4050 };
3970 4051
3971 info "reloaded";
3972 --$RELOAD; 4052 --$RELOAD;
3973 } 4053 }
3974 4054
3975 $t1 = AE::time - $t1; 4055 $t1 = AE::time - $t1;
3976 info "reload completed in ${t1}s\n"; 4056 info "perl_reload: completed in ${t1}s\n";
3977}; 4057};
3978 4058
3979our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
3980 4060
3981sub reload_perl() { 4061sub reload_perl() {
… …
4009my $bug_warning = 0; 4089my $bug_warning = 0;
4010 4090
4011our @WAIT_FOR_TICK; 4091our @WAIT_FOR_TICK;
4012our @WAIT_FOR_TICK_BEGIN; 4092our @WAIT_FOR_TICK_BEGIN;
4013 4093
4014sub wait_for_tick { 4094sub wait_for_tick() {
4015 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4095 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4016 4096
4017 my $signal = new Coro::Signal; 4097 my $signal = new Coro::Signal;
4018 push @WAIT_FOR_TICK, $signal; 4098 push @WAIT_FOR_TICK, $signal;
4019 $signal->wait; 4099 $signal->wait;
4020} 4100}
4021 4101
4022sub wait_for_tick_begin { 4102sub wait_for_tick_begin() {
4023 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4103 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4024 4104
4025 my $signal = new Coro::Signal; 4105 my $signal = new Coro::Signal;
4026 push @WAIT_FOR_TICK_BEGIN, $signal; 4106 push @WAIT_FOR_TICK_BEGIN, $signal;
4027 $signal->wait; 4107 $signal->wait;
… …
4114 IO::AIO::min_parallel 8; 4194 IO::AIO::min_parallel 8;
4115 IO::AIO::max_poll_time $TICK * 0.1; 4195 IO::AIO::max_poll_time $TICK * 0.1;
4116 undef $AnyEvent::AIO::WATCHER; 4196 undef $AnyEvent::AIO::WATCHER;
4117} 4197}
4118 4198
4119my $_log_backtrace; 4199our $_log_backtrace;
4200our $_log_backtrace_last;
4120 4201
4121sub _log_backtrace { 4202sub _log_backtrace {
4122 my ($msg, @addr) = @_; 4203 my ($msg, @addr) = @_;
4123 4204
4124 $msg =~ s/\n//; 4205 $msg =~ s/\n$//;
4125 4206
4207 if ($_log_backtrace_last eq $msg) {
4208 LOG llevInfo, "[ABT] $msg\n";
4209 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4126 # limit the # of concurrent backtraces 4210 # limit the # of concurrent backtraces
4127 if ($_log_backtrace < 2) { 4211 } elsif ($_log_backtrace < 2) {
4212 $_log_backtrace_last = $msg;
4128 ++$_log_backtrace; 4213 ++$_log_backtrace;
4129 my $perl_bt = Carp::longmess $msg; 4214 my $perl_bt = Carp::longmess $msg;
4130 async { 4215 async {
4131 $Coro::current->{desc} = "abt $msg"; 4216 $Coro::current->{desc} = "abt $msg";
4132 4217
… …
4152 LOG llevInfo, "[ABT] $_\n" for @bt; 4237 LOG llevInfo, "[ABT] $_\n" for @bt;
4153 --$_log_backtrace; 4238 --$_log_backtrace;
4154 }; 4239 };
4155 } else { 4240 } else {
4156 LOG llevInfo, "[ABT] $msg\n"; 4241 LOG llevInfo, "[ABT] $msg\n";
4157 LOG llevInfo, "[ABT] [suppressed]\n"; 4242 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4158 } 4243 }
4159} 4244}
4160 4245
4161# load additional modules 4246# load additional modules
4162require "cf/$_.pm" for @EXTRA_MODULES; 4247require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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