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.587 by root, Wed Oct 31 19:09:47 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.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
… …
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp (); 35use Carp ();
36 36
37use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Fcntl; 60use Fcntl;
57use YAML::XS (); 61use YAML::XS ();
… …
93our @EVENT; 97our @EVENT;
94our @REFLECT; # set by XS 98our @REFLECT; # set by XS
95our %REFLECT; # set by us 99our %REFLECT; # set by us
96 100
97our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
98our $DATADIR = datadir; 103our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
102our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 116
111our %RESOURCE; # unused 117#our %RESOURCE; # unused
112 118
113our $OUTPUT_RATE_MIN = 3000; 119our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 120our $OUTPUT_RATE_MAX = 1000000;
115 121
116our $MAX_LINKS = 32; # how many chained exits to follow 122our $MAX_LINKS = 32; # how many chained exits to follow
… …
127our $DB_ENV; 133our $DB_ENV;
128 134
129our @EXTRA_MODULES = qw(pod match mapscript incloader); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 136
131our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132 139
133our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
135our $NOW; 143our $NOW;
136 144
137our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
… …
148 156
149our @POST_INIT; 157our @POST_INIT;
150 158
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 159our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 160our $REALLY_UNLOOP; # never set to true, please :)
161
162our $WAIT_FOR_TICK = new Coro::Signal;
163our @WAIT_FOR_TICK_BEGIN;
153 164
154binmode STDOUT; 165binmode STDOUT;
155binmode STDERR; 166binmode STDERR;
156 167
157# read virtual server time, if available 168# read virtual server time, if available
… …
191 202
192=over 4 203=over 4
193 204
194=item $cf::UPTIME 205=item $cf::UPTIME
195 206
196The timestamp of the server start (so not actually an uptime). 207The timestamp of the server start (so not actually an "uptime").
208
209=item $cf::SERVER_TICK
210
211An unsigned integer that starts at zero when the server is started and is
212incremented on every tick.
213
214=item $cf::NOW
215
216The (real) time of the last (current) server tick - updated before and
217after tick processing, so this is useful only as a rough "what time is it
218now" estimate.
219
220=item $cf::TICK
221
222The interval between each server tick, in seconds.
197 223
198=item $cf::RUNTIME 224=item $cf::RUNTIME
199 225
200The time this server has run, starts at 0 and is increased by $cf::TICK on 226The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 227every server tick.
… …
207Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
210database environment. 236database environment.
211 237
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 238=item $cf::LOADAVG
221 239
222The current CPU load on the server (alpha-smoothed), as a value between 0 240The 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 241(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
… …
235=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
236 254
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 255These 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 256returns 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. 257per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
258
259Note that cf::Wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>).
263
264=item $cf::WAIT_FOR_TICK
265
266Note that C<cf::wait_for_tick> is probably the correct thing to use. This
267variable contains a L<Coro::Signal> that is broadcats after every server
268tick. Calling C<< ->wait >> on it will suspend the caller until after the
269next server tick.
240 270
241=cut 271=cut
242 272
243sub wait_for_tick(); 273sub wait_for_tick();
244sub wait_for_tick_begin(); 274sub wait_for_tick_begin();
… …
310)) { 340)) {
311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
312} 342}
313 343
314$EV::DIED = sub { 344$EV::DIED = sub {
315 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
316}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
317 352
318############################################################################# 353#############################################################################
319 354
320=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
321 356
… …
342 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 377 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
343 $d 378 $d
344 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
345} 380}
346 381
382=item $scalar = cf::load_file $path
383
384Loads the given file from path and returns its contents. Croaks on error
385and can block.
386
387=cut
388
389sub load_file($) {
390 0 <= aio_load $_[0], my $data
391 or Carp::croak "$_[0]: $!";
392
393 $data
394}
395
396=item $success = cf::replace_file $path, $data, $sync
397
398Atomically replaces the file at the given $path with new $data, and
399optionally $sync the data to disk before replacing the file.
400
401=cut
402
403sub replace_file($$;$) {
404 my ($path, $data, $sync) = @_;
405
406 my $lock = cf::lock_acquire ("replace_file:$path");
407
408 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
409 or return;
410
411 $data = $data->() if ref $data;
412
413 length $data == aio_write $fh, 0, (length $data), $data, 0
414 or return;
415
416 !$sync
417 or !aio_fsync $fh
418 or return;
419
420 aio_close $fh
421 and return;
422
423 aio_rename "$path~", $path
424 and return;
425
426 if ($sync) {
427 $path =~ s%/[^/]*$%%;
428 aio_pathsync $path;
429 }
430
431 1
432}
433
347=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
348 435
349Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
350 437
351=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
… …
357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 444our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
358 445
359sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
360sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
361 448
449=item $ref = cf::decode_storable $scalar
450
451Same as Coro::Storable::thaw, so blocks.
452
453=cut
454
455BEGIN { *decode_storable = \&Coro::Storable::thaw }
456
362=item $ref = cf::yaml_load $scalar 457=item $ref = cf::decode_yaml $scalar
363 458
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks). 459Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365 460
366=cut 461=cut
367 462
368sub fork_call(&@); 463sub decode_yaml($) {
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_ 464 fork_call { YAML::XS::Load $_[0] } @_
465}
466
467=item $scalar = cf::unlzf $scalar
468
469Same as Compress::LZF::compress, but takes server ticks into account, so
470blocks.
471
472=cut
473
474sub unlzf($) {
475 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
476 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
477 Compress::LZF::decompress $_[0]
372} 478}
373 479
374=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
375 481
376Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
… …
381 487
382=cut 488=cut
383 489
384sub post_init(&) { 490sub post_init(&) {
385 push @POST_INIT, shift; 491 push @POST_INIT, shift;
492}
493
494sub _post_init {
495 trace "running post_init jobs";
496
497 # run them in parallel...
498
499 my @join;
500
501 while () {
502 push @join, map &Coro::async ($_, 0), @POST_INIT;
503 @POST_INIT = ();
504
505 @join or last;
506
507 (pop @join)->join;
508 }
386} 509}
387 510
388=item cf::lock_wait $string 511=item cf::lock_wait $string
389 512
390Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
… …
443 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
444} 567}
445 568
446=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
447 570
448Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
449This call blocks and returns only when you have at least C<$time> seconds 572(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. 573C<$time> seconds of cpu time till the next tick. The slot is only valid
574till the next cede.
575
576Background jobs should use a priority les than zero, interactive jobs
577should use 100 or more.
451 578
452The optional C<$name> can be used to identify the job to run. It might be 579The 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. 580used for statistical purposes and should identify the same time-class.
454 581
455Useful for short background jobs. 582Useful for short background jobs.
… …
484 } 611 }
485 } 612 }
486 613
487 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
488 # we do not use wait_for_tick() as it returns immediately when tick is inactive 615 # we do not use wait_for_tick() as it returns immediately when tick is inactive
489 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
490 $signal->wait;
491 } else { 617 } else {
492 $busy = 0; 618 $busy = 0;
493 Coro::schedule; 619 Coro::schedule;
494 } 620 }
495 } 621 }
… …
750 876
751 my @data; 877 my @data;
752 my $md5; 878 my $md5;
753 879
754 for (0 .. $#$src) { 880 for (0 .. $#$src) {
755 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
756 or Carp::croak "$src->[$_]: $!";
757 } 882 }
758 883
759 # if processing is expensive, check 884 # if processing is expensive, check
760 # checksum first 885 # checksum first
761 if (1) { 886 if (1) {
… …
1379 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1380 1505
1381 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1382 1507
1383 if (ref $msg) { 1508 if (ref $msg) {
1384 my ($type, $reply, @payload) = 1509 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 1510
1389 my @reply; 1511 my @reply;
1390 1512
1391 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1392 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
… …
1414 }; 1536 };
1415 1537
1416 $grp 1538 $grp
1417} 1539}
1418 1540
1541sub _ext_cfg_reg($$$$) {
1542 my ($rvar, $varname, $cfgname, $default) = @_;
1543
1544 $cfgname = lc $varname
1545 unless length $cfgname;
1546
1547 $EXT_CFG{$cfgname} = [$rvar, $default];
1548
1549 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1550}
1551
1419sub load_extensions { 1552sub load_extensions {
1420 info "loading extensions..."; 1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1421 1556
1422 cf::sync_job { 1557 cf::sync_job {
1423 my %todo; 1558 my %todo;
1424 1559
1425 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
… …
1468 unless exists $done{$_}; 1603 unless exists $done{$_};
1469 } 1604 }
1470 1605
1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1472 1607
1608 my $source = $v->{source};
1609
1610 # support "CONF varname :confname = default" pseudo-statements
1611 $source =~ s{
1612 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1613 }{
1614 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1615 }gmxe;
1616
1473 my $active = eval $v->{source}; 1617 my $active = eval $source;
1474 1618
1475 if (length $@) { 1619 if (length $@) {
1476 error "$v->{path}: $@\n"; 1620 error "$v->{path}: $@\n";
1477 1621
1478 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
1495 1639
1496 while (my ($k, $v) = each %todo) { 1640 while (my ($k, $v) = each %todo) {
1497 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1498 if exists $v->{meta}{mandatory}; 1642 if exists $v->{meta}{mandatory};
1499 } 1643 }
1644
1645 last;
1500 } 1646 }
1501 } 1647 }
1502 }; 1648 };
1503} 1649}
1504 1650
… …
1662 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1663 1809
1664 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1665 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1811 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1666 1812
1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1668 $pl->deactivate; 1814 $pl->deactivate;
1669 1815
1670 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1816 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1671 ext::highscore::check ($pl->ob); 1818 ext::highscore::check ($pl->ob);
1672 1819
1673 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1674 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1675 1821
1676 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1677 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1678 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
… …
1844sub generate_random_map { 1990sub generate_random_map {
1845 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1846 1992
1847 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1993 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1848 1994
1849 # mit "rum" bekleckern, nicht
1850 $self->_create_random_map ( 1995 $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} 1996}
1864 1997
1865=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1866 1999
1867Register a handler for the map path matching the given regex at the 2000Register a handler for the map path matching the given regex at the
… …
1918 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1919 $path = "$base/$path"; 2052 $path = "$base/$path";
1920 } 2053 }
1921 2054
1922 for ($path) { 2055 for ($path) {
1923 redo if s{//}{/};
1924 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1925 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1926 } 2058 }
1927 2059
1928 $path 2060 $path
… …
1946 2078
1947 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1948 () 2080 ()
1949} 2081}
1950 2082
2083# may re-bless or do other evil things
1951sub init { 2084sub init {
1952 my ($self) = @_; 2085 my ($self) = @_;
1953 2086
1954 $self 2087 $self
1955} 2088}
… …
2020 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
2021 2154
2022 1 2155 1
2023} 2156}
2024 2157
2158# used to laod the header of an original map
2025sub load_header_orig { 2159sub load_header_orig {
2026 my ($self) = @_; 2160 my ($self) = @_;
2027 2161
2028 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
2029} 2163}
2030 2164
2165# used to laod the header of an instantiated map
2031sub load_header_temp { 2166sub load_header_temp {
2032 my ($self) = @_; 2167 my ($self) = @_;
2033 2168
2034 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
2035} 2170}
2036 2171
2172# called after loading the header from an instantiated map
2037sub prepare_temp { 2173sub prepare_temp {
2038 my ($self) = @_; 2174 my ($self) = @_;
2039 2175
2040 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
2041 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
2042 # safety 2178 # safety
2043 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
2044 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
2045} 2181}
2046 2182
2183# called after loading the header from an original map
2047sub prepare_orig { 2184sub prepare_orig {
2048 my ($self) = @_; 2185 my ($self) = @_;
2049 2186
2050 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
2051 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
… …
2077sub find { 2214sub find {
2078 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
2079 2216
2080 cf::cede_to_tick; 2217 cf::cede_to_tick;
2081 2218
2082 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
2083 2220
2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2085 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
2086 2223
2087 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
… …
2118 2255
2119 { 2256 {
2120 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2121 2258
2122 return unless $self->valid; 2259 return unless $self->valid;
2123 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2124
2125 $self->in_memory (cf::MAP_LOADING);
2126 2261
2127 $self->alloc; 2262 $self->alloc;
2128 2263
2129 $self->pre_load; 2264 $self->pre_load;
2130 cf::cede_to_tick; 2265 cf::cede_to_tick;
2131 2266
2267 if (exists $self->{load_path}) {
2132 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2133 $f->skip_block; 2269 $f->skip_block;
2134 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2135 or return; 2271 or return;
2136 2272
2137 $self->post_load_original 2273 $self->post_load_original
2138 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2139 2275
2140 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2141 utf8::encode $uniq; 2277 utf8::encode $uniq;
2142 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2143 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2144 $self->clear_unique_items; 2280 $self->clear_unique_items;
2145 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2146 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2147 } 2284 }
2148 } 2285 }
2149 }
2150 2286
2151 $f->resolve_delayed_derefs; 2287 $f->resolve_delayed_derefs;
2288 } else {
2289 $self->post_load_original
2290 if delete $self->{load_original};
2291 }
2292
2293 $self->state (cf::MAP_INACTIVE);
2152 2294
2153 cf::cede_to_tick; 2295 cf::cede_to_tick;
2154 # now do the right thing for maps 2296 # now do the right thing for maps
2155 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2156 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
… …
2160 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2161 $self->decay_objects; 2303 $self->decay_objects;
2162 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2163 $self->update_buttons; 2305 $self->update_buttons;
2164 cf::cede_to_tick; 2306 cf::cede_to_tick;
2165 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2166 } 2308 }
2167 2309
2168 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2169 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2170
2171 $self->in_memory (cf::MAP_ACTIVE);
2172 } 2312 }
2173 2313
2174 $self->post_load; 2314 $self->post_load;
2315
2316 1
2175} 2317}
2176 2318
2177# customize the map for a given player, i.e. 2319# customize the map for a given player, i.e.
2178# return the _real_ map. used by e.g. per-player 2320# return the _real_ map. used by e.g. per-player
2179# maps to change the path to ~playername/mappath 2321# maps to change the path to ~playername/mappath
… …
2187# if $self->per_party; 2329# if $self->per_party;
2188 2330
2189 $self 2331 $self
2190} 2332}
2191 2333
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 { 2334sub find_sync {
2220 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2221 2336
2337 # it's a bug to call this from the main context
2222 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223 if $Coro::current == $Coro::main; 2339 if $Coro::current == $Coro::main;
2224 2340
2225 find $path, $origin 2341 find $path, $origin
2226} 2342}
2227 2343
2228sub do_load_sync { 2344sub do_load_sync {
2229 my ($map) = @_; 2345 my ($map) = @_;
2230 2346
2347 # it's a bug to call this from the main context
2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2232 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2233 2350
2234 $map->load; 2351 $map->load;
2235} 2352}
… …
2238our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2239 2356
2240sub find_async { 2357sub find_async {
2241 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2242 2359
2243 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2244 2361
2245 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2246 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2247 } 2364 }
2248 2365
2249 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2250 2367
2251 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
… …
2310sub swap_out { 2427sub swap_out {
2311 my ($self) = @_; 2428 my ($self) = @_;
2312 2429
2313 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2314 2431
2315 return if $self->in_memory != cf::MAP_ACTIVE; 2432 return if !$self->linkable;
2316 return if $self->{deny_save}; 2433 return if $self->{deny_save};
2317 return if $self->players; 2434 return if $self->players;
2318 2435
2319 # first deactivate the map and "unlink" it from the core 2436 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate; 2437 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP; 2438 $_->clear_links_to ($self) for values %cf::MAP;
2322 $self->in_memory (cf::MAP_SWAPPED); 2439 $self->state (cf::MAP_SWAPPED);
2323 2440
2324 # then atomically save 2441 # then atomically save
2325 $self->_save; 2442 $self->_save;
2326 2443
2327 # then free the map 2444 # then free the map
… …
2353 2470
2354 return if $self->players; 2471 return if $self->players;
2355 2472
2356 cf::trace "resetting map ", $self->path, "\n"; 2473 cf::trace "resetting map ", $self->path, "\n";
2357 2474
2358 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2359 2476
2360 # need to save uniques path 2477 # need to save uniques path
2361 unless ($self->{deny_save}) { 2478 unless ($self->{deny_save}) {
2362 my $uniq = $self->uniq_path; utf8::encode $uniq; 2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2363 2480
… …
2693 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2694 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2695 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2696 2813
2697 $map->load; 2814 $map->load;
2698 $map->load_neighbours;
2699 2815
2700 return unless $self->contr->active; 2816 return unless $self->contr->active;
2701 2817
2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2703 if ($self->enter_map ($map, $x, $y)) { 2819 if ($self->enter_map ($map, $x, $y)) {
… …
2759 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2760 } 2876 }
2761 } 2877 }
2762 2878
2763 my $map = eval { 2879 my $map = eval {
2764 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2765 2881
2766 if ($map) { 2882 if ($map) {
2767 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2768 $map = $check->($map, $x, $y, $self) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2769 } else { 2885 } else {
… …
2859 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2860 2976
2861 unless (eval { 2977 unless (eval {
2862 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2863 2979
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; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2873 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2874 my $y = $exit->stats->sp; 2982 my $y = $exit->stats->sp;
2983
2984 # special map handling
2985 my $slaying = $exit->slaying;
2986
2987 # special map handling
2988 if ($slaying eq "/!") {
2989 my $guard = cf::lock_acquire "exit_prepare:$exit";
2990
2991 prepare_random_map $exit
2992 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2993
2994 $map = $exit->slaying;
2995
2996 } elsif ($slaying eq '!up') {
2997 $map = $exit->map->tile_path (cf::TILE_UP);
2998 $x = $exit->x;
2999 $y = $exit->y;
3000
3001 } elsif ($slaying eq '!down') {
3002 $map = $exit->map->tile_path (cf::TILE_DOWN);
3003 $x = $exit->x;
3004 $y = $exit->y;
3005 }
2875 3006
2876 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2877 3008
2878 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2879 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
… …
3121=cut 3252=cut
3122 3253
3123sub cf::client::ext_reply($$@) { 3254sub cf::client::ext_reply($$@) {
3124 my ($self, $id, @msg) = @_; 3255 my ($self, $id, @msg) = @_;
3125 3256
3126 if ($self->extcmd == 2) { 3257 return unless $self->extcmd == 2;
3258
3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3259 $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} 3260}
3134 3261
3135=item $success = $client->query ($flags, "text", \&cb) 3262=item $success = $client->query ($flags, "text", \&cb)
3136 3263
3137Queues a query to the client, calling the given callback with 3264Queues a query to the client, calling the given callback with
… …
3192 my ($ns, $buf) = @_; 3319 my ($ns, $buf) = @_;
3193 3320
3194 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3321 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3195 3322
3196 if (ref $msg) { 3323 if (ref $msg) {
3197 my ($type, $reply, @payload) = 3324 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 3325
3202 my @reply; 3326 my @reply;
3203 3327
3204 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTICMD{$type}) {
3205 @reply = $cb->($ns, @payload); 3329 @reply = $cb->($ns, @payload);
… …
3383=cut 3507=cut
3384 3508
3385############################################################################# 3509#############################################################################
3386# the server's init and main functions 3510# the server's init and main functions
3387 3511
3512our %FACEHASH; # hash => idx, #d# HACK for http server
3513
3388sub load_facedata($) { 3514sub load_facedata($) {
3389 my ($path) = @_; 3515 my ($path) = @_;
3390 3516
3391 # HACK to clear player env face cache, we need some signal framework 3517 # HACK to clear player env face cache, we need some signal framework
3392 # for this (global event?) 3518 # for this (global event?)
… …
3394 3520
3395 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3521 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3396 3522
3397 trace "loading facedata from $path\n"; 3523 trace "loading facedata from $path\n";
3398 3524
3399 0 < aio_load $path, my $facedata 3525 my $facedata = decode_storable load_file $path;
3400 or die "$path: $!";
3401
3402 $facedata = Coro::Storable::thaw $facedata;
3403 3526
3404 $facedata->{version} == 2 3527 $facedata->{version} == 2
3405 or cf::cleanup "$path: version mismatch, cannot proceed."; 3528 or cf::cleanup "$path: version mismatch, cannot proceed.";
3406 3529
3407 # patch in the exptable 3530 # patch in the exptable
… …
3414 cf::cede_to_tick; 3537 cf::cede_to_tick;
3415 3538
3416 { 3539 {
3417 my $faces = $facedata->{faceinfo}; 3540 my $faces = $facedata->{faceinfo};
3418 3541
3419 while (my ($face, $info) = each %$faces) { 3542 for my $face (sort keys %$faces) {
3543 my $info = $faces->{$face};
3420 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3544 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3421 3545
3422 cf::face::set_visibility $idx, $info->{visibility}; 3546 cf::face::set_visibility $idx, $info->{visibility};
3423 cf::face::set_magicmap $idx, $info->{magicmap}; 3547 cf::face::set_magicmap $idx, $info->{magicmap};
3424 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3548 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3425 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3549 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3550 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3551 $FACEHASH{$info->{hash64}} = $idx;#d#
3426 3552
3427 cf::cede_to_tick; 3553 cf::cede_to_tick;
3428 } 3554 }
3429 3555
3430 while (my ($face, $info) = each %$faces) { 3556 while (my ($face, $info) = each %$faces) {
… …
3457 3583
3458 { 3584 {
3459 my $res = $facedata->{resource}; 3585 my $res = $facedata->{resource};
3460 3586
3461 while (my ($name, $info) = each %$res) { 3587 while (my ($name, $info) = each %$res) {
3462 if (defined $info->{type}) { 3588 if (defined (my $type = $info->{type})) {
3589 # 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; 3590 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3464 3591
3465 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3592 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3466 cf::face::set_type $idx, $info->{type}; 3593 cf::face::set_type $idx, $type;
3594 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3595 $FACEHASH{$info->{hash}} = $idx;#d#
3467 } else { 3596 } else {
3468 $RESOURCE{$name} = $info; # unused 3597# $RESOURCE{$name} = $info; # unused
3469 } 3598 }
3470 3599
3471 cf::cede_to_tick; 3600 cf::cede_to_tick;
3472 } 3601 }
3473 } 3602 }
… …
3525} 3654}
3526 3655
3527sub reload_sound { 3656sub reload_sound {
3528 trace "loading sound config from $DATADIR/sound\n"; 3657 trace "loading sound config from $DATADIR/sound\n";
3529 3658
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); 3659 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3534 3660
3535 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3661 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536 my $sound = $soundconf->{compat}[$_] 3662 my $sound = $soundconf->{compat}[$_]
3537 or next; 3663 or next;
3538 3664
… …
3562} 3688}
3563 3689
3564sub reload_config { 3690sub reload_config {
3565 trace "reloading config file...\n"; 3691 trace "reloading config file...\n";
3566 3692
3567 0 < aio_load "$CONFDIR/config", my $config 3693 my $config = load_file "$CONFDIR/config";
3568 or die "$CONFDIR/config: $!";
3569
3570 utf8::decode $config; 3694 utf8::decode $config;
3571 *CFG = yaml_load $config; 3695 *CFG = decode_yaml $config;
3572 3696
3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3697 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3574 3698
3575 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3699 $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}; 3700 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3614 3738
3615sub main { 3739sub main {
3616 cf::init_globals; # initialise logging 3740 cf::init_globals; # initialise logging
3617 3741
3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3742 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3619 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3743 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3744 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3621 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3745 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3622 3746
3623 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3747 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3624 3748
3625 # we must not ever block the main coroutine 3749 # we must not ever block the main coroutine
3626 local $Coro::idle = sub { 3750 $Coro::idle = sub {
3627 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3751 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3628 (async { 3752 (async {
3629 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3753 $Coro::current->{desc} = "IDLE BUG HANDLER";
3630 EV::loop EV::LOOP_ONESHOT; 3754 EV::loop EV::LOOP_ONESHOT;
3631 })->prio (Coro::PRIO_MAX); 3755 })->prio (Coro::PRIO_MAX);
… …
3660 3784
3661 # no (long-running) fork's whatsoever before this point(!) 3785 # no (long-running) fork's whatsoever before this point(!)
3662 use POSIX (); 3786 use POSIX ();
3663 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3787 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3664 3788
3665 (pop @POST_INIT)->(0) while @POST_INIT; 3789 cf::_post_init 0;
3666 }; 3790 };
3667 3791
3668 cf::object::thawer::errors_are_fatal 0; 3792 cf::object::thawer::errors_are_fatal 0;
3669 info "parse errors in files are no longer fatal from this point on.\n"; 3793 info "parse errors in files are no longer fatal from this point on.\n";
3670 3794
3671 my $free_main; $free_main = EV::idle sub { 3795 AE::postpone {
3672 undef $free_main;
3673 undef &main; # free gobs of memory :) 3796 undef &main; # free gobs of memory :)
3674 }; 3797 };
3675 3798
3676 goto &main_loop; 3799 goto &main_loop;
3677} 3800}
… …
3834 3957
3835 cf::write_runtime_sync; # external watchdog should not bark 3958 cf::write_runtime_sync; # external watchdog should not bark
3836 3959
3837 trace "emergency_perl_save: flushing outstanding aio requests"; 3960 trace "emergency_perl_save: flushing outstanding aio requests";
3838 while (IO::AIO::nreqs || BDB::nreqs) { 3961 while (IO::AIO::nreqs || BDB::nreqs) {
3839 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3962 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3840 } 3963 }
3841 3964
3842 cf::write_runtime_sync; # external watchdog should not bark 3965 cf::write_runtime_sync; # external watchdog should not bark
3843 }; 3966 };
3844 3967
… …
3893 4016
3894 my $t1 = AE::time; 4017 my $t1 = AE::time;
3895 4018
3896 while ($RELOAD) { 4019 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl"; 4020 cf::get_slot 0.1, -1, "reload_perl";
3898 info "reloading..."; 4021 info "perl_reload: reloading...";
3899 4022
3900 trace "entering sync_job"; 4023 trace "perl_reload: entering sync_job";
3901 4024
3902 cf::sync_job { 4025 cf::sync_job {
3903 #cf::emergency_save; 4026 #cf::emergency_save;
3904 4027
3905 trace "cancelling all extension coros"; 4028 trace "perl_reload: cancelling all extension coros";
3906 $_->cancel for values %EXT_CORO; 4029 $_->cancel for values %EXT_CORO;
3907 %EXT_CORO = (); 4030 %EXT_CORO = ();
3908 4031
3909 trace "removing commands"; 4032 trace "perl_reload: removing commands";
3910 %COMMAND = (); 4033 %COMMAND = ();
3911 4034
3912 trace "removing ext/exti commands"; 4035 trace "perl_reload: removing ext/exti commands";
3913 %EXTCMD = (); 4036 %EXTCMD = ();
3914 %EXTICMD = (); 4037 %EXTICMD = ();
3915 4038
3916 trace "unloading/nuking all extensions"; 4039 trace "perl_reload: unloading/nuking all extensions";
3917 for my $pkg (@EXTS) { 4040 for my $pkg (@EXTS) {
3918 trace "... unloading $pkg"; 4041 trace "... unloading $pkg";
3919 4042
3920 if (my $cb = $pkg->can ("unload")) { 4043 if (my $cb = $pkg->can ("unload")) {
3921 eval { 4044 eval {
… …
3926 4049
3927 trace "... clearing $pkg"; 4050 trace "... clearing $pkg";
3928 clear_package $pkg; 4051 clear_package $pkg;
3929 } 4052 }
3930 4053
3931 trace "unloading all perl modules loaded from $LIBDIR"; 4054 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3932 while (my ($k, $v) = each %INC) { 4055 while (my ($k, $v) = each %INC) {
3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4056 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3934 4057
3935 trace "... unloading $k"; 4058 trace "... unloading $k";
3936 delete $INC{$k}; 4059 delete $INC{$k};
… …
3943 } 4066 }
3944 4067
3945 clear_package $k; 4068 clear_package $k;
3946 } 4069 }
3947 4070
3948 trace "getting rid of safe::, as good as possible"; 4071 trace "perl_reload: getting rid of safe::, as good as possible";
3949 clear_package "safe::$_" 4072 clear_package "safe::$_"
3950 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4073 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3951 4074
3952 trace "unloading cf.pm \"a bit\""; 4075 trace "perl_reload: unloading cf.pm \"a bit\"";
3953 delete $INC{"cf.pm"}; 4076 delete $INC{"cf.pm"};
3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4077 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3955 4078
3956 # don't, removes xs symbols, too, 4079 # don't, removes xs symbols, too,
3957 # and global variables created in xs 4080 # and global variables created in xs
3958 #clear_package __PACKAGE__; 4081 #clear_package __PACKAGE__;
3959 4082
3960 info "unload completed, starting to reload now"; 4083 info "perl_reload: unload completed, starting to reload now";
3961 4084
3962 trace "reloading cf.pm"; 4085 trace "perl_reload: reloading cf.pm";
3963 require cf; 4086 require cf;
3964 cf::_connect_to_perl_1; 4087 cf::_connect_to_perl_1;
3965 4088
3966 trace "loading config and database again"; 4089 trace "perl_reload: loading config and database again";
3967 cf::reload_config; 4090 cf::reload_config;
3968 4091
3969 trace "loading extensions"; 4092 trace "perl_reload: loading extensions";
3970 cf::load_extensions; 4093 cf::load_extensions;
3971 4094
3972 if ($REATTACH_ON_RELOAD) { 4095 if ($REATTACH_ON_RELOAD) {
3973 trace "reattaching attachments to objects/players"; 4096 trace "perl_reload: reattaching attachments to objects/players";
3974 _global_reattach; # objects, sockets 4097 _global_reattach; # objects, sockets
3975 trace "reattaching attachments to maps"; 4098 trace "perl_reload: reattaching attachments to maps";
3976 reattach $_ for values %MAP; 4099 reattach $_ for values %MAP;
3977 trace "reattaching attachments to players"; 4100 trace "perl_reload: reattaching attachments to players";
3978 reattach $_ for values %PLAYER; 4101 reattach $_ for values %PLAYER;
3979 } 4102 }
3980 4103
3981 trace "running post_init jobs"; 4104 cf::_post_init 1;
3982 (pop @POST_INIT)->(1) while @POST_INIT;
3983 4105
3984 trace "leaving sync_job"; 4106 trace "perl_reload: leaving sync_job";
3985 4107
3986 1 4108 1
3987 } or do { 4109 } or do {
3988 error $@; 4110 error $@;
3989 cf::cleanup "error while reloading, exiting."; 4111 cf::cleanup "perl_reload: error, exiting.";
3990 }; 4112 };
3991 4113
3992 info "reloaded";
3993 --$RELOAD; 4114 --$RELOAD;
3994 } 4115 }
3995 4116
3996 $t1 = AE::time - $t1; 4117 $t1 = AE::time - $t1;
3997 info "reload completed in ${t1}s\n"; 4118 info "perl_reload: completed in ${t1}s\n";
3998}; 4119};
3999 4120
4000our $RELOAD_WATCHER; # used only during reload 4121our $RELOAD_WATCHER; # used only during reload
4001 4122
4002sub reload_perl() { 4123sub reload_perl() {
… …
4027 4148
4028############################################################################# 4149#############################################################################
4029 4150
4030my $bug_warning = 0; 4151my $bug_warning = 0;
4031 4152
4032our @WAIT_FOR_TICK;
4033our @WAIT_FOR_TICK_BEGIN;
4034
4035sub wait_for_tick() { 4153sub wait_for_tick() {
4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4154 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4037 4155
4038 my $signal = new Coro::Signal; 4156 $WAIT_FOR_TICK->wait;
4039 push @WAIT_FOR_TICK, $signal;
4040 $signal->wait;
4041} 4157}
4042 4158
4043sub wait_for_tick_begin() { 4159sub wait_for_tick_begin() {
4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4160 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4045 4161
4046 my $signal = new Coro::Signal; 4162 my $signal = new Coro::Signal;
4047 push @WAIT_FOR_TICK_BEGIN, $signal; 4163 push @WAIT_FOR_TICK_BEGIN, $signal;
4048 $signal->wait; 4164 $signal->wait;
4049} 4165}
… …
4053 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4169 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4054 unless ++$bug_warning > 10; 4170 unless ++$bug_warning > 10;
4055 return; 4171 return;
4056 } 4172 }
4057 4173
4058 cf::server_tick; # one server iteration 4174 cf::one_tick; # one server iteration
4059 4175
4060 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4176 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4061 4177
4062 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4178 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4063 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4179 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4069 } 4185 }
4070 4186
4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4187 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4072 $sig->send; 4188 $sig->send;
4073 } 4189 }
4074 while (my $sig = shift @WAIT_FOR_TICK) { 4190 $WAIT_FOR_TICK->broadcast;
4075 $sig->send;
4076 }
4077 4191
4078 $LOAD = ($NOW - $TICK_START) / $TICK; 4192 $LOAD = ($NOW - $TICK_START) / $TICK;
4079 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4193 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4080 4194
4081 if (0) { 4195 if (0) {
… …
4090{ 4204{
4091 # configure BDB 4205 # configure BDB
4092 4206
4093 BDB::min_parallel 16; 4207 BDB::min_parallel 16;
4094 BDB::max_poll_reqs $TICK * 0.1; 4208 BDB::max_poll_reqs $TICK * 0.1;
4095 $AnyEvent::BDB::WATCHER->priority (1); 4209 #$AnyEvent::BDB::WATCHER->priority (1);
4096 4210
4097 unless ($DB_ENV) { 4211 unless ($DB_ENV) {
4098 $DB_ENV = BDB::db_env_create; 4212 $DB_ENV = BDB::db_env_create;
4099 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4213 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4100 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4214 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4135 IO::AIO::min_parallel 8; 4249 IO::AIO::min_parallel 8;
4136 IO::AIO::max_poll_time $TICK * 0.1; 4250 IO::AIO::max_poll_time $TICK * 0.1;
4137 undef $AnyEvent::AIO::WATCHER; 4251 undef $AnyEvent::AIO::WATCHER;
4138} 4252}
4139 4253
4140my $_log_backtrace; 4254our $_log_backtrace;
4255our $_log_backtrace_last;
4141 4256
4142sub _log_backtrace { 4257sub _log_backtrace {
4143 my ($msg, @addr) = @_; 4258 my ($msg, @addr) = @_;
4144 4259
4145 $msg =~ s/\n//; 4260 $msg =~ s/\n$//;
4146 4261
4262 if ($_log_backtrace_last eq $msg) {
4263 LOG llevInfo, "[ABT] $msg\n";
4264 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4147 # limit the # of concurrent backtraces 4265 # limit the # of concurrent backtraces
4148 if ($_log_backtrace < 2) { 4266 } elsif ($_log_backtrace < 2) {
4267 $_log_backtrace_last = $msg;
4149 ++$_log_backtrace; 4268 ++$_log_backtrace;
4150 my $perl_bt = Carp::longmess $msg; 4269 my $perl_bt = Carp::longmess $msg;
4151 async { 4270 async {
4152 $Coro::current->{desc} = "abt $msg"; 4271 $Coro::current->{desc} = "abt $msg";
4153 4272
… …
4173 LOG llevInfo, "[ABT] $_\n" for @bt; 4292 LOG llevInfo, "[ABT] $_\n" for @bt;
4174 --$_log_backtrace; 4293 --$_log_backtrace;
4175 }; 4294 };
4176 } else { 4295 } else {
4177 LOG llevInfo, "[ABT] $msg\n"; 4296 LOG llevInfo, "[ABT] $msg\n";
4178 LOG llevInfo, "[ABT] [suppressed]\n"; 4297 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4179 } 4298 }
4180} 4299}
4181 4300
4182# load additional modules 4301# load additional modules
4183require "cf/$_.pm" for @EXTRA_MODULES; 4302require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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