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.572 by root, Sun May 8 11:44:43 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";
… …
129our @EXTRA_MODULES = qw(pod match mapscript incloader); 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 = 0;
137our $SERVER_TICK = 0;
135our $NOW; 138our $NOW;
136 139
137our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
… …
148 151
149our @POST_INIT; 152our @POST_INIT;
150 153
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
153 159
154binmode STDOUT; 160binmode STDOUT;
155binmode STDERR; 161binmode STDERR;
156 162
157# read virtual server time, if available 163# read virtual server time, if available
… …
191 197
192=over 4 198=over 4
193 199
194=item $cf::UPTIME 200=item $cf::UPTIME
195 201
196The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
197 218
198=item $cf::RUNTIME 219=item $cf::RUNTIME
199 220
200The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 222every server tick.
… …
207Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
210database environment. 231database environment.
211 232
212=item $cf::NOW
213
214The time of the last (current) server tick.
215
216=item $cf::TICK
217
218The interval between server ticks, in seconds.
219
220=item $cf::LOADAVG 233=item $cf::LOADAVG
221 234
222The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
223(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
… …
235=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
236 249
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These 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 thread 251returns 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. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
240 265
241=cut 266=cut
242 267
243sub wait_for_tick(); 268sub wait_for_tick();
244sub wait_for_tick_begin(); 269sub wait_for_tick_begin();
… …
312} 337}
313 338
314$EV::DIED = sub { 339$EV::DIED = sub {
315 Carp::cluck "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
316}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
317 347
318############################################################################# 348#############################################################################
319 349
320=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
321 351
… …
342 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
343 $d 373 $d
344 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
345} 375}
346 376
377=item $scalar = load_file $path
378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
347=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
348 392
349Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
350 394
351=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
… …
357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
358 402
359sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
360sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
361 405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
362=item $ref = cf::yaml_load $scalar 414=item $ref = cf::decode_yaml $scalar
363 415
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks). 416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365 417
366=cut 418=cut
367 419
368sub fork_call(&@); 420sub decode_yaml($) {
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_ 421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
372} 435}
373 436
374=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
375 438
376Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
… …
381 444
382=cut 445=cut
383 446
384sub post_init(&) { 447sub post_init(&) {
385 push @POST_INIT, shift; 448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
386} 466}
387 467
388=item cf::lock_wait $string 468=item cf::lock_wait $string
389 469
390Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
… …
443 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
444} 524}
445 525
446=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
447 527
448Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
449This call blocks and returns only when you have at least C<$time> seconds 529(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. 530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
451 535
452The optional C<$name> can be used to identify the job to run. It might be 536The 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. 537used for statistical purposes and should identify the same time-class.
454 538
455Useful for short background jobs. 539Useful for short background jobs.
… …
484 } 568 }
485 } 569 }
486 570
487 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
488 # we do not use wait_for_tick() as it returns immediately when tick is inactive 572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
489 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
490 $signal->wait;
491 } else { 574 } else {
492 $busy = 0; 575 $busy = 0;
493 Coro::schedule; 576 Coro::schedule;
494 } 577 }
495 } 578 }
… …
750 833
751 my @data; 834 my @data;
752 my $md5; 835 my $md5;
753 836
754 for (0 .. $#$src) { 837 for (0 .. $#$src) {
755 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
756 or Carp::croak "$src->[$_]: $!";
757 } 839 }
758 840
759 # if processing is expensive, check 841 # if processing is expensive, check
760 # checksum first 842 # checksum first
761 if (1) { 843 if (1) {
… …
1495 1577
1496 while (my ($k, $v) = each %todo) { 1578 while (my ($k, $v) = each %todo) {
1497 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1498 if exists $v->{meta}{mandatory}; 1580 if exists $v->{meta}{mandatory};
1499 } 1581 }
1582
1583 last;
1500 } 1584 }
1501 } 1585 }
1502 }; 1586 };
1503} 1587}
1504 1588
… …
1662 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1663 1747
1664 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1665 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1749 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1666 1750
1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1668 $pl->deactivate; 1752 $pl->deactivate;
1669 1753
1670 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1671 ext::highscore::check ($pl->ob); 1756 ext::highscore::check ($pl->ob);
1672 1757
1673 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1674 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1675 1759
1676 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1677 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1678 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
… …
1844sub generate_random_map { 1928sub generate_random_map {
1845 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1846 1930
1847 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1848 1932
1849 # mit "rum" bekleckern, nicht
1850 $self->_create_random_map ( 1933 $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} 1934}
1864 1935
1865=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1866 1937
1867Register a handler for the map path matching the given regex at the 1938Register a handler for the map path matching the given regex at the
… …
1918 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1919 $path = "$base/$path"; 1990 $path = "$base/$path";
1920 } 1991 }
1921 1992
1922 for ($path) { 1993 for ($path) {
1923 redo if s{//}{/};
1924 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1925 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1926 } 1996 }
1927 1997
1928 $path 1998 $path
… …
1946 2016
1947 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1948 () 2018 ()
1949} 2019}
1950 2020
2021# may re-bless or do other evil things
1951sub init { 2022sub init {
1952 my ($self) = @_; 2023 my ($self) = @_;
1953 2024
1954 $self 2025 $self
1955} 2026}
… …
2020 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
2021 2092
2022 1 2093 1
2023} 2094}
2024 2095
2096# used to laod the header of an original map
2025sub load_header_orig { 2097sub load_header_orig {
2026 my ($self) = @_; 2098 my ($self) = @_;
2027 2099
2028 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
2029} 2101}
2030 2102
2103# used to laod the header of an instantiated map
2031sub load_header_temp { 2104sub load_header_temp {
2032 my ($self) = @_; 2105 my ($self) = @_;
2033 2106
2034 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
2035} 2108}
2036 2109
2110# called after loading the header from an instantiated map
2037sub prepare_temp { 2111sub prepare_temp {
2038 my ($self) = @_; 2112 my ($self) = @_;
2039 2113
2040 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
2041 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
2042 # safety 2116 # safety
2043 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
2044 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
2045} 2119}
2046 2120
2121# called after loading the header from an original map
2047sub prepare_orig { 2122sub prepare_orig {
2048 my ($self) = @_; 2123 my ($self) = @_;
2049 2124
2050 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
2051 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
… …
2077sub find { 2152sub find {
2078 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
2079 2154
2080 cf::cede_to_tick; 2155 cf::cede_to_tick;
2081 2156
2082 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
2083 2158
2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2085 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
2086 2161
2087 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
… …
2118 2193
2119 { 2194 {
2120 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2121 2196
2122 return unless $self->valid; 2197 return unless $self->valid;
2123 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2124
2125 $self->in_memory (cf::MAP_LOADING);
2126 2199
2127 $self->alloc; 2200 $self->alloc;
2128 2201
2129 $self->pre_load; 2202 $self->pre_load;
2130 cf::cede_to_tick; 2203 cf::cede_to_tick;
2131 2204
2205 if (exists $self->{load_path}) {
2132 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2133 $f->skip_block; 2207 $f->skip_block;
2134 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2135 or return; 2209 or return;
2136 2210
2137 $self->post_load_original 2211 $self->post_load_original
2138 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2139 2213
2140 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2141 utf8::encode $uniq; 2215 utf8::encode $uniq;
2142 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2143 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2144 $self->clear_unique_items; 2218 $self->clear_unique_items;
2145 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2146 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2147 } 2222 }
2148 } 2223 }
2149 }
2150 2224
2151 $f->resolve_delayed_derefs; 2225 $f->resolve_delayed_derefs;
2226 } else {
2227 $self->post_load_original
2228 if delete $self->{load_original};
2229 }
2230
2231 $self->state (cf::MAP_INACTIVE);
2152 2232
2153 cf::cede_to_tick; 2233 cf::cede_to_tick;
2154 # now do the right thing for maps 2234 # now do the right thing for maps
2155 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2156 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
… …
2159 2239
2160 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2161 $self->decay_objects; 2241 $self->decay_objects;
2162 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2163 $self->update_buttons; 2243 $self->update_buttons;
2244 $self->post_load_physics;
2164 cf::cede_to_tick; 2245 cf::cede_to_tick;
2165 $self->activate; 2246 #$self->activate; # no longer activate maps automatically
2166 } 2247 }
2167 2248
2168 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2169 $self->last_access ($cf::RUNTIME); 2250 $self->last_access ($cf::RUNTIME);
2170
2171 $self->in_memory (cf::MAP_ACTIVE);
2172 } 2251 }
2173 2252
2174 $self->post_load; 2253 $self->post_load;
2254
2255 1
2175} 2256}
2176 2257
2177# customize the map for a given player, i.e. 2258# customize the map for a given player, i.e.
2178# return the _real_ map. used by e.g. per-player 2259# return the _real_ map. used by e.g. per-player
2179# maps to change the path to ~playername/mappath 2260# maps to change the path to ~playername/mappath
… …
2217} 2298}
2218 2299
2219sub find_sync { 2300sub find_sync {
2220 my ($path, $origin) = @_; 2301 my ($path, $origin) = @_;
2221 2302
2303 # it's a bug to call this from the main context
2222 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2304 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223 if $Coro::current == $Coro::main; 2305 if $Coro::current == $Coro::main;
2224 2306
2225 find $path, $origin 2307 find $path, $origin
2226} 2308}
2227 2309
2228sub do_load_sync { 2310sub do_load_sync {
2229 my ($map) = @_; 2311 my ($map) = @_;
2230 2312
2313 # it's a bug to call this from the main context
2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2314 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2232 if $Coro::current == $Coro::main; 2315 if $Coro::current == $Coro::main;
2233 2316
2234 $map->load; 2317 $map->load;
2235} 2318}
… …
2238our $MAP_PREFETCHER = undef; 2321our $MAP_PREFETCHER = undef;
2239 2322
2240sub find_async { 2323sub find_async {
2241 my ($path, $origin, $load) = @_; 2324 my ($path, $origin, $load) = @_;
2242 2325
2243 $path = normalise $path, $origin && $origin->{path}; 2326 $path = normalise $path, $origin;
2244 2327
2328 print "find async $path (from $origin)\n";#d#
2329
2245 if (my $map = $cf::MAP{$path}) { 2330 if (my $map = $cf::MAP{$path}) {
2246 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2331 return $map if !$load || $map->linkable;
2247 } 2332 }
2248 2333
2249 $MAP_PREFETCH{$path} |= $load; 2334 $MAP_PREFETCH{$path} |= $load;
2250 2335
2251 $MAP_PREFETCHER ||= cf::async { 2336 $MAP_PREFETCHER ||= cf::async {
… …
2310sub swap_out { 2395sub swap_out {
2311 my ($self) = @_; 2396 my ($self) = @_;
2312 2397
2313 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2398 my $lock = cf::lock_acquire "map_data:$self->{path}";
2314 2399
2315 return if $self->in_memory != cf::MAP_ACTIVE; 2400 return if !$self->linkable;
2316 return if $self->{deny_save}; 2401 return if $self->{deny_save};
2317 return if $self->players; 2402 return if $self->players;
2318 2403
2319 # first deactivate the map and "unlink" it from the core 2404 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate; 2405 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP; 2406 $_->clear_links_to ($self) for values %cf::MAP;
2322 $self->in_memory (cf::MAP_SWAPPED); 2407 $self->state (cf::MAP_SWAPPED);
2323 2408
2324 # then atomically save 2409 # then atomically save
2325 $self->_save; 2410 $self->_save;
2326 2411
2327 # then free the map 2412 # then free the map
… …
2353 2438
2354 return if $self->players; 2439 return if $self->players;
2355 2440
2356 cf::trace "resetting map ", $self->path, "\n"; 2441 cf::trace "resetting map ", $self->path, "\n";
2357 2442
2358 $self->in_memory (cf::MAP_SWAPPED); 2443 $self->state (cf::MAP_SWAPPED);
2359 2444
2360 # need to save uniques path 2445 # need to save uniques path
2361 unless ($self->{deny_save}) { 2446 unless ($self->{deny_save}) {
2362 my $uniq = $self->uniq_path; utf8::encode $uniq; 2447 my $uniq = $self->uniq_path; utf8::encode $uniq;
2363 2448
… …
2759 ($path, $x, $y) = (undef, undef, undef); 2844 ($path, $x, $y) = (undef, undef, undef);
2760 } 2845 }
2761 } 2846 }
2762 2847
2763 my $map = eval { 2848 my $map = eval {
2764 my $map = defined $path ? cf::map::find $path : undef; 2849 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2765 2850
2766 if ($map) { 2851 if ($map) {
2767 $map = $map->customise_for ($self); 2852 $map = $map->customise_for ($self);
2768 $map = $check->($map, $x, $y, $self) if $check && $map; 2853 $map = $check->($map, $x, $y, $self) if $check && $map;
2769 } else { 2854 } else {
… …
2859 $Coro::current->{desc} = "enter_exit"; 2944 $Coro::current->{desc} = "enter_exit";
2860 2945
2861 unless (eval { 2946 unless (eval {
2862 $self->deactivate_recursive; # just to be sure 2947 $self->deactivate_recursive; # just to be sure
2863 2948
2864 # random map handling
2865 {
2866 my $guard = cf::lock_acquire "exit_prepare:$exit";
2867
2868 prepare_random_map $exit
2869 if $exit->slaying eq "/!";
2870 }
2871
2872 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2949 my $map = cf::map::normalise $exit->slaying, $exit->map;
2873 my $x = $exit->stats->hp; 2950 my $x = $exit->stats->hp;
2874 my $y = $exit->stats->sp; 2951 my $y = $exit->stats->sp;
2952
2953 # special map handling
2954 my $slaying = $exit->slaying;
2955
2956 # special map handling
2957 if ($slaying eq "/!") {
2958 my $guard = cf::lock_acquire "exit_prepare:$exit";
2959
2960 prepare_random_map $exit
2961 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2962
2963 $map = $exit->slaying;
2964
2965 } elsif ($slaying eq '!up') {
2966 $map = $exit->map->tile_path (cf::TILE_UP);
2967 $x = $exit->x;
2968 $y = $exit->y;
2969
2970 } elsif ($slaying eq '!down') {
2971 $map = $exit->map->tile_path (cf::TILE_DOWN);
2972 $x = $exit->x;
2973 $y = $exit->y;
2974 }
2875 2975
2876 $self->goto ($map, $x, $y); 2976 $self->goto ($map, $x, $y);
2877 2977
2878 # if exit is damned, update players death & WoR home-position 2978 # if exit is damned, update players death & WoR home-position
2879 $self->contr->savebed ($map, $x, $y) 2979 $self->contr->savebed ($map, $x, $y)
… …
3394 3494
3395 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3495 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3396 3496
3397 trace "loading facedata from $path\n"; 3497 trace "loading facedata from $path\n";
3398 3498
3399 0 < aio_load $path, my $facedata 3499 my $facedata = decode_storable load_file $path;
3400 or die "$path: $!";
3401
3402 $facedata = Coro::Storable::thaw $facedata;
3403 3500
3404 $facedata->{version} == 2 3501 $facedata->{version} == 2
3405 or cf::cleanup "$path: version mismatch, cannot proceed."; 3502 or cf::cleanup "$path: version mismatch, cannot proceed.";
3406 3503
3407 # patch in the exptable 3504 # patch in the exptable
… …
3421 3518
3422 cf::face::set_visibility $idx, $info->{visibility}; 3519 cf::face::set_visibility $idx, $info->{visibility};
3423 cf::face::set_magicmap $idx, $info->{magicmap}; 3520 cf::face::set_magicmap $idx, $info->{magicmap};
3424 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3521 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3425 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3522 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3523 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3426 3524
3427 cf::cede_to_tick; 3525 cf::cede_to_tick;
3428 } 3526 }
3429 3527
3430 while (my ($face, $info) = each %$faces) { 3528 while (my ($face, $info) = each %$faces) {
… …
3525} 3623}
3526 3624
3527sub reload_sound { 3625sub reload_sound {
3528 trace "loading sound config from $DATADIR/sound\n"; 3626 trace "loading sound config from $DATADIR/sound\n";
3529 3627
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); 3628 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3534 3629
3535 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3630 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536 my $sound = $soundconf->{compat}[$_] 3631 my $sound = $soundconf->{compat}[$_]
3537 or next; 3632 or next;
3538 3633
… …
3562} 3657}
3563 3658
3564sub reload_config { 3659sub reload_config {
3565 trace "reloading config file...\n"; 3660 trace "reloading config file...\n";
3566 3661
3567 0 < aio_load "$CONFDIR/config", my $config 3662 my $config = load_file "$CONFDIR/config";
3568 or die "$CONFDIR/config: $!";
3569
3570 utf8::decode $config; 3663 utf8::decode $config;
3571 *CFG = yaml_load $config; 3664 *CFG = decode_yaml $config;
3572 3665
3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3666 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3574 3667
3575 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3668 $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}; 3669 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3614 3707
3615sub main { 3708sub main {
3616 cf::init_globals; # initialise logging 3709 cf::init_globals; # initialise logging
3617 3710
3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3711 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3619 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3712 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3713 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3621 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3714 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3622 3715
3623 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3716 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3624 3717
… …
3660 3753
3661 # no (long-running) fork's whatsoever before this point(!) 3754 # no (long-running) fork's whatsoever before this point(!)
3662 use POSIX (); 3755 use POSIX ();
3663 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3756 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3664 3757
3665 (pop @POST_INIT)->(0) while @POST_INIT; 3758 cf::_post_init 0;
3666 }; 3759 };
3667 3760
3668 cf::object::thawer::errors_are_fatal 0; 3761 cf::object::thawer::errors_are_fatal 0;
3669 info "parse errors in files are no longer fatal from this point on.\n"; 3762 info "parse errors in files are no longer fatal from this point on.\n";
3670 3763
… …
3893 3986
3894 my $t1 = AE::time; 3987 my $t1 = AE::time;
3895 3988
3896 while ($RELOAD) { 3989 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl"; 3990 cf::get_slot 0.1, -1, "reload_perl";
3898 info "reloading..."; 3991 info "perl_reload: reloading...";
3899 3992
3900 trace "entering sync_job"; 3993 trace "perl_reload: entering sync_job";
3901 3994
3902 cf::sync_job { 3995 cf::sync_job {
3903 #cf::emergency_save; 3996 #cf::emergency_save;
3904 3997
3905 trace "cancelling all extension coros"; 3998 trace "perl_reload: cancelling all extension coros";
3906 $_->cancel for values %EXT_CORO; 3999 $_->cancel for values %EXT_CORO;
3907 %EXT_CORO = (); 4000 %EXT_CORO = ();
3908 4001
3909 trace "removing commands"; 4002 trace "perl_reload: removing commands";
3910 %COMMAND = (); 4003 %COMMAND = ();
3911 4004
3912 trace "removing ext/exti commands"; 4005 trace "perl_reload: removing ext/exti commands";
3913 %EXTCMD = (); 4006 %EXTCMD = ();
3914 %EXTICMD = (); 4007 %EXTICMD = ();
3915 4008
3916 trace "unloading/nuking all extensions"; 4009 trace "perl_reload: unloading/nuking all extensions";
3917 for my $pkg (@EXTS) { 4010 for my $pkg (@EXTS) {
3918 trace "... unloading $pkg"; 4011 trace "... unloading $pkg";
3919 4012
3920 if (my $cb = $pkg->can ("unload")) { 4013 if (my $cb = $pkg->can ("unload")) {
3921 eval { 4014 eval {
… …
3926 4019
3927 trace "... clearing $pkg"; 4020 trace "... clearing $pkg";
3928 clear_package $pkg; 4021 clear_package $pkg;
3929 } 4022 }
3930 4023
3931 trace "unloading all perl modules loaded from $LIBDIR"; 4024 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3932 while (my ($k, $v) = each %INC) { 4025 while (my ($k, $v) = each %INC) {
3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4026 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3934 4027
3935 trace "... unloading $k"; 4028 trace "... unloading $k";
3936 delete $INC{$k}; 4029 delete $INC{$k};
… …
3943 } 4036 }
3944 4037
3945 clear_package $k; 4038 clear_package $k;
3946 } 4039 }
3947 4040
3948 trace "getting rid of safe::, as good as possible"; 4041 trace "perl_reload: getting rid of safe::, as good as possible";
3949 clear_package "safe::$_" 4042 clear_package "safe::$_"
3950 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4043 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3951 4044
3952 trace "unloading cf.pm \"a bit\""; 4045 trace "perl_reload: unloading cf.pm \"a bit\"";
3953 delete $INC{"cf.pm"}; 4046 delete $INC{"cf.pm"};
3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4047 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3955 4048
3956 # don't, removes xs symbols, too, 4049 # don't, removes xs symbols, too,
3957 # and global variables created in xs 4050 # and global variables created in xs
3958 #clear_package __PACKAGE__; 4051 #clear_package __PACKAGE__;
3959 4052
3960 info "unload completed, starting to reload now"; 4053 info "perl_reload: unload completed, starting to reload now";
3961 4054
3962 trace "reloading cf.pm"; 4055 trace "perl_reload: reloading cf.pm";
3963 require cf; 4056 require cf;
3964 cf::_connect_to_perl_1; 4057 cf::_connect_to_perl_1;
3965 4058
3966 trace "loading config and database again"; 4059 trace "perl_reload: loading config and database again";
3967 cf::reload_config; 4060 cf::reload_config;
3968 4061
3969 trace "loading extensions"; 4062 trace "perl_reload: loading extensions";
3970 cf::load_extensions; 4063 cf::load_extensions;
3971 4064
3972 if ($REATTACH_ON_RELOAD) { 4065 if ($REATTACH_ON_RELOAD) {
3973 trace "reattaching attachments to objects/players"; 4066 trace "perl_reload: reattaching attachments to objects/players";
3974 _global_reattach; # objects, sockets 4067 _global_reattach; # objects, sockets
3975 trace "reattaching attachments to maps"; 4068 trace "perl_reload: reattaching attachments to maps";
3976 reattach $_ for values %MAP; 4069 reattach $_ for values %MAP;
3977 trace "reattaching attachments to players"; 4070 trace "perl_reload: reattaching attachments to players";
3978 reattach $_ for values %PLAYER; 4071 reattach $_ for values %PLAYER;
3979 } 4072 }
3980 4073
3981 trace "running post_init jobs"; 4074 cf::_post_init 1;
3982 (pop @POST_INIT)->(1) while @POST_INIT;
3983 4075
3984 trace "leaving sync_job"; 4076 trace "perl_reload: leaving sync_job";
3985 4077
3986 1 4078 1
3987 } or do { 4079 } or do {
3988 error $@; 4080 error $@;
3989 cf::cleanup "error while reloading, exiting."; 4081 cf::cleanup "perl_reload: error, exiting.";
3990 }; 4082 };
3991 4083
3992 info "reloaded";
3993 --$RELOAD; 4084 --$RELOAD;
3994 } 4085 }
3995 4086
3996 $t1 = AE::time - $t1; 4087 $t1 = AE::time - $t1;
3997 info "reload completed in ${t1}s\n"; 4088 info "perl_reload: completed in ${t1}s\n";
3998}; 4089};
3999 4090
4000our $RELOAD_WATCHER; # used only during reload 4091our $RELOAD_WATCHER; # used only during reload
4001 4092
4002sub reload_perl() { 4093sub reload_perl() {
… …
4027 4118
4028############################################################################# 4119#############################################################################
4029 4120
4030my $bug_warning = 0; 4121my $bug_warning = 0;
4031 4122
4032our @WAIT_FOR_TICK;
4033our @WAIT_FOR_TICK_BEGIN;
4034
4035sub wait_for_tick() { 4123sub wait_for_tick() {
4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4124 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4037 4125
4038 my $signal = new Coro::Signal; 4126 $WAIT_FOR_TICK->wait;
4039 push @WAIT_FOR_TICK, $signal;
4040 $signal->wait;
4041} 4127}
4042 4128
4043sub wait_for_tick_begin() { 4129sub wait_for_tick_begin() {
4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4130 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4045 4131
4046 my $signal = new Coro::Signal; 4132 my $signal = new Coro::Signal;
4047 push @WAIT_FOR_TICK_BEGIN, $signal; 4133 push @WAIT_FOR_TICK_BEGIN, $signal;
4048 $signal->wait; 4134 $signal->wait;
4049} 4135}
… …
4053 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4139 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4054 unless ++$bug_warning > 10; 4140 unless ++$bug_warning > 10;
4055 return; 4141 return;
4056 } 4142 }
4057 4143
4058 cf::server_tick; # one server iteration 4144 cf::one_tick; # one server iteration
4059 4145
4060 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4146 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4061 4147
4062 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4148 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4063 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4149 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4069 } 4155 }
4070 4156
4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4072 $sig->send; 4158 $sig->send;
4073 } 4159 }
4074 while (my $sig = shift @WAIT_FOR_TICK) { 4160 $WAIT_FOR_TICK->broadcast;
4075 $sig->send;
4076 }
4077 4161
4078 $LOAD = ($NOW - $TICK_START) / $TICK; 4162 $LOAD = ($NOW - $TICK_START) / $TICK;
4079 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4163 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4080 4164
4081 if (0) { 4165 if (0) {
… …
4135 IO::AIO::min_parallel 8; 4219 IO::AIO::min_parallel 8;
4136 IO::AIO::max_poll_time $TICK * 0.1; 4220 IO::AIO::max_poll_time $TICK * 0.1;
4137 undef $AnyEvent::AIO::WATCHER; 4221 undef $AnyEvent::AIO::WATCHER;
4138} 4222}
4139 4223
4140my $_log_backtrace; 4224our $_log_backtrace;
4225our $_log_backtrace_last;
4141 4226
4142sub _log_backtrace { 4227sub _log_backtrace {
4143 my ($msg, @addr) = @_; 4228 my ($msg, @addr) = @_;
4144 4229
4145 $msg =~ s/\n//; 4230 $msg =~ s/\n$//;
4146 4231
4232 if ($_log_backtrace_last eq $msg) {
4233 LOG llevInfo, "[ABT] $msg\n";
4234 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4147 # limit the # of concurrent backtraces 4235 # limit the # of concurrent backtraces
4148 if ($_log_backtrace < 2) { 4236 } elsif ($_log_backtrace < 2) {
4237 $_log_backtrace_last = $msg;
4149 ++$_log_backtrace; 4238 ++$_log_backtrace;
4150 my $perl_bt = Carp::longmess $msg; 4239 my $perl_bt = Carp::longmess $msg;
4151 async { 4240 async {
4152 $Coro::current->{desc} = "abt $msg"; 4241 $Coro::current->{desc} = "abt $msg";
4153 4242
… …
4173 LOG llevInfo, "[ABT] $_\n" for @bt; 4262 LOG llevInfo, "[ABT] $_\n" for @bt;
4174 --$_log_backtrace; 4263 --$_log_backtrace;
4175 }; 4264 };
4176 } else { 4265 } else {
4177 LOG llevInfo, "[ABT] $msg\n"; 4266 LOG llevInfo, "[ABT] $msg\n";
4178 LOG llevInfo, "[ABT] [suppressed]\n"; 4267 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4179 } 4268 }
4180} 4269}
4181 4270
4182# load additional modules 4271# load additional modules
4183require "cf/$_.pm" for @EXTRA_MODULES; 4272require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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