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.548 by root, Mon May 10 21:40:22 2010 UTC vs.
Revision 1.566 by root, Sun May 1 16:58:16 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";
… …
312} 314}
313 315
314$EV::DIED = sub { 316$EV::DIED = sub {
315 Carp::cluck "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
316}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
317 324
318############################################################################# 325#############################################################################
319 326
320=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
321 328
… …
342 $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;
343 $d 350 $d
344 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
345} 352}
346 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
347=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
348 369
349Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
350 371
351=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
… …
357our $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
358 379
359sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
360sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
361 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
362=item $ref = cf::yaml_load $scalar 391=item $ref = cf::decode_yaml $scalar
363 392
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks). 393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365 394
366=cut 395=cut
367 396
368sub fork_call(&@); 397sub decode_yaml($) {
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_ 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]
372} 412}
373 413
374=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
375 415
376Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
… …
381 421
382=cut 422=cut
383 423
384sub post_init(&) { 424sub post_init(&) {
385 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 }
386} 443}
387 444
388=item cf::lock_wait $string 445=item cf::lock_wait $string
389 446
390Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
… …
443 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
444} 501}
445 502
446=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
447 504
448Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
449This 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
450of 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.
451 512
452The 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
453used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
454 515
455Useful for short background jobs. 516Useful for short background jobs.
… …
750 811
751 my @data; 812 my @data;
752 my $md5; 813 my $md5;
753 814
754 for (0 .. $#$src) { 815 for (0 .. $#$src) {
755 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
756 or Carp::croak "$src->[$_]: $!";
757 } 817 }
758 818
759 # if processing is expensive, check 819 # if processing is expensive, check
760 # checksum first 820 # checksum first
761 if (1) { 821 if (1) {
… …
1495 1555
1496 while (my ($k, $v) = each %todo) { 1556 while (my ($k, $v) = each %todo) {
1497 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1498 if exists $v->{meta}{mandatory}; 1558 if exists $v->{meta}{mandatory};
1499 } 1559 }
1560
1561 last;
1500 } 1562 }
1501 } 1563 }
1502 }; 1564 };
1503} 1565}
1504 1566
… …
1662 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1663 1725
1664 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1665 $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
1666 1728
1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1668 $pl->deactivate; 1730 $pl->deactivate;
1669 1731
1670 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;
1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1671 ext::highscore::check ($pl->ob); 1734 ext::highscore::check ($pl->ob);
1672 1735
1673 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1674 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1675 1737
1676 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1677 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1678 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1844sub generate_random_map { 1906sub generate_random_map {
1845 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1846 1908
1847 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
1848 1910
1849 # mit "rum" bekleckern, nicht
1850 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1851 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1852 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1853 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1854 $rmp->{exit_on_final_map},
1855 $rmp->{xsize}, $rmp->{ysize},
1856 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1857 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1858 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1859 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1860 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1861 (cf::region::find $rmp->{region}), $rmp->{custom}
1862 )
1863} 1912}
1864 1913
1865=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1866 1915
1867Register 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
… …
1905 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1906 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1907 # ?random/... random maps 1956 # ?random/... random maps
1908 # /... normal maps 1957 # /... normal maps
1909 # ~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
1910 1960
1911 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1912 1962
1913 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1914 # something that looks reasonable 1964 # something that looks reasonable
1915 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1916 $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'";
1917 1967
1918 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1919 $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;
1920 } 1984 }
1921 1985
1922 for ($path) { 1986 for ($path) {
1923 redo if s{//}{/};
1924 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1925 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1926 } 1989 }
1927 1990
1928 $path 1991 $path
… …
1946 2009
1947 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1948 () 2011 ()
1949} 2012}
1950 2013
2014# may re-bless or do other evil things
1951sub init { 2015sub init {
1952 my ($self) = @_; 2016 my ($self) = @_;
1953 2017
1954 $self 2018 $self
1955} 2019}
… …
2020 $self->{load_path} = $path; 2084 $self->{load_path} = $path;
2021 2085
2022 1 2086 1
2023} 2087}
2024 2088
2089# used to laod the header of an original map
2025sub load_header_orig { 2090sub load_header_orig {
2026 my ($self) = @_; 2091 my ($self) = @_;
2027 2092
2028 $self->load_header_from ($self->load_path) 2093 $self->load_header_from ($self->load_path)
2029} 2094}
2030 2095
2096# used to laod the header of an instantiated map
2031sub load_header_temp { 2097sub load_header_temp {
2032 my ($self) = @_; 2098 my ($self) = @_;
2033 2099
2034 $self->load_header_from ($self->save_path) 2100 $self->load_header_from ($self->save_path)
2035} 2101}
2036 2102
2103# called after loading the header from an instantiated map
2037sub prepare_temp { 2104sub prepare_temp {
2038 my ($self) = @_; 2105 my ($self) = @_;
2039 2106
2040 $self->last_access ((delete $self->{last_access}) 2107 $self->last_access ((delete $self->{last_access})
2041 || $cf::RUNTIME); #d# 2108 || $cf::RUNTIME); #d#
2042 # safety 2109 # safety
2043 $self->{instantiate_time} = $cf::RUNTIME 2110 $self->{instantiate_time} = $cf::RUNTIME
2044 if $self->{instantiate_time} > $cf::RUNTIME; 2111 if $self->{instantiate_time} > $cf::RUNTIME;
2045} 2112}
2046 2113
2114# called after loading the header from an original map
2047sub prepare_orig { 2115sub prepare_orig {
2048 my ($self) = @_; 2116 my ($self) = @_;
2049 2117
2050 $self->{load_original} = 1; 2118 $self->{load_original} = 1;
2051 $self->{instantiate_time} = $cf::RUNTIME; 2119 $self->{instantiate_time} = $cf::RUNTIME;
… …
2077sub find { 2145sub find {
2078 my ($path, $origin) = @_; 2146 my ($path, $origin) = @_;
2079 2147
2080 cf::cede_to_tick; 2148 cf::cede_to_tick;
2081 2149
2082 $path = normalise $path, $origin && $origin->path; 2150 $path = normalise $path, $origin;
2083 2151
2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2152 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2085 my $guard2 = cf::lock_acquire "map_find:$path"; 2153 my $guard2 = cf::lock_acquire "map_find:$path";
2086 2154
2087 $cf::MAP{$path} || do { 2155 $cf::MAP{$path} || do {
… …
2127 $self->alloc; 2195 $self->alloc;
2128 2196
2129 $self->pre_load; 2197 $self->pre_load;
2130 cf::cede_to_tick; 2198 cf::cede_to_tick;
2131 2199
2200 if (exists $self->{load_path}) {
2132 my $f = new_from_file cf::object::thawer $self->{load_path}; 2201 my $f = new_from_file cf::object::thawer $self->{load_path};
2133 $f->skip_block; 2202 $f->skip_block;
2134 $self->_load_objects ($f) 2203 $self->_load_objects ($f)
2135 or return; 2204 or return;
2136 2205
2137 $self->post_load_original 2206 $self->post_load_original
2138 if delete $self->{load_original}; 2207 if delete $self->{load_original};
2139 2208
2140 if (my $uniq = $self->uniq_path) { 2209 if (my $uniq = $self->uniq_path) {
2141 utf8::encode $uniq; 2210 utf8::encode $uniq;
2142 unless (aio_stat $uniq) { 2211 unless (aio_stat $uniq) {
2143 if (my $f = new_from_file cf::object::thawer $uniq) { 2212 if (my $f = new_from_file cf::object::thawer $uniq) {
2144 $self->clear_unique_items; 2213 $self->clear_unique_items;
2145 $self->_load_objects ($f); 2214 $self->_load_objects ($f);
2146 $f->resolve_delayed_derefs; 2215 $f->resolve_delayed_derefs;
2216 }
2147 } 2217 }
2148 } 2218 }
2149 }
2150 2219
2151 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 } else {
2222 $self->post_load_original
2223 if delete $self->{load_original};
2224 }
2152 2225
2153 cf::cede_to_tick; 2226 cf::cede_to_tick;
2154 # now do the right thing for maps 2227 # now do the right thing for maps
2155 $self->link_multipart_objects; 2228 $self->link_multipart_objects;
2156 $self->difficulty ($self->estimate_difficulty) 2229 $self->difficulty ($self->estimate_difficulty)
… …
2170 2243
2171 $self->in_memory (cf::MAP_ACTIVE); 2244 $self->in_memory (cf::MAP_ACTIVE);
2172 } 2245 }
2173 2246
2174 $self->post_load; 2247 $self->post_load;
2248
2249 1
2175} 2250}
2176 2251
2177# customize the map for a given player, i.e. 2252# customize the map for a given player, i.e.
2178# return the _real_ map. used by e.g. per-player 2253# return the _real_ map. used by e.g. per-player
2179# maps to change the path to ~playername/mappath 2254# maps to change the path to ~playername/mappath
… …
2238our $MAP_PREFETCHER = undef; 2313our $MAP_PREFETCHER = undef;
2239 2314
2240sub find_async { 2315sub find_async {
2241 my ($path, $origin, $load) = @_; 2316 my ($path, $origin, $load) = @_;
2242 2317
2243 $path = normalise $path, $origin && $origin->{path}; 2318 $path = normalise $path, $origin;
2244 2319
2245 if (my $map = $cf::MAP{$path}) { 2320 if (my $map = $cf::MAP{$path}) {
2246 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2321 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2247 } 2322 }
2248 2323
… …
2759 ($path, $x, $y) = (undef, undef, undef); 2834 ($path, $x, $y) = (undef, undef, undef);
2760 } 2835 }
2761 } 2836 }
2762 2837
2763 my $map = eval { 2838 my $map = eval {
2764 my $map = defined $path ? cf::map::find $path : undef; 2839 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2765 2840
2766 if ($map) { 2841 if ($map) {
2767 $map = $map->customise_for ($self); 2842 $map = $map->customise_for ($self);
2768 $map = $check->($map, $x, $y, $self) if $check && $map; 2843 $map = $check->($map, $x, $y, $self) if $check && $map;
2769 } else { 2844 } else {
… …
2867 2942
2868 prepare_random_map $exit 2943 prepare_random_map $exit
2869 if $exit->slaying eq "/!"; 2944 if $exit->slaying eq "/!";
2870 } 2945 }
2871 2946
2872 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2947 my $map = cf::map::normalise $exit->slaying, $exit->map;
2873 my $x = $exit->stats->hp; 2948 my $x = $exit->stats->hp;
2874 my $y = $exit->stats->sp; 2949 my $y = $exit->stats->sp;
2875 2950
2876 $self->goto ($map, $x, $y); 2951 $self->goto ($map, $x, $y);
2877 2952
… …
3394 3469
3395 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3470 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3396 3471
3397 trace "loading facedata from $path\n"; 3472 trace "loading facedata from $path\n";
3398 3473
3399 0 < aio_load $path, my $facedata 3474 my $facedata = decode_storable load_file $path;
3400 or die "$path: $!";
3401
3402 $facedata = Coro::Storable::thaw $facedata;
3403 3475
3404 $facedata->{version} == 2 3476 $facedata->{version} == 2
3405 or cf::cleanup "$path: version mismatch, cannot proceed."; 3477 or cf::cleanup "$path: version mismatch, cannot proceed.";
3406 3478
3407 # patch in the exptable 3479 # patch in the exptable
… …
3421 3493
3422 cf::face::set_visibility $idx, $info->{visibility}; 3494 cf::face::set_visibility $idx, $info->{visibility};
3423 cf::face::set_magicmap $idx, $info->{magicmap}; 3495 cf::face::set_magicmap $idx, $info->{magicmap};
3424 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3425 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3497 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3498 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3426 3499
3427 cf::cede_to_tick; 3500 cf::cede_to_tick;
3428 } 3501 }
3429 3502
3430 while (my ($face, $info) = each %$faces) { 3503 while (my ($face, $info) = each %$faces) {
… …
3525} 3598}
3526 3599
3527sub reload_sound { 3600sub reload_sound {
3528 trace "loading sound config from $DATADIR/sound\n"; 3601 trace "loading sound config from $DATADIR/sound\n";
3529 3602
3530 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3531 or die "$DATADIR/sound $!";
3532
3533 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3603 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3534 3604
3535 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3605 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536 my $sound = $soundconf->{compat}[$_] 3606 my $sound = $soundconf->{compat}[$_]
3537 or next; 3607 or next;
3538 3608
… …
3562} 3632}
3563 3633
3564sub reload_config { 3634sub reload_config {
3565 trace "reloading config file...\n"; 3635 trace "reloading config file...\n";
3566 3636
3567 0 < aio_load "$CONFDIR/config", my $config 3637 my $config = load_file "$CONFDIR/config";
3568 or die "$CONFDIR/config: $!";
3569
3570 utf8::decode $config; 3638 utf8::decode $config;
3571 *CFG = yaml_load $config; 3639 *CFG = decode_yaml $config;
3572 3640
3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3641 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3574 3642
3575 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3643 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3576 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3644 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3614 3682
3615sub main { 3683sub main {
3616 cf::init_globals; # initialise logging 3684 cf::init_globals; # initialise logging
3617 3685
3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3686 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3619 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3687 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3688 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3621 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3689 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3622 3690
3623 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3691 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3624 3692
… …
3660 3728
3661 # no (long-running) fork's whatsoever before this point(!) 3729 # no (long-running) fork's whatsoever before this point(!)
3662 use POSIX (); 3730 use POSIX ();
3663 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3731 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3664 3732
3665 (pop @POST_INIT)->(0) while @POST_INIT; 3733 cf::_post_init 0;
3666 }; 3734 };
3667 3735
3668 cf::object::thawer::errors_are_fatal 0; 3736 cf::object::thawer::errors_are_fatal 0;
3669 info "parse errors in files are no longer fatal from this point on.\n"; 3737 info "parse errors in files are no longer fatal from this point on.\n";
3670 3738
… …
3893 3961
3894 my $t1 = AE::time; 3962 my $t1 = AE::time;
3895 3963
3896 while ($RELOAD) { 3964 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl"; 3965 cf::get_slot 0.1, -1, "reload_perl";
3898 info "reloading..."; 3966 info "perl_reload: reloading...";
3899 3967
3900 trace "entering sync_job"; 3968 trace "perl_reload: entering sync_job";
3901 3969
3902 cf::sync_job { 3970 cf::sync_job {
3903 #cf::emergency_save; 3971 #cf::emergency_save;
3904 3972
3905 trace "cancelling all extension coros"; 3973 trace "perl_reload: cancelling all extension coros";
3906 $_->cancel for values %EXT_CORO; 3974 $_->cancel for values %EXT_CORO;
3907 %EXT_CORO = (); 3975 %EXT_CORO = ();
3908 3976
3909 trace "removing commands"; 3977 trace "perl_reload: removing commands";
3910 %COMMAND = (); 3978 %COMMAND = ();
3911 3979
3912 trace "removing ext/exti commands"; 3980 trace "perl_reload: removing ext/exti commands";
3913 %EXTCMD = (); 3981 %EXTCMD = ();
3914 %EXTICMD = (); 3982 %EXTICMD = ();
3915 3983
3916 trace "unloading/nuking all extensions"; 3984 trace "perl_reload: unloading/nuking all extensions";
3917 for my $pkg (@EXTS) { 3985 for my $pkg (@EXTS) {
3918 trace "... unloading $pkg"; 3986 trace "... unloading $pkg";
3919 3987
3920 if (my $cb = $pkg->can ("unload")) { 3988 if (my $cb = $pkg->can ("unload")) {
3921 eval { 3989 eval {
… …
3926 3994
3927 trace "... clearing $pkg"; 3995 trace "... clearing $pkg";
3928 clear_package $pkg; 3996 clear_package $pkg;
3929 } 3997 }
3930 3998
3931 trace "unloading all perl modules loaded from $LIBDIR"; 3999 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3932 while (my ($k, $v) = each %INC) { 4000 while (my ($k, $v) = each %INC) {
3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4001 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3934 4002
3935 trace "... unloading $k"; 4003 trace "... unloading $k";
3936 delete $INC{$k}; 4004 delete $INC{$k};
… …
3943 } 4011 }
3944 4012
3945 clear_package $k; 4013 clear_package $k;
3946 } 4014 }
3947 4015
3948 trace "getting rid of safe::, as good as possible"; 4016 trace "perl_reload: getting rid of safe::, as good as possible";
3949 clear_package "safe::$_" 4017 clear_package "safe::$_"
3950 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4018 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3951 4019
3952 trace "unloading cf.pm \"a bit\""; 4020 trace "perl_reload: unloading cf.pm \"a bit\"";
3953 delete $INC{"cf.pm"}; 4021 delete $INC{"cf.pm"};
3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4022 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3955 4023
3956 # don't, removes xs symbols, too, 4024 # don't, removes xs symbols, too,
3957 # and global variables created in xs 4025 # and global variables created in xs
3958 #clear_package __PACKAGE__; 4026 #clear_package __PACKAGE__;
3959 4027
3960 info "unload completed, starting to reload now"; 4028 info "perl_reload: unload completed, starting to reload now";
3961 4029
3962 trace "reloading cf.pm"; 4030 trace "perl_reload: reloading cf.pm";
3963 require cf; 4031 require cf;
3964 cf::_connect_to_perl_1; 4032 cf::_connect_to_perl_1;
3965 4033
3966 trace "loading config and database again"; 4034 trace "perl_reload: loading config and database again";
3967 cf::reload_config; 4035 cf::reload_config;
3968 4036
3969 trace "loading extensions"; 4037 trace "perl_reload: loading extensions";
3970 cf::load_extensions; 4038 cf::load_extensions;
3971 4039
3972 if ($REATTACH_ON_RELOAD) { 4040 if ($REATTACH_ON_RELOAD) {
3973 trace "reattaching attachments to objects/players"; 4041 trace "perl_reload: reattaching attachments to objects/players";
3974 _global_reattach; # objects, sockets 4042 _global_reattach; # objects, sockets
3975 trace "reattaching attachments to maps"; 4043 trace "perl_reload: reattaching attachments to maps";
3976 reattach $_ for values %MAP; 4044 reattach $_ for values %MAP;
3977 trace "reattaching attachments to players"; 4045 trace "perl_reload: reattaching attachments to players";
3978 reattach $_ for values %PLAYER; 4046 reattach $_ for values %PLAYER;
3979 } 4047 }
3980 4048
3981 trace "running post_init jobs"; 4049 cf::_post_init 1;
3982 (pop @POST_INIT)->(1) while @POST_INIT;
3983 4050
3984 trace "leaving sync_job"; 4051 trace "perl_reload: leaving sync_job";
3985 4052
3986 1 4053 1
3987 } or do { 4054 } or do {
3988 error $@; 4055 error $@;
3989 cf::cleanup "error while reloading, exiting."; 4056 cf::cleanup "perl_reload: error, exiting.";
3990 }; 4057 };
3991 4058
3992 info "reloaded";
3993 --$RELOAD; 4059 --$RELOAD;
3994 } 4060 }
3995 4061
3996 $t1 = AE::time - $t1; 4062 $t1 = AE::time - $t1;
3997 info "reload completed in ${t1}s\n"; 4063 info "perl_reload: completed in ${t1}s\n";
3998}; 4064};
3999 4065
4000our $RELOAD_WATCHER; # used only during reload 4066our $RELOAD_WATCHER; # used only during reload
4001 4067
4002sub reload_perl() { 4068sub reload_perl() {
… …
4135 IO::AIO::min_parallel 8; 4201 IO::AIO::min_parallel 8;
4136 IO::AIO::max_poll_time $TICK * 0.1; 4202 IO::AIO::max_poll_time $TICK * 0.1;
4137 undef $AnyEvent::AIO::WATCHER; 4203 undef $AnyEvent::AIO::WATCHER;
4138} 4204}
4139 4205
4140my $_log_backtrace; 4206our $_log_backtrace;
4207our $_log_backtrace_last;
4141 4208
4142sub _log_backtrace { 4209sub _log_backtrace {
4143 my ($msg, @addr) = @_; 4210 my ($msg, @addr) = @_;
4144 4211
4145 $msg =~ s/\n//; 4212 $msg =~ s/\n$//;
4146 4213
4214 if ($_log_backtrace_last eq $msg) {
4215 LOG llevInfo, "[ABT] $msg\n";
4216 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4147 # limit the # of concurrent backtraces 4217 # limit the # of concurrent backtraces
4148 if ($_log_backtrace < 2) { 4218 } elsif ($_log_backtrace < 2) {
4219 $_log_backtrace_last = $msg;
4149 ++$_log_backtrace; 4220 ++$_log_backtrace;
4150 my $perl_bt = Carp::longmess $msg; 4221 my $perl_bt = Carp::longmess $msg;
4151 async { 4222 async {
4152 $Coro::current->{desc} = "abt $msg"; 4223 $Coro::current->{desc} = "abt $msg";
4153 4224
… …
4173 LOG llevInfo, "[ABT] $_\n" for @bt; 4244 LOG llevInfo, "[ABT] $_\n" for @bt;
4174 --$_log_backtrace; 4245 --$_log_backtrace;
4175 }; 4246 };
4176 } else { 4247 } else {
4177 LOG llevInfo, "[ABT] $msg\n"; 4248 LOG llevInfo, "[ABT] $msg\n";
4178 LOG llevInfo, "[ABT] [suppressed]\n"; 4249 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4179 } 4250 }
4180} 4251}
4181 4252
4182# load additional modules 4253# load additional modules
4183require "cf/$_.pm" for @EXTRA_MODULES; 4254require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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