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.579 by root, Wed Jan 4 03:22:28 2012 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,2012 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";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %RESOURCE; # unused 113#our %RESOURCE; # unused
112 114
113our $OUTPUT_RATE_MIN = 3000; 115our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 116our $OUTPUT_RATE_MAX = 1000000;
115 117
116our $MAX_LINKS = 32; # how many chained exits to follow 118our $MAX_LINKS = 32; # how many chained exits to follow
… …
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) {
… …
1379 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1380 1462
1381 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1382 1464
1383 if (ref $msg) { 1465 if (ref $msg) {
1384 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1385 "ARRAY" eq ref $msg
1386 ? @$msg
1387 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1388 1467
1389 my @reply; 1468 my @reply;
1390 1469
1391 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1392 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
… …
1495 1574
1496 while (my ($k, $v) = each %todo) { 1575 while (my ($k, $v) = each %todo) {
1497 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1576 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1498 if exists $v->{meta}{mandatory}; 1577 if exists $v->{meta}{mandatory};
1499 } 1578 }
1579
1580 last;
1500 } 1581 }
1501 } 1582 }
1502 }; 1583 };
1503} 1584}
1504 1585
… …
1662 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1663 1744
1664 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1665 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1746 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1666 1747
1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1668 $pl->deactivate; 1749 $pl->deactivate;
1669 1750
1670 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1751 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1671 ext::highscore::check ($pl->ob); 1753 ext::highscore::check ($pl->ob);
1672 1754
1673 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1674 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1675 1756
1676 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1677 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1678 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
… …
1844sub generate_random_map { 1925sub generate_random_map {
1845 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1846 1927
1847 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1848 1929
1849 # mit "rum" bekleckern, nicht
1850 $self->_create_random_map ( 1930 $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} 1931}
1864 1932
1865=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1866 1934
1867Register a handler for the map path matching the given regex at the 1935Register a handler for the map path matching the given regex at the
… …
1918 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1919 $path = "$base/$path"; 1987 $path = "$base/$path";
1920 } 1988 }
1921 1989
1922 for ($path) { 1990 for ($path) {
1923 redo if s{//}{/};
1924 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1925 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1926 } 1993 }
1927 1994
1928 $path 1995 $path
… …
1946 2013
1947 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1948 () 2015 ()
1949} 2016}
1950 2017
2018# may re-bless or do other evil things
1951sub init { 2019sub init {
1952 my ($self) = @_; 2020 my ($self) = @_;
1953 2021
1954 $self 2022 $self
1955} 2023}
… …
2020 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
2021 2089
2022 1 2090 1
2023} 2091}
2024 2092
2093# used to laod the header of an original map
2025sub load_header_orig { 2094sub load_header_orig {
2026 my ($self) = @_; 2095 my ($self) = @_;
2027 2096
2028 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
2029} 2098}
2030 2099
2100# used to laod the header of an instantiated map
2031sub load_header_temp { 2101sub load_header_temp {
2032 my ($self) = @_; 2102 my ($self) = @_;
2033 2103
2034 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
2035} 2105}
2036 2106
2107# called after loading the header from an instantiated map
2037sub prepare_temp { 2108sub prepare_temp {
2038 my ($self) = @_; 2109 my ($self) = @_;
2039 2110
2040 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
2041 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
2042 # safety 2113 # safety
2043 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
2044 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
2045} 2116}
2046 2117
2118# called after loading the header from an original map
2047sub prepare_orig { 2119sub prepare_orig {
2048 my ($self) = @_; 2120 my ($self) = @_;
2049 2121
2050 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
2051 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
… …
2077sub find { 2149sub find {
2078 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
2079 2151
2080 cf::cede_to_tick; 2152 cf::cede_to_tick;
2081 2153
2082 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
2083 2155
2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2085 my $guard2 = cf::lock_acquire "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
2086 2158
2087 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
… …
2118 2190
2119 { 2191 {
2120 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2121 2193
2122 return unless $self->valid; 2194 return unless $self->valid;
2123 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2124
2125 $self->in_memory (cf::MAP_LOADING);
2126 2196
2127 $self->alloc; 2197 $self->alloc;
2128 2198
2129 $self->pre_load; 2199 $self->pre_load;
2130 cf::cede_to_tick; 2200 cf::cede_to_tick;
2131 2201
2202 if (exists $self->{load_path}) {
2132 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2133 $f->skip_block; 2204 $f->skip_block;
2134 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2135 or return; 2206 or return;
2136 2207
2137 $self->post_load_original 2208 $self->post_load_original
2138 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2139 2210
2140 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2141 utf8::encode $uniq; 2212 utf8::encode $uniq;
2142 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2143 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2144 $self->clear_unique_items; 2215 $self->clear_unique_items;
2145 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2146 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2147 } 2219 }
2148 } 2220 }
2149 }
2150 2221
2151 $f->resolve_delayed_derefs; 2222 $f->resolve_delayed_derefs;
2223 } else {
2224 $self->post_load_original
2225 if delete $self->{load_original};
2226 }
2227
2228 $self->state (cf::MAP_INACTIVE);
2152 2229
2153 cf::cede_to_tick; 2230 cf::cede_to_tick;
2154 # now do the right thing for maps 2231 # now do the right thing for maps
2155 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2156 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
… …
2160 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2161 $self->decay_objects; 2238 $self->decay_objects;
2162 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2163 $self->update_buttons; 2240 $self->update_buttons;
2164 cf::cede_to_tick; 2241 cf::cede_to_tick;
2165 $self->activate; 2242 #$self->activate; # no longer activate maps automatically
2166 } 2243 }
2167 2244
2168 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2169 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2170
2171 $self->in_memory (cf::MAP_ACTIVE);
2172 } 2247 }
2173 2248
2174 $self->post_load; 2249 $self->post_load;
2250
2251 1
2175} 2252}
2176 2253
2177# customize the map for a given player, i.e. 2254# customize the map for a given player, i.e.
2178# return the _real_ map. used by e.g. per-player 2255# return the _real_ map. used by e.g. per-player
2179# maps to change the path to ~playername/mappath 2256# maps to change the path to ~playername/mappath
… …
2187# if $self->per_party; 2264# if $self->per_party;
2188 2265
2189 $self 2266 $self
2190} 2267}
2191 2268
2192# find and load all maps in the 3x3 area around a map
2193sub load_neighbours {
2194 my ($map) = @_;
2195
2196 my @neigh; # diagonal neighbours
2197
2198 for (0 .. 3) {
2199 my $neigh = $map->tile_path ($_)
2200 or next;
2201 $neigh = find $neigh, $map
2202 or next;
2203 $neigh->load;
2204
2205 # now find the diagonal neighbours
2206 push @neigh,
2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2209 }
2210
2211 for (grep defined $_->[0], @neigh) {
2212 my ($path, $origin) = @$_;
2213 my $neigh = find $path, $origin
2214 or next;
2215 $neigh->load;
2216 }
2217}
2218
2219sub find_sync { 2269sub find_sync {
2220 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2221 2271
2272 # it's a bug to call this from the main context
2222 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223 if $Coro::current == $Coro::main; 2274 if $Coro::current == $Coro::main;
2224 2275
2225 find $path, $origin 2276 find $path, $origin
2226} 2277}
2227 2278
2228sub do_load_sync { 2279sub do_load_sync {
2229 my ($map) = @_; 2280 my ($map) = @_;
2230 2281
2282 # it's a bug to call this from the main context
2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2232 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2233 2285
2234 $map->load; 2286 $map->load;
2235} 2287}
… …
2238our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2239 2291
2240sub find_async { 2292sub find_async {
2241 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2242 2294
2243 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2244 2296
2245 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2246 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2247 } 2299 }
2248 2300
2249 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2250 2302
2251 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
… …
2310sub swap_out { 2362sub swap_out {
2311 my ($self) = @_; 2363 my ($self) = @_;
2312 2364
2313 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2314 2366
2315 return if $self->in_memory != cf::MAP_ACTIVE; 2367 return if !$self->linkable;
2316 return if $self->{deny_save}; 2368 return if $self->{deny_save};
2317 return if $self->players; 2369 return if $self->players;
2318 2370
2319 # first deactivate the map and "unlink" it from the core 2371 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate; 2372 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP; 2373 $_->clear_links_to ($self) for values %cf::MAP;
2322 $self->in_memory (cf::MAP_SWAPPED); 2374 $self->state (cf::MAP_SWAPPED);
2323 2375
2324 # then atomically save 2376 # then atomically save
2325 $self->_save; 2377 $self->_save;
2326 2378
2327 # then free the map 2379 # then free the map
… …
2353 2405
2354 return if $self->players; 2406 return if $self->players;
2355 2407
2356 cf::trace "resetting map ", $self->path, "\n"; 2408 cf::trace "resetting map ", $self->path, "\n";
2357 2409
2358 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2359 2411
2360 # need to save uniques path 2412 # need to save uniques path
2361 unless ($self->{deny_save}) { 2413 unless ($self->{deny_save}) {
2362 my $uniq = $self->uniq_path; utf8::encode $uniq; 2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2363 2415
… …
2693 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2694 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2695 if $x <= 0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2696 2748
2697 $map->load; 2749 $map->load;
2698 $map->load_neighbours;
2699 2750
2700 return unless $self->contr->active; 2751 return unless $self->contr->active;
2701 2752
2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2703 if ($self->enter_map ($map, $x, $y)) { 2754 if ($self->enter_map ($map, $x, $y)) {
… …
2759 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2760 } 2811 }
2761 } 2812 }
2762 2813
2763 my $map = eval { 2814 my $map = eval {
2764 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2765 2816
2766 if ($map) { 2817 if ($map) {
2767 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2768 $map = $check->($map, $x, $y, $self) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2769 } else { 2820 } else {
… …
2859 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2860 2911
2861 unless (eval { 2912 unless (eval {
2862 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2863 2914
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; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2873 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2874 my $y = $exit->stats->sp; 2917 my $y = $exit->stats->sp;
2918
2919 # special map handling
2920 my $slaying = $exit->slaying;
2921
2922 # special map handling
2923 if ($slaying eq "/!") {
2924 my $guard = cf::lock_acquire "exit_prepare:$exit";
2925
2926 prepare_random_map $exit
2927 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2928
2929 $map = $exit->slaying;
2930
2931 } elsif ($slaying eq '!up') {
2932 $map = $exit->map->tile_path (cf::TILE_UP);
2933 $x = $exit->x;
2934 $y = $exit->y;
2935
2936 } elsif ($slaying eq '!down') {
2937 $map = $exit->map->tile_path (cf::TILE_DOWN);
2938 $x = $exit->x;
2939 $y = $exit->y;
2940 }
2875 2941
2876 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2877 2943
2878 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2879 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
… …
3121=cut 3187=cut
3122 3188
3123sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
3124 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
3125 3191
3126 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3128 } elsif ($self->extcmd == 1) {
3129 #TODO: version 1, remove
3130 unshift @msg, msgtype => "reply", msgid => $id;
3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3132 }
3133} 3195}
3134 3196
3135=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
3136 3198
3137Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
… …
3192 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
3193 3255
3194 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3195 3257
3196 if (ref $msg) { 3258 if (ref $msg) {
3197 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3198 "ARRAY" eq ref $msg
3199 ? @$msg
3200 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3201 3260
3202 my @reply; 3261 my @reply;
3203 3262
3204 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
3205 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
… …
3394 3453
3395 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3396 3455
3397 trace "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3398 3457
3399 0 < aio_load $path, my $facedata 3458 my $facedata = decode_storable load_file $path;
3400 or die "$path: $!";
3401
3402 $facedata = Coro::Storable::thaw $facedata;
3403 3459
3404 $facedata->{version} == 2 3460 $facedata->{version} == 2
3405 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3406 3462
3407 # patch in the exptable 3463 # patch in the exptable
… …
3421 3477
3422 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3423 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3424 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3425 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3481 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3482 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3426 3483
3427 cf::cede_to_tick; 3484 cf::cede_to_tick;
3428 } 3485 }
3429 3486
3430 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
… …
3457 3514
3458 { 3515 {
3459 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3460 3517
3461 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3462 if (defined $info->{type}) { 3519 if (defined (my $type = $info->{type})) {
3520 # TODO: different hash - must free and use new index, or cache ixface data queue
3463 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3521 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3464 3522
3465 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3523 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3466 cf::face::set_type $idx, $info->{type}; 3524 cf::face::set_type $idx, $type;
3525 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # any keys left are stashed into meta unless prepended
3467 } else { 3526 } else {
3468 $RESOURCE{$name} = $info; # unused 3527# $RESOURCE{$name} = $info; # unused
3469 } 3528 }
3470 3529
3471 cf::cede_to_tick; 3530 cf::cede_to_tick;
3472 } 3531 }
3473 } 3532 }
… …
3525} 3584}
3526 3585
3527sub reload_sound { 3586sub reload_sound {
3528 trace "loading sound config from $DATADIR/sound\n"; 3587 trace "loading sound config from $DATADIR/sound\n";
3529 3588
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); 3589 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3534 3590
3535 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3591 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536 my $sound = $soundconf->{compat}[$_] 3592 my $sound = $soundconf->{compat}[$_]
3537 or next; 3593 or next;
3538 3594
… …
3562} 3618}
3563 3619
3564sub reload_config { 3620sub reload_config {
3565 trace "reloading config file...\n"; 3621 trace "reloading config file...\n";
3566 3622
3567 0 < aio_load "$CONFDIR/config", my $config 3623 my $config = load_file "$CONFDIR/config";
3568 or die "$CONFDIR/config: $!";
3569
3570 utf8::decode $config; 3624 utf8::decode $config;
3571 *CFG = yaml_load $config; 3625 *CFG = decode_yaml $config;
3572 3626
3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3627 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3574 3628
3575 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3629 $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}; 3630 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3614 3668
3615sub main { 3669sub main {
3616 cf::init_globals; # initialise logging 3670 cf::init_globals; # initialise logging
3617 3671
3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3672 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3619 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3673 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3674 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3621 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3675 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3622 3676
3623 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3677 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3624 3678
… …
3660 3714
3661 # no (long-running) fork's whatsoever before this point(!) 3715 # no (long-running) fork's whatsoever before this point(!)
3662 use POSIX (); 3716 use POSIX ();
3663 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3717 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3664 3718
3665 (pop @POST_INIT)->(0) while @POST_INIT; 3719 cf::_post_init 0;
3666 }; 3720 };
3667 3721
3668 cf::object::thawer::errors_are_fatal 0; 3722 cf::object::thawer::errors_are_fatal 0;
3669 info "parse errors in files are no longer fatal from this point on.\n"; 3723 info "parse errors in files are no longer fatal from this point on.\n";
3670 3724
3671 my $free_main; $free_main = EV::idle sub { 3725 AE::postpone {
3672 undef $free_main;
3673 undef &main; # free gobs of memory :) 3726 undef &main; # free gobs of memory :)
3674 }; 3727 };
3675 3728
3676 goto &main_loop; 3729 goto &main_loop;
3677} 3730}
… …
3834 3887
3835 cf::write_runtime_sync; # external watchdog should not bark 3888 cf::write_runtime_sync; # external watchdog should not bark
3836 3889
3837 trace "emergency_perl_save: flushing outstanding aio requests"; 3890 trace "emergency_perl_save: flushing outstanding aio requests";
3838 while (IO::AIO::nreqs || BDB::nreqs) { 3891 while (IO::AIO::nreqs || BDB::nreqs) {
3839 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3892 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3840 } 3893 }
3841 3894
3842 cf::write_runtime_sync; # external watchdog should not bark 3895 cf::write_runtime_sync; # external watchdog should not bark
3843 }; 3896 };
3844 3897
… …
3893 3946
3894 my $t1 = AE::time; 3947 my $t1 = AE::time;
3895 3948
3896 while ($RELOAD) { 3949 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl"; 3950 cf::get_slot 0.1, -1, "reload_perl";
3898 info "reloading..."; 3951 info "perl_reload: reloading...";
3899 3952
3900 trace "entering sync_job"; 3953 trace "perl_reload: entering sync_job";
3901 3954
3902 cf::sync_job { 3955 cf::sync_job {
3903 #cf::emergency_save; 3956 #cf::emergency_save;
3904 3957
3905 trace "cancelling all extension coros"; 3958 trace "perl_reload: cancelling all extension coros";
3906 $_->cancel for values %EXT_CORO; 3959 $_->cancel for values %EXT_CORO;
3907 %EXT_CORO = (); 3960 %EXT_CORO = ();
3908 3961
3909 trace "removing commands"; 3962 trace "perl_reload: removing commands";
3910 %COMMAND = (); 3963 %COMMAND = ();
3911 3964
3912 trace "removing ext/exti commands"; 3965 trace "perl_reload: removing ext/exti commands";
3913 %EXTCMD = (); 3966 %EXTCMD = ();
3914 %EXTICMD = (); 3967 %EXTICMD = ();
3915 3968
3916 trace "unloading/nuking all extensions"; 3969 trace "perl_reload: unloading/nuking all extensions";
3917 for my $pkg (@EXTS) { 3970 for my $pkg (@EXTS) {
3918 trace "... unloading $pkg"; 3971 trace "... unloading $pkg";
3919 3972
3920 if (my $cb = $pkg->can ("unload")) { 3973 if (my $cb = $pkg->can ("unload")) {
3921 eval { 3974 eval {
… …
3926 3979
3927 trace "... clearing $pkg"; 3980 trace "... clearing $pkg";
3928 clear_package $pkg; 3981 clear_package $pkg;
3929 } 3982 }
3930 3983
3931 trace "unloading all perl modules loaded from $LIBDIR"; 3984 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3932 while (my ($k, $v) = each %INC) { 3985 while (my ($k, $v) = each %INC) {
3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3986 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3934 3987
3935 trace "... unloading $k"; 3988 trace "... unloading $k";
3936 delete $INC{$k}; 3989 delete $INC{$k};
… …
3943 } 3996 }
3944 3997
3945 clear_package $k; 3998 clear_package $k;
3946 } 3999 }
3947 4000
3948 trace "getting rid of safe::, as good as possible"; 4001 trace "perl_reload: getting rid of safe::, as good as possible";
3949 clear_package "safe::$_" 4002 clear_package "safe::$_"
3950 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4003 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3951 4004
3952 trace "unloading cf.pm \"a bit\""; 4005 trace "perl_reload: unloading cf.pm \"a bit\"";
3953 delete $INC{"cf.pm"}; 4006 delete $INC{"cf.pm"};
3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4007 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3955 4008
3956 # don't, removes xs symbols, too, 4009 # don't, removes xs symbols, too,
3957 # and global variables created in xs 4010 # and global variables created in xs
3958 #clear_package __PACKAGE__; 4011 #clear_package __PACKAGE__;
3959 4012
3960 info "unload completed, starting to reload now"; 4013 info "perl_reload: unload completed, starting to reload now";
3961 4014
3962 trace "reloading cf.pm"; 4015 trace "perl_reload: reloading cf.pm";
3963 require cf; 4016 require cf;
3964 cf::_connect_to_perl_1; 4017 cf::_connect_to_perl_1;
3965 4018
3966 trace "loading config and database again"; 4019 trace "perl_reload: loading config and database again";
3967 cf::reload_config; 4020 cf::reload_config;
3968 4021
3969 trace "loading extensions"; 4022 trace "perl_reload: loading extensions";
3970 cf::load_extensions; 4023 cf::load_extensions;
3971 4024
3972 if ($REATTACH_ON_RELOAD) { 4025 if ($REATTACH_ON_RELOAD) {
3973 trace "reattaching attachments to objects/players"; 4026 trace "perl_reload: reattaching attachments to objects/players";
3974 _global_reattach; # objects, sockets 4027 _global_reattach; # objects, sockets
3975 trace "reattaching attachments to maps"; 4028 trace "perl_reload: reattaching attachments to maps";
3976 reattach $_ for values %MAP; 4029 reattach $_ for values %MAP;
3977 trace "reattaching attachments to players"; 4030 trace "perl_reload: reattaching attachments to players";
3978 reattach $_ for values %PLAYER; 4031 reattach $_ for values %PLAYER;
3979 } 4032 }
3980 4033
3981 trace "running post_init jobs"; 4034 cf::_post_init 1;
3982 (pop @POST_INIT)->(1) while @POST_INIT;
3983 4035
3984 trace "leaving sync_job"; 4036 trace "perl_reload: leaving sync_job";
3985 4037
3986 1 4038 1
3987 } or do { 4039 } or do {
3988 error $@; 4040 error $@;
3989 cf::cleanup "error while reloading, exiting."; 4041 cf::cleanup "perl_reload: error, exiting.";
3990 }; 4042 };
3991 4043
3992 info "reloaded";
3993 --$RELOAD; 4044 --$RELOAD;
3994 } 4045 }
3995 4046
3996 $t1 = AE::time - $t1; 4047 $t1 = AE::time - $t1;
3997 info "reload completed in ${t1}s\n"; 4048 info "perl_reload: completed in ${t1}s\n";
3998}; 4049};
3999 4050
4000our $RELOAD_WATCHER; # used only during reload 4051our $RELOAD_WATCHER; # used only during reload
4001 4052
4002sub reload_perl() { 4053sub reload_perl() {
… …
4027 4078
4028############################################################################# 4079#############################################################################
4029 4080
4030my $bug_warning = 0; 4081my $bug_warning = 0;
4031 4082
4032our @WAIT_FOR_TICK;
4033our @WAIT_FOR_TICK_BEGIN;
4034
4035sub wait_for_tick() { 4083sub wait_for_tick() {
4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4084 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4037 4085
4038 my $signal = new Coro::Signal; 4086 $WAIT_FOR_TICK->wait;
4039 push @WAIT_FOR_TICK, $signal;
4040 $signal->wait;
4041} 4087}
4042 4088
4043sub wait_for_tick_begin() { 4089sub wait_for_tick_begin() {
4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4090 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4045 4091
4046 my $signal = new Coro::Signal; 4092 my $signal = new Coro::Signal;
4047 push @WAIT_FOR_TICK_BEGIN, $signal; 4093 push @WAIT_FOR_TICK_BEGIN, $signal;
4048 $signal->wait; 4094 $signal->wait;
4049} 4095}
… …
4053 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4099 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4054 unless ++$bug_warning > 10; 4100 unless ++$bug_warning > 10;
4055 return; 4101 return;
4056 } 4102 }
4057 4103
4058 cf::server_tick; # one server iteration 4104 cf::one_tick; # one server iteration
4059 4105
4060 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4106 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4061 4107
4062 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4108 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4063 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4109 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4069 } 4115 }
4070 4116
4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4117 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4072 $sig->send; 4118 $sig->send;
4073 } 4119 }
4074 while (my $sig = shift @WAIT_FOR_TICK) { 4120 $WAIT_FOR_TICK->broadcast;
4075 $sig->send;
4076 }
4077 4121
4078 $LOAD = ($NOW - $TICK_START) / $TICK; 4122 $LOAD = ($NOW - $TICK_START) / $TICK;
4079 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4080 4124
4081 if (0) { 4125 if (0) {
… …
4090{ 4134{
4091 # configure BDB 4135 # configure BDB
4092 4136
4093 BDB::min_parallel 16; 4137 BDB::min_parallel 16;
4094 BDB::max_poll_reqs $TICK * 0.1; 4138 BDB::max_poll_reqs $TICK * 0.1;
4095 $AnyEvent::BDB::WATCHER->priority (1); 4139 #$AnyEvent::BDB::WATCHER->priority (1);
4096 4140
4097 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
4098 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
4099 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4100 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4144 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4135 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
4136 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
4137 undef $AnyEvent::AIO::WATCHER; 4181 undef $AnyEvent::AIO::WATCHER;
4138} 4182}
4139 4183
4140my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
4141 4186
4142sub _log_backtrace { 4187sub _log_backtrace {
4143 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
4144 4189
4145 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
4146 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4147 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
4148 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
4149 ++$_log_backtrace; 4198 ++$_log_backtrace;
4150 my $perl_bt = Carp::longmess $msg; 4199 my $perl_bt = Carp::longmess $msg;
4151 async { 4200 async {
4152 $Coro::current->{desc} = "abt $msg"; 4201 $Coro::current->{desc} = "abt $msg";
4153 4202
… …
4173 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
4174 --$_log_backtrace; 4223 --$_log_backtrace;
4175 }; 4224 };
4176 } else { 4225 } else {
4177 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
4178 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4179 } 4228 }
4180} 4229}
4181 4230
4182# load additional modules 4231# load additional modules
4183require "cf/$_.pm" for @EXTRA_MODULES; 4232require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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