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.542 by root, Wed May 5 09:05:03 2010 UTC vs.
Revision 1.568 by root, Tue May 3 17:12:14 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";
… …
124our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 129our $DB_ENV;
128 130
129our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 132
131our %CFG; 133our %CFG;
132 134
133our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 136our $RUNTIME;
… …
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
… …
1869} 1942}
1870 1943
1871sub normalise { 1944sub normalise {
1872 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1873 1946
1874 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1875 1948
1876 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1877 1950
1878 # map plan: 1951 # map plan:
1879 # 1952 #
… …
1894 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1895 $path = "$base/$path"; 1968 $path = "$base/$path";
1896 } 1969 }
1897 1970
1898 for ($path) { 1971 for ($path) {
1899 redo if s{//}{/};
1900 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1901 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1902 } 1974 }
1903 1975
1904 $path 1976 $path
… …
1918 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1919 return $self; 1991 return $self;
1920 } 1992 }
1921 } 1993 }
1922 1994
1923 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1924 () 1996 ()
1925} 1997}
1926 1998
1999# may re-bless or do other evil things
1927sub init { 2000sub init {
1928 my ($self) = @_; 2001 my ($self) = @_;
1929 2002
1930 $self 2003 $self
1931} 2004}
… …
1996 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1997 2070
1998 1 2071 1
1999} 2072}
2000 2073
2074# used to laod the header of an original map
2001sub load_header_orig { 2075sub load_header_orig {
2002 my ($self) = @_; 2076 my ($self) = @_;
2003 2077
2004 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
2005} 2079}
2006 2080
2081# used to laod the header of an instantiated map
2007sub load_header_temp { 2082sub load_header_temp {
2008 my ($self) = @_; 2083 my ($self) = @_;
2009 2084
2010 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
2011} 2086}
2012 2087
2088# called after loading the header from an instantiated map
2013sub prepare_temp { 2089sub prepare_temp {
2014 my ($self) = @_; 2090 my ($self) = @_;
2015 2091
2016 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
2017 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
2018 # safety 2094 # safety
2019 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
2020 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
2021} 2097}
2022 2098
2099# called after loading the header from an original map
2023sub prepare_orig { 2100sub prepare_orig {
2024 my ($self) = @_; 2101 my ($self) = @_;
2025 2102
2026 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
2027 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
… …
2051 2128
2052sub find; 2129sub find;
2053sub find { 2130sub find {
2054 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
2055 2132
2133 cf::cede_to_tick;
2134
2056 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
2057 2136
2058 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2059 my $guard2 = cf::lock_acquire "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
2060 2139
2061 $cf::MAP{$path} || do { 2140 $cf::MAP{$path} || do {
… …
2101 $self->alloc; 2180 $self->alloc;
2102 2181
2103 $self->pre_load; 2182 $self->pre_load;
2104 cf::cede_to_tick; 2183 cf::cede_to_tick;
2105 2184
2185 if (exists $self->{load_path}) {
2106 my $f = new_from_file cf::object::thawer $self->{load_path}; 2186 my $f = new_from_file cf::object::thawer $self->{load_path};
2107 $f->skip_block; 2187 $f->skip_block;
2108 $self->_load_objects ($f) 2188 $self->_load_objects ($f)
2109 or return; 2189 or return;
2110 2190
2111 $self->post_load_original 2191 $self->post_load_original
2112 if delete $self->{load_original}; 2192 if delete $self->{load_original};
2113 2193
2114 if (my $uniq = $self->uniq_path) { 2194 if (my $uniq = $self->uniq_path) {
2115 utf8::encode $uniq; 2195 utf8::encode $uniq;
2116 unless (aio_stat $uniq) { 2196 unless (aio_stat $uniq) {
2117 if (my $f = new_from_file cf::object::thawer $uniq) { 2197 if (my $f = new_from_file cf::object::thawer $uniq) {
2118 $self->clear_unique_items; 2198 $self->clear_unique_items;
2119 $self->_load_objects ($f); 2199 $self->_load_objects ($f);
2120 $f->resolve_delayed_derefs; 2200 $f->resolve_delayed_derefs;
2201 }
2121 } 2202 }
2122 } 2203 }
2123 }
2124 2204
2125 $f->resolve_delayed_derefs; 2205 $f->resolve_delayed_derefs;
2206 } else {
2207 $self->post_load_original
2208 if delete $self->{load_original};
2209 }
2126 2210
2127 cf::cede_to_tick; 2211 cf::cede_to_tick;
2128 # now do the right thing for maps 2212 # now do the right thing for maps
2129 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
2130 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
… …
2134 unless ($self->{deny_activate}) { 2218 unless ($self->{deny_activate}) {
2135 $self->decay_objects; 2219 $self->decay_objects;
2136 $self->fix_auto_apply; 2220 $self->fix_auto_apply;
2137 $self->update_buttons; 2221 $self->update_buttons;
2138 cf::cede_to_tick; 2222 cf::cede_to_tick;
2139 $self->activate; 2223 #$self->activate; # no longer activate maps automatically
2140 } 2224 }
2141 2225
2142 $self->{last_save} = $cf::RUNTIME; 2226 $self->{last_save} = $cf::RUNTIME;
2143 $self->last_access ($cf::RUNTIME); 2227 $self->last_access ($cf::RUNTIME);
2144 2228
2145 $self->in_memory (cf::MAP_ACTIVE); 2229 $self->in_memory (cf::MAP_ACTIVE);
2146 } 2230 }
2147 2231
2148 $self->post_load; 2232 $self->post_load;
2233
2234 1
2149} 2235}
2150 2236
2151# customize the map for a given player, i.e. 2237# customize the map for a given player, i.e.
2152# return the _real_ map. used by e.g. per-player 2238# return the _real_ map. used by e.g. per-player
2153# maps to change the path to ~playername/mappath 2239# maps to change the path to ~playername/mappath
… …
2212our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
2213 2299
2214sub find_async { 2300sub find_async {
2215 my ($path, $origin, $load) = @_; 2301 my ($path, $origin, $load) = @_;
2216 2302
2217 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
2218 2304
2219 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
2220 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2306 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2221 } 2307 }
2222 2308
… …
2733 ($path, $x, $y) = (undef, undef, undef); 2819 ($path, $x, $y) = (undef, undef, undef);
2734 } 2820 }
2735 } 2821 }
2736 2822
2737 my $map = eval { 2823 my $map = eval {
2738 my $map = defined $path ? cf::map::find $path : undef; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2739 2825
2740 if ($map) { 2826 if ($map) {
2741 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2742 $map = $check->($map, $x, $y, $self) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2743 } else { 2829 } else {
… …
2833 $Coro::current->{desc} = "enter_exit"; 2919 $Coro::current->{desc} = "enter_exit";
2834 2920
2835 unless (eval { 2921 unless (eval {
2836 $self->deactivate_recursive; # just to be sure 2922 $self->deactivate_recursive; # just to be sure
2837 2923
2838 # random map handling
2839 {
2840 my $guard = cf::lock_acquire "exit_prepare:$exit";
2841
2842 prepare_random_map $exit
2843 if $exit->slaying eq "/!";
2844 }
2845
2846 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2847 my $x = $exit->stats->hp; 2925 my $x = $exit->stats->hp;
2848 my $y = $exit->stats->sp; 2926 my $y = $exit->stats->sp;
2927
2928 # special map handling
2929 my $slaying = $exit->slaying;
2930
2931 # special map handling
2932 if ($slaying eq "/!") {
2933 my $guard = cf::lock_acquire "exit_prepare:$exit";
2934
2935 prepare_random_map $exit
2936 if $slaying eq "/!"; # need to re-check after getting the lock
2937
2938 } elsif ($slaying eq '!up') {
2939 $map = $exit->map->tile_path (cf::TILE_UP);
2940 $x = $exit->x;
2941 $y = $exit->y;
2942
2943 } elsif ($slaying eq '!down') {
2944 $map = $exit->map->tile_path (cf::TILE_DOWN);
2945 $x = $exit->x;
2946 $y = $exit->y;
2947 }
2849 2948
2850 $self->goto ($map, $x, $y); 2949 $self->goto ($map, $x, $y);
2851 2950
2852 # if exit is damned, update players death & WoR home-position 2951 # if exit is damned, update players death & WoR home-position
2853 $self->contr->savebed ($map, $x, $y) 2952 $self->contr->savebed ($map, $x, $y)
… …
3357=cut 3456=cut
3358 3457
3359############################################################################# 3458#############################################################################
3360# the server's init and main functions 3459# the server's init and main functions
3361 3460
3362# async inc loader. yay.
3363sub inc_loader {
3364 my $mod = $_[1];
3365
3366 if (in_main && !tick_inhibit) {
3367 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3368 } else {
3369 debug "loading perl module $mod\n";
3370 }
3371
3372 # 1. find real file
3373 for my $dir (@ORIG_INC) {
3374 ref $dir and next;
3375 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3376 or next;
3377
3378 $data = "#line 1 $dir/$mod\n$data";
3379
3380 open my $fh, "<", \$data or die;
3381
3382 return $fh;
3383 }
3384
3385 ()
3386}
3387
3388sub init_inc {
3389 # save original @INC
3390 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3391
3392 # make sure we can do scalar-opens
3393 open my $dummy, "<", \my $dummy2;
3394
3395 # execute some stuff so perl load's some of the core modules
3396 /Ü/ =~ /ü/i;
3397 eval { &Storable::nstore_fd };
3398
3399 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3400
3401 debug "module loading will be asynchronous from this point on.";
3402}
3403
3404sub load_facedata($) { 3461sub load_facedata($) {
3405 my ($path) = @_; 3462 my ($path) = @_;
3406 3463
3407 # HACK to clear player env face cache, we need some signal framework 3464 # HACK to clear player env face cache, we need some signal framework
3408 # for this (global event?) 3465 # for this (global event?)
… …
3410 3467
3411 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3468 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3412 3469
3413 trace "loading facedata from $path\n"; 3470 trace "loading facedata from $path\n";
3414 3471
3415 my $facedata; 3472 my $facedata = decode_storable load_file $path;
3416 0 < aio_load $path, $facedata
3417 or die "$path: $!";
3418
3419 $facedata = Coro::Storable::thaw $facedata;
3420 3473
3421 $facedata->{version} == 2 3474 $facedata->{version} == 2
3422 or cf::cleanup "$path: version mismatch, cannot proceed."; 3475 or cf::cleanup "$path: version mismatch, cannot proceed.";
3423 3476
3424 # patch in the exptable 3477 # patch in the exptable
… …
3438 3491
3439 cf::face::set_visibility $idx, $info->{visibility}; 3492 cf::face::set_visibility $idx, $info->{visibility};
3440 cf::face::set_magicmap $idx, $info->{magicmap}; 3493 cf::face::set_magicmap $idx, $info->{magicmap};
3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3494 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3442 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3495 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3496 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3443 3497
3444 cf::cede_to_tick; 3498 cf::cede_to_tick;
3445 } 3499 }
3446 3500
3447 while (my ($face, $info) = each %$faces) { 3501 while (my ($face, $info) = each %$faces) {
… …
3542} 3596}
3543 3597
3544sub reload_sound { 3598sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n"; 3599 trace "loading sound config from $DATADIR/sound\n";
3546 3600
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3601 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3551 3602
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3603 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_] 3604 my $sound = $soundconf->{compat}[$_]
3554 or next; 3605 or next;
3555 3606
… …
3565} 3616}
3566 3617
3567sub reload_resources { 3618sub reload_resources {
3568 trace "reloading resource files...\n"; 3619 trace "reloading resource files...\n";
3569 3620
3621 reload_exp_table;
3622 reload_materials;
3570 reload_facedata; 3623 reload_facedata;
3571 reload_sound; 3624 reload_sound;
3572 reload_archetypes; 3625 reload_archetypes;
3573 reload_regions; 3626 reload_regions;
3574 reload_treasures; 3627 reload_treasures;
… …
3577} 3630}
3578 3631
3579sub reload_config { 3632sub reload_config {
3580 trace "reloading config file...\n"; 3633 trace "reloading config file...\n";
3581 3634
3582 open my $fh, "<:utf8", "$CONFDIR/config" 3635 my $config = load_file "$CONFDIR/config";
3583 or return; 3636 utf8::decode $config;
3584 3637 *CFG = decode_yaml $config;
3585 local $/;
3586 *CFG = YAML::XS::Load scalar <$fh>;
3587 3638
3588 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3639 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3589 3640
3590 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3641 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3591 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3642 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3595 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3646 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3596 and die "WARNING: m(un)lockall failed: $!\n"; 3647 and die "WARNING: m(un)lockall failed: $!\n";
3597 }; 3648 };
3598 warn $@ if $@; 3649 warn $@ if $@;
3599 } 3650 }
3600
3601 trace "finished reloading resource files\n";
3602} 3651}
3603 3652
3604sub pidfile() { 3653sub pidfile() {
3605 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3654 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3606 or die "$PIDFILE: $!"; 3655 or die "$PIDFILE: $!";
… …
3631 3680
3632sub main { 3681sub main {
3633 cf::init_globals; # initialise logging 3682 cf::init_globals; # initialise logging
3634 3683
3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3684 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3685 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3686 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3687 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3639 3688
3640 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3689 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3641 3690
… …
3649 }; 3698 };
3650 3699
3651 evthread_start IO::AIO::poll_fileno; 3700 evthread_start IO::AIO::poll_fileno;
3652 3701
3653 cf::sync_job { 3702 cf::sync_job {
3654 init_inc; 3703 cf::incloader::init ();
3655 3704
3656 cf::init_experience;
3657 cf::init_anim; 3705 cf::init_anim;
3658 cf::init_attackmess; 3706 cf::init_attackmess;
3659 cf::init_dynamic; 3707 cf::init_dynamic;
3660 3708
3661 cf::load_settings; 3709 cf::load_settings;
3662 cf::load_materials;
3663 3710
3664 reload_resources; 3711 reload_resources;
3665 reload_config; 3712 reload_config;
3666 db_init; 3713 db_init;
3667 3714
… …
3679 3726
3680 # no (long-running) fork's whatsoever before this point(!) 3727 # no (long-running) fork's whatsoever before this point(!)
3681 use POSIX (); 3728 use POSIX ();
3682 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3729 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3683 3730
3684 (pop @POST_INIT)->(0) while @POST_INIT; 3731 cf::_post_init 0;
3685 }; 3732 };
3686 3733
3687 cf::object::thawer::errors_are_fatal 0; 3734 cf::object::thawer::errors_are_fatal 0;
3688 info "parse errors in files are no longer fatal from this point on.\n"; 3735 info "parse errors in files are no longer fatal from this point on.\n";
3689 3736
… …
3901 } 3948 }
3902} 3949}
3903 3950
3904sub do_reload_perl() { 3951sub do_reload_perl() {
3905 # can/must only be called in main 3952 # can/must only be called in main
3906 if (in_main) { 3953 unless (in_main) {
3907 error "can only reload from main coroutine"; 3954 error "can only reload from main coroutine";
3908 return; 3955 return;
3909 } 3956 }
3910 3957
3911 return if $RELOAD++; 3958 return if $RELOAD++;
3912 3959
3913 my $t1 = AE::time; 3960 my $t1 = AE::time;
3914 3961
3915 while ($RELOAD) { 3962 while ($RELOAD) {
3963 cf::get_slot 0.1, -1, "reload_perl";
3916 info "reloading..."; 3964 info "perl_reload: reloading...";
3917 3965
3918 trace "entering sync_job"; 3966 trace "perl_reload: entering sync_job";
3919 3967
3920 cf::sync_job { 3968 cf::sync_job {
3921 cf::emergency_save; 3969 #cf::emergency_save;
3922 3970
3923 trace "cancelling all extension coros"; 3971 trace "perl_reload: cancelling all extension coros";
3924 $_->cancel for values %EXT_CORO; 3972 $_->cancel for values %EXT_CORO;
3925 %EXT_CORO = (); 3973 %EXT_CORO = ();
3926 3974
3927 trace "removing commands"; 3975 trace "perl_reload: removing commands";
3928 %COMMAND = (); 3976 %COMMAND = ();
3929 3977
3930 trace "removing ext/exti commands"; 3978 trace "perl_reload: removing ext/exti commands";
3931 %EXTCMD = (); 3979 %EXTCMD = ();
3932 %EXTICMD = (); 3980 %EXTICMD = ();
3933 3981
3934 trace "unloading/nuking all extensions"; 3982 trace "perl_reload: unloading/nuking all extensions";
3935 for my $pkg (@EXTS) { 3983 for my $pkg (@EXTS) {
3936 trace "... unloading $pkg"; 3984 trace "... unloading $pkg";
3937 3985
3938 if (my $cb = $pkg->can ("unload")) { 3986 if (my $cb = $pkg->can ("unload")) {
3939 eval { 3987 eval {
… …
3944 3992
3945 trace "... clearing $pkg"; 3993 trace "... clearing $pkg";
3946 clear_package $pkg; 3994 clear_package $pkg;
3947 } 3995 }
3948 3996
3949 trace "unloading all perl modules loaded from $LIBDIR"; 3997 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3950 while (my ($k, $v) = each %INC) { 3998 while (my ($k, $v) = each %INC) {
3951 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3999 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3952 4000
3953 trace "... unloading $k"; 4001 trace "... unloading $k";
3954 delete $INC{$k}; 4002 delete $INC{$k};
… …
3961 } 4009 }
3962 4010
3963 clear_package $k; 4011 clear_package $k;
3964 } 4012 }
3965 4013
3966 trace "getting rid of safe::, as good as possible"; 4014 trace "perl_reload: getting rid of safe::, as good as possible";
3967 clear_package "safe::$_" 4015 clear_package "safe::$_"
3968 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4016 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3969 4017
3970 trace "unloading cf.pm \"a bit\""; 4018 trace "perl_reload: unloading cf.pm \"a bit\"";
3971 delete $INC{"cf.pm"}; 4019 delete $INC{"cf.pm"};
3972 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4020 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3973 4021
3974 # don't, removes xs symbols, too, 4022 # don't, removes xs symbols, too,
3975 # and global variables created in xs 4023 # and global variables created in xs
3976 #clear_package __PACKAGE__; 4024 #clear_package __PACKAGE__;
3977 4025
3978 info "unload completed, starting to reload now"; 4026 info "perl_reload: unload completed, starting to reload now";
3979 4027
3980 trace "reloading cf.pm"; 4028 trace "perl_reload: reloading cf.pm";
3981 require cf; 4029 require cf;
3982 cf::_connect_to_perl_1; 4030 cf::_connect_to_perl_1;
3983 4031
3984 trace "loading config and database again"; 4032 trace "perl_reload: loading config and database again";
3985 cf::reload_config; 4033 cf::reload_config;
3986 4034
3987 trace "loading extensions"; 4035 trace "perl_reload: loading extensions";
3988 cf::load_extensions; 4036 cf::load_extensions;
3989 4037
3990 if ($REATTACH_ON_RELOAD) { 4038 if ($REATTACH_ON_RELOAD) {
3991 trace "reattaching attachments to objects/players"; 4039 trace "perl_reload: reattaching attachments to objects/players";
3992 _global_reattach; # objects, sockets 4040 _global_reattach; # objects, sockets
3993 trace "reattaching attachments to maps"; 4041 trace "perl_reload: reattaching attachments to maps";
3994 reattach $_ for values %MAP; 4042 reattach $_ for values %MAP;
3995 trace "reattaching attachments to players"; 4043 trace "perl_reload: reattaching attachments to players";
3996 reattach $_ for values %PLAYER; 4044 reattach $_ for values %PLAYER;
3997 } 4045 }
3998 4046
3999 trace "running post_init jobs"; 4047 cf::_post_init 1;
4000 (pop @POST_INIT)->(1) while @POST_INIT;
4001 4048
4002 trace "leaving sync_job"; 4049 trace "perl_reload: leaving sync_job";
4003 4050
4004 1 4051 1
4005 } or do { 4052 } or do {
4006 error $@; 4053 error $@;
4007 cf::cleanup "error while reloading, exiting."; 4054 cf::cleanup "perl_reload: error, exiting.";
4008 }; 4055 };
4009 4056
4010 info "reloaded";
4011 --$RELOAD; 4057 --$RELOAD;
4012 } 4058 }
4013 4059
4014 $t1 = AE::time - $t1; 4060 $t1 = AE::time - $t1;
4015 info "reload completed in ${t1}s\n"; 4061 info "perl_reload: completed in ${t1}s\n";
4016}; 4062};
4017 4063
4018our $RELOAD_WATCHER; # used only during reload 4064our $RELOAD_WATCHER; # used only during reload
4019 4065
4020sub reload_perl() { 4066sub reload_perl() {
… …
4048my $bug_warning = 0; 4094my $bug_warning = 0;
4049 4095
4050our @WAIT_FOR_TICK; 4096our @WAIT_FOR_TICK;
4051our @WAIT_FOR_TICK_BEGIN; 4097our @WAIT_FOR_TICK_BEGIN;
4052 4098
4053sub wait_for_tick { 4099sub wait_for_tick() {
4054 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4100 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4055 4101
4056 my $signal = new Coro::Signal; 4102 my $signal = new Coro::Signal;
4057 push @WAIT_FOR_TICK, $signal; 4103 push @WAIT_FOR_TICK, $signal;
4058 $signal->wait; 4104 $signal->wait;
4059} 4105}
4060 4106
4061sub wait_for_tick_begin { 4107sub wait_for_tick_begin() {
4062 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4108 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4063 4109
4064 my $signal = new Coro::Signal; 4110 my $signal = new Coro::Signal;
4065 push @WAIT_FOR_TICK_BEGIN, $signal; 4111 push @WAIT_FOR_TICK_BEGIN, $signal;
4066 $signal->wait; 4112 $signal->wait;
… …
4153 IO::AIO::min_parallel 8; 4199 IO::AIO::min_parallel 8;
4154 IO::AIO::max_poll_time $TICK * 0.1; 4200 IO::AIO::max_poll_time $TICK * 0.1;
4155 undef $AnyEvent::AIO::WATCHER; 4201 undef $AnyEvent::AIO::WATCHER;
4156} 4202}
4157 4203
4158my $_log_backtrace; 4204our $_log_backtrace;
4205our $_log_backtrace_last;
4159 4206
4160sub _log_backtrace { 4207sub _log_backtrace {
4161 my ($msg, @addr) = @_; 4208 my ($msg, @addr) = @_;
4162 4209
4163 $msg =~ s/\n//; 4210 $msg =~ s/\n$//;
4164 4211
4212 if ($_log_backtrace_last eq $msg) {
4213 LOG llevInfo, "[ABT] $msg\n";
4214 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4165 # limit the # of concurrent backtraces 4215 # limit the # of concurrent backtraces
4166 if ($_log_backtrace < 2) { 4216 } elsif ($_log_backtrace < 2) {
4217 $_log_backtrace_last = $msg;
4167 ++$_log_backtrace; 4218 ++$_log_backtrace;
4168 my $perl_bt = Carp::longmess $msg; 4219 my $perl_bt = Carp::longmess $msg;
4169 async { 4220 async {
4170 $Coro::current->{desc} = "abt $msg"; 4221 $Coro::current->{desc} = "abt $msg";
4171 4222
… …
4191 LOG llevInfo, "[ABT] $_\n" for @bt; 4242 LOG llevInfo, "[ABT] $_\n" for @bt;
4192 --$_log_backtrace; 4243 --$_log_backtrace;
4193 }; 4244 };
4194 } else { 4245 } else {
4195 LOG llevInfo, "[ABT] $msg\n"; 4246 LOG llevInfo, "[ABT] $msg\n";
4196 LOG llevInfo, "[ABT] [suppressed]\n"; 4247 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4197 } 4248 }
4198} 4249}
4199 4250
4200# load additional modules 4251# load additional modules
4201require "cf/$_.pm" for @EXTRA_MODULES; 4252require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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