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.535 by root, Thu Apr 29 08:21:28 2010 UTC vs.
Revision 1.584 by root, Tue Oct 30 17:07:50 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
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
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
… …
124our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 129our $DB_ENV;
128 130
129our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 132
131our %CFG; 133our %CFG;
134our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132 135
133our $UPTIME; $UPTIME ||= time; 136our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 137our $RUNTIME = 0;
138our $SERVER_TICK = 0;
135our $NOW; 139our $NOW;
136 140
137our (%PLAYER, %PLAYER_LOADING); # all users 141our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 142our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 143our $LINK_MAP; # the special {link} map, which is always available
… …
148 152
149our @POST_INIT; 153our @POST_INIT;
150 154
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 155our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 156our $REALLY_UNLOOP; # never set to true, please :)
157
158our $WAIT_FOR_TICK = new Coro::Signal;
159our @WAIT_FOR_TICK_BEGIN;
153 160
154binmode STDOUT; 161binmode STDOUT;
155binmode STDERR; 162binmode STDERR;
156 163
157# read virtual server time, if available 164# read virtual server time, if available
… …
191 198
192=over 4 199=over 4
193 200
194=item $cf::UPTIME 201=item $cf::UPTIME
195 202
196The timestamp of the server start (so not actually an uptime). 203The timestamp of the server start (so not actually an "uptime").
204
205=item $cf::SERVER_TICK
206
207An unsigned integer that starts at zero when the server is started and is
208incremented on every tick.
209
210=item $cf::NOW
211
212The (real) time of the last (current) server tick - updated before and
213after tick processing, so this is useful only as a rough "what time is it
214now" estimate.
215
216=item $cf::TICK
217
218The interval between each server tick, in seconds.
197 219
198=item $cf::RUNTIME 220=item $cf::RUNTIME
199 221
200The time this server has run, starts at 0 and is increased by $cf::TICK on 222The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 223every server tick.
… …
207Various directories - "/etc", read-only install directory, perl-library 229Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 230directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 231unique-items directory, player file directory, random maps directory and
210database environment. 232database environment.
211 233
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 234=item $cf::LOADAVG
221 235
222The current CPU load on the server (alpha-smoothed), as a value between 0 236The 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 237(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 238objects per tick. Healthy values are < 0.5.
… …
233from wherever your confdir points to. 247from wherever your confdir points to.
234 248
235=item cf::wait_for_tick, cf::wait_for_tick_begin 249=item cf::wait_for_tick, cf::wait_for_tick_begin
236 250
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 251These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
238returns directly I<after> the tick processing (and consequently, can only wake one process 252returns 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. 253per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
254
255Note that cf::Wait_for_tick will immediately return when the server is not
256ticking, making it suitable for small pauses in threads that need to run
257when the server is paused. If that is not applicable (i.e. you I<really>
258want to wait, use C<$cf::WAIT_FOR_TICK>).
259
260=item $cf::WAIT_FOR_TICK
261
262Note that C<cf::wait_for_tick> is probably the correct thing to use. This
263variable contains a L<Coro::Signal> that is broadcats after every server
264tick. Calling C<< ->wait >> on it will suspend the caller until after the
265next server tick.
266
267=cut
268
269sub wait_for_tick();
270sub wait_for_tick_begin();
240 271
241=item @cf::INVOKE_RESULTS 272=item @cf::INVOKE_RESULTS
242 273
243This array contains the results of the last C<invoke ()> call. When 274This array contains the results of the last C<invoke ()> call. When
244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 275C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
307} 338}
308 339
309$EV::DIED = sub { 340$EV::DIED = sub {
310 Carp::cluck "error in event callback: @_"; 341 Carp::cluck "error in event callback: @_";
311}; 342};
343
344#############################################################################
345
346sub fork_call(&@);
347sub get_slot($;$$);
312 348
313############################################################################# 349#############################################################################
314 350
315=head2 UTILITY FUNCTIONS 351=head2 UTILITY FUNCTIONS
316 352
… …
337 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 373 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
338 $d 374 $d
339 } || "[unable to dump $_[0]: '$@']"; 375 } || "[unable to dump $_[0]: '$@']";
340} 376}
341 377
378=item $scalar = cf::load_file $path
379
380Loads the given file from path and returns its contents. Croaks on error
381and can block.
382
383=cut
384
385sub load_file($) {
386 0 <= aio_load $_[0], my $data
387 or Carp::croak "$_[0]: $!";
388
389 $data
390}
391
392=item $success = cf::replace_file $path, $data, $sync
393
394Atomically replaces the file at the given $path with new $data, and
395optionally $sync the data to disk before replacing the file.
396
397=cut
398
399sub replace_file($$;$) {
400 my ($path, $data, $sync) = @_;
401
402 my $lock = cf::lock_acquire ("replace_file:$path");
403
404 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
405 or return;
406
407 $data = $data->() if ref $data;
408
409 length $data == aio_write $fh, 0, (length $data), $data, 0
410 or return;
411
412 !$sync
413 or !aio_fsync $fh
414 or return;
415
416 aio_close $fh
417 and return;
418
419 aio_rename "$path~", $path
420 and return;
421
422 if ($sync) {
423 $path =~ s%/[^/]*$%%;
424 aio_pathsync $path;
425 }
426
427 1
428}
429
342=item $ref = cf::decode_json $json 430=item $ref = cf::decode_json $json
343 431
344Converts a JSON string into the corresponding perl data structure. 432Converts a JSON string into the corresponding perl data structure.
345 433
346=item $json = cf::encode_json $ref 434=item $json = cf::encode_json $ref
… …
352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 440our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353 441
354sub encode_json($) { $json_coder->encode ($_[0]) } 442sub encode_json($) { $json_coder->encode ($_[0]) }
355sub decode_json($) { $json_coder->decode ($_[0]) } 443sub decode_json($) { $json_coder->decode ($_[0]) }
356 444
445=item $ref = cf::decode_storable $scalar
446
447Same as Coro::Storable::thaw, so blocks.
448
449=cut
450
451BEGIN { *decode_storable = \&Coro::Storable::thaw }
452
453=item $ref = cf::decode_yaml $scalar
454
455Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
456
457=cut
458
459sub decode_yaml($) {
460 fork_call { YAML::XS::Load $_[0] } @_
461}
462
463=item $scalar = cf::unlzf $scalar
464
465Same as Compress::LZF::compress, but takes server ticks into account, so
466blocks.
467
468=cut
469
470sub unlzf($) {
471 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
472 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
473 Compress::LZF::decompress $_[0]
474}
475
357=item cf::post_init { BLOCK } 476=item cf::post_init { BLOCK }
358 477
359Execute the given codeblock, I<after> all extensions have been (re-)loaded, 478Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again. 479but I<before> the server starts ticking again.
361 480
362The cdoeblock will have a single boolean argument to indicate whether this 481The codeblock will have a single boolean argument to indicate whether this
363is a reload or not. 482is a reload or not.
364 483
365=cut 484=cut
366 485
367sub post_init(&) { 486sub post_init(&) {
368 push @POST_INIT, shift; 487 push @POST_INIT, shift;
488}
489
490sub _post_init {
491 trace "running post_init jobs";
492
493 # run them in parallel...
494
495 my @join;
496
497 while () {
498 push @join, map &Coro::async ($_, 0), @POST_INIT;
499 @POST_INIT = ();
500
501 @join or last;
502
503 (pop @join)->join;
504 }
369} 505}
370 506
371=item cf::lock_wait $string 507=item cf::lock_wait $string
372 508
373Wait until the given lock is available. See cf::lock_acquire. 509Wait until the given lock is available. See cf::lock_acquire.
… …
426 EV::periodic $start, $interval, 0, $cb 562 EV::periodic $start, $interval, 0, $cb
427} 563}
428 564
429=item cf::get_slot $time[, $priority[, $name]] 565=item cf::get_slot $time[, $priority[, $name]]
430 566
431Allocate $time seconds of blocking CPU time at priority C<$priority>: 567Allocate $time seconds of blocking CPU time at priority C<$priority>
432This call blocks and returns only when you have at least C<$time> seconds 568(default: 0): This call blocks and returns only when you have at least
433of cpu time till the next tick. The slot is only valid till the next cede. 569C<$time> seconds of cpu time till the next tick. The slot is only valid
570till the next cede.
571
572Background jobs should use a priority les than zero, interactive jobs
573should use 100 or more.
434 574
435The optional C<$name> can be used to identify the job to run. It might be 575The optional C<$name> can be used to identify the job to run. It might be
436used for statistical purposes and should identify the same time-class. 576used for statistical purposes and should identify the same time-class.
437 577
438Useful for short background jobs. 578Useful for short background jobs.
… …
467 } 607 }
468 } 608 }
469 609
470 if (@SLOT_QUEUE) { 610 if (@SLOT_QUEUE) {
471 # we do not use wait_for_tick() as it returns immediately when tick is inactive 611 # we do not use wait_for_tick() as it returns immediately when tick is inactive
472 push @cf::WAIT_FOR_TICK, $signal; 612 $WAIT_FOR_TICK->wait;
473 $signal->wait;
474 } else { 613 } else {
475 $busy = 0; 614 $busy = 0;
476 Coro::schedule; 615 Coro::schedule;
477 } 616 }
478 } 617 }
… …
578 $EXT_CORO{$coro+0} = $coro; 717 $EXT_CORO{$coro+0} = $coro;
579 718
580 $coro 719 $coro
581} 720}
582 721
583=item fork_call { }, $args 722=item fork_call { }, @args
584 723
585Executes the given code block with the given arguments in a seperate 724Executes the given code block with the given arguments in a seperate
586process, returning the results. Everything must be serialisable with 725process, returning the results. Everything must be serialisable with
587Coro::Storable. May, of course, block. Note that the executed sub may 726Coro::Storable. May, of course, block. Note that the executed sub may
588never block itself or use any form of event handling. 727never block itself or use any form of event handling.
589 728
590=cut 729=cut
591 730
731sub post_fork {
732 reset_signals;
733}
734
592sub fork_call(&@) { 735sub fork_call(&@) {
593 my ($cb, @args) = @_; 736 my ($cb, @args) = @_;
594 737
595 # we seemingly have to make a local copy of the whole thing, 738 # we seemingly have to make a local copy of the whole thing,
596 # otherwise perl prematurely frees the stuff :/ 739 # otherwise perl prematurely frees the stuff :/
597 # TODO: investigate and fix (likely this will be rather laborious) 740 # TODO: investigate and fix (likely this will be rather laborious)
598 741
599 my @res = Coro::Util::fork_eval { 742 my @res = Coro::Util::fork_eval {
600 reset_signals; 743 cf::post_fork;
601 &$cb 744 &$cb
602 }, @args; 745 } @args;
603 746
604 wantarray ? @res : $res[-1] 747 wantarray ? @res : $res[-1]
605} 748}
606 749
607sub objinfo { 750sub objinfo {
… …
729 872
730 my @data; 873 my @data;
731 my $md5; 874 my $md5;
732 875
733 for (0 .. $#$src) { 876 for (0 .. $#$src) {
734 0 <= aio_load $src->[$_], $data[$_] 877 $data[$_] = load_file $src->[$_];
735 or Carp::croak "$src->[$_]: $!";
736 } 878 }
737 879
738 # if processing is expensive, check 880 # if processing is expensive, check
739 # checksum first 881 # checksum first
740 if (1) { 882 if (1) {
… …
1358 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1359 1501
1360 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1361 1503
1362 if (ref $msg) { 1504 if (ref $msg) {
1363 my ($type, $reply, @payload) = 1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1364 "ARRAY" eq ref $msg
1365 ? @$msg
1366 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1367 1506
1368 my @reply; 1507 my @reply;
1369 1508
1370 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1371 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
… …
1393 }; 1532 };
1394 1533
1395 $grp 1534 $grp
1396} 1535}
1397 1536
1537sub _ext_cfg_reg($$$$) {
1538 my ($rvar, $varname, $cfgname, $default) = @_;
1539
1540 $cfgname = lc $varname
1541 unless length $cfgname;
1542
1543 $EXT_CFG{$cfgname} = [$rvar, $default];
1544
1545 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1546}
1547
1398sub load_extensions { 1548sub load_extensions {
1399 info "loading extensions..."; 1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1400 1552
1401 cf::sync_job { 1553 cf::sync_job {
1402 my %todo; 1554 my %todo;
1403 1555
1404 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
… …
1423 1575
1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1576 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1577 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1426 1578
1427 $ext{source} = 1579 $ext{source} =
1428 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1580 "package $pkg; use common::sense;\n"
1429 . "#line 1 \"$path\"\n{\n" 1581 . "#line 1 \"$path\"\n{\n"
1430 . $source 1582 . $source
1431 . "\n};\n1"; 1583 . "\n};\n1";
1432 1584
1433 $todo{$base} = \%ext; 1585 $todo{$base} = \%ext;
… …
1447 unless exists $done{$_}; 1599 unless exists $done{$_};
1448 } 1600 }
1449 1601
1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1451 1603
1604 my $source = $v->{source};
1605
1606 # support "CONF varname :confname = default" pseudo-statements
1607 $source =~ s{
1608 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1609 }{
1610 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1611 }gmxe;
1612
1452 my $active = eval $v->{source}; 1613 my $active = eval $source;
1453 1614
1454 if (length $@) { 1615 if (length $@) {
1455 error "$v->{path}: $@\n"; 1616 error "$v->{path}: $@\n";
1456 1617
1457 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
1474 1635
1475 while (my ($k, $v) = each %todo) { 1636 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1637 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory}; 1638 if exists $v->{meta}{mandatory};
1478 } 1639 }
1640
1641 last;
1479 } 1642 }
1480 } 1643 }
1481 }; 1644 };
1482} 1645}
1483 1646
… …
1641 my $name = $pl->ob->name; 1804 my $name = $pl->ob->name;
1642 1805
1643 $pl->{deny_save} = 1; 1806 $pl->{deny_save} = 1;
1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1807 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1645 1808
1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1809 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1647 $pl->deactivate; 1810 $pl->deactivate;
1811
1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1812 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1649 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1813 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1814 ext::highscore::check ($pl->ob);
1815
1650 $pl->ns->destroy if $pl->ns; 1816 $pl->ns->destroy if $pl->ns;
1651 1817
1652 my $path = playerdir $pl; 1818 my $path = playerdir $pl;
1653 my $temp = "$path~$cf::RUNTIME~deleting~"; 1819 my $temp = "$path~$cf::RUNTIME~deleting~";
1654 aio_rename $path, $temp; 1820 aio_rename $path, $temp;
… …
1820sub generate_random_map { 1986sub generate_random_map {
1821 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1822 1988
1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1989 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1824 1990
1825 # mit "rum" bekleckern, nicht
1826 $self->_create_random_map ( 1991 $self->_create_random_map ($rmp);
1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1830 $rmp->{exit_on_final_map},
1831 $rmp->{xsize}, $rmp->{ysize},
1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1834 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1835 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1836 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1837 (cf::region::find $rmp->{region}), $rmp->{custom}
1838 )
1839} 1992}
1840 1993
1841=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1842 1995
1843Register a handler for the map path matching the given regex at the 1996Register a handler for the map path matching the given regex at the
… …
1848 2001
1849sub register { 2002sub register {
1850 my (undef, $regex, $prio) = @_; 2003 my (undef, $regex, $prio) = @_;
1851 my $pkg = caller; 2004 my $pkg = caller;
1852 2005
1853 no strict;
1854 push @{"$pkg\::ISA"}, __PACKAGE__; 2006 push @{"$pkg\::ISA"}, __PACKAGE__;
1855 2007
1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2008 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1857} 2009}
1858 2010
… …
1870} 2022}
1871 2023
1872sub normalise { 2024sub normalise {
1873 my ($path, $base) = @_; 2025 my ($path, $base) = @_;
1874 2026
1875 $path = "$path"; # make sure its a string 2027 $path = "$path"; # make sure it's a string
1876 2028
1877 $path =~ s/\.map$//; 2029 $path =~ s/\.map$//;
1878 2030
1879 # map plan: 2031 # map plan:
1880 # 2032 #
… …
1895 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1896 $path = "$base/$path"; 2048 $path = "$base/$path";
1897 } 2049 }
1898 2050
1899 for ($path) { 2051 for ($path) {
1900 redo if s{//}{/};
1901 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1902 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
1903 } 2054 }
1904 2055
1905 $path 2056 $path
… …
1919 $self->init; # pass $1 etc. 2070 $self->init; # pass $1 etc.
1920 return $self; 2071 return $self;
1921 } 2072 }
1922 } 2073 }
1923 2074
1924 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1925 () 2076 ()
1926} 2077}
1927 2078
2079# may re-bless or do other evil things
1928sub init { 2080sub init {
1929 my ($self) = @_; 2081 my ($self) = @_;
1930 2082
1931 $self 2083 $self
1932} 2084}
… …
1997 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
1998 2150
1999 1 2151 1
2000} 2152}
2001 2153
2154# used to laod the header of an original map
2002sub load_header_orig { 2155sub load_header_orig {
2003 my ($self) = @_; 2156 my ($self) = @_;
2004 2157
2005 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
2006} 2159}
2007 2160
2161# used to laod the header of an instantiated map
2008sub load_header_temp { 2162sub load_header_temp {
2009 my ($self) = @_; 2163 my ($self) = @_;
2010 2164
2011 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
2012} 2166}
2013 2167
2168# called after loading the header from an instantiated map
2014sub prepare_temp { 2169sub prepare_temp {
2015 my ($self) = @_; 2170 my ($self) = @_;
2016 2171
2017 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
2018 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
2019 # safety 2174 # safety
2020 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
2021 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
2022} 2177}
2023 2178
2179# called after loading the header from an original map
2024sub prepare_orig { 2180sub prepare_orig {
2025 my ($self) = @_; 2181 my ($self) = @_;
2026 2182
2027 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
2028 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
… …
2052 2208
2053sub find; 2209sub find;
2054sub find { 2210sub find {
2055 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
2056 2212
2213 cf::cede_to_tick;
2214
2057 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
2058 2216
2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2060 my $guard2 = cf::lock_acquire "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
2061 2219
2062 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
… …
2093 2251
2094 { 2252 {
2095 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2096 2254
2097 return unless $self->valid; 2255 return unless $self->valid;
2098 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2099
2100 $self->in_memory (cf::MAP_LOADING);
2101 2257
2102 $self->alloc; 2258 $self->alloc;
2103 2259
2104 $self->pre_load; 2260 $self->pre_load;
2105 cf::cede_to_tick; 2261 cf::cede_to_tick;
2106 2262
2263 if (exists $self->{load_path}) {
2107 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2108 $f->skip_block; 2265 $f->skip_block;
2109 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2110 or return; 2267 or return;
2111 2268
2112 $self->post_load_original 2269 $self->post_load_original
2113 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2114 2271
2115 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2116 utf8::encode $uniq; 2273 utf8::encode $uniq;
2117 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2118 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2119 $self->clear_unique_items; 2276 $self->clear_unique_items;
2120 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2121 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2122 } 2280 }
2123 } 2281 }
2124 }
2125 2282
2126 $f->resolve_delayed_derefs; 2283 $f->resolve_delayed_derefs;
2284 } else {
2285 $self->post_load_original
2286 if delete $self->{load_original};
2287 }
2288
2289 $self->state (cf::MAP_INACTIVE);
2127 2290
2128 cf::cede_to_tick; 2291 cf::cede_to_tick;
2129 # now do the right thing for maps 2292 # now do the right thing for maps
2130 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2131 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
… …
2135 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2136 $self->decay_objects; 2299 $self->decay_objects;
2137 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2138 $self->update_buttons; 2301 $self->update_buttons;
2139 cf::cede_to_tick; 2302 cf::cede_to_tick;
2140 $self->activate; 2303 #$self->activate; # no longer activate maps automatically
2141 } 2304 }
2142 2305
2143 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2144 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2145
2146 $self->in_memory (cf::MAP_ACTIVE);
2147 } 2308 }
2148 2309
2149 $self->post_load; 2310 $self->post_load;
2311
2312 1
2150} 2313}
2151 2314
2152# customize the map for a given player, i.e. 2315# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player 2316# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath 2317# maps to change the path to ~playername/mappath
… …
2162# if $self->per_party; 2325# if $self->per_party;
2163 2326
2164 $self 2327 $self
2165} 2328}
2166 2329
2167# find and load all maps in the 3x3 area around a map
2168sub load_neighbours {
2169 my ($map) = @_;
2170
2171 my @neigh; # diagonal neighbours
2172
2173 for (0 .. 3) {
2174 my $neigh = $map->tile_path ($_)
2175 or next;
2176 $neigh = find $neigh, $map
2177 or next;
2178 $neigh->load;
2179
2180 # now find the diagonal neighbours
2181 push @neigh,
2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2184 }
2185
2186 for (grep defined $_->[0], @neigh) {
2187 my ($path, $origin) = @$_;
2188 my $neigh = find $path, $origin
2189 or next;
2190 $neigh->load;
2191 }
2192}
2193
2194sub find_sync { 2330sub find_sync {
2195 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2196 2332
2333 # it's a bug to call this from the main context
2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2334 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main; 2335 if $Coro::current == $Coro::main;
2199 2336
2200 find $path, $origin 2337 find $path, $origin
2201} 2338}
2202 2339
2203sub do_load_sync { 2340sub do_load_sync {
2204 my ($map) = @_; 2341 my ($map) = @_;
2205 2342
2343 # it's a bug to call this from the main context
2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2207 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2208 2346
2209 $map->load; 2347 $map->load;
2210} 2348}
… …
2213our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2214 2352
2215sub find_async { 2353sub find_async {
2216 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2217 2355
2218 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2219 2357
2220 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2221 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2222 } 2360 }
2223 2361
2224 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2225 2363
2226 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
… …
2285sub swap_out { 2423sub swap_out {
2286 my ($self) = @_; 2424 my ($self) = @_;
2287 2425
2288 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2289 2427
2290 return if $self->in_memory != cf::MAP_ACTIVE; 2428 return if !$self->linkable;
2291 return if $self->{deny_save}; 2429 return if $self->{deny_save};
2292 return if $self->players; 2430 return if $self->players;
2293 2431
2294 # first deactivate the map and "unlink" it from the core 2432 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate; 2433 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP; 2434 $_->clear_links_to ($self) for values %cf::MAP;
2297 $self->in_memory (cf::MAP_SWAPPED); 2435 $self->state (cf::MAP_SWAPPED);
2298 2436
2299 # then atomically save 2437 # then atomically save
2300 $self->_save; 2438 $self->_save;
2301 2439
2302 # then free the map 2440 # then free the map
… …
2328 2466
2329 return if $self->players; 2467 return if $self->players;
2330 2468
2331 cf::trace "resetting map ", $self->path, "\n"; 2469 cf::trace "resetting map ", $self->path, "\n";
2332 2470
2333 $self->in_memory (cf::MAP_SWAPPED); 2471 $self->state (cf::MAP_SWAPPED);
2334 2472
2335 # need to save uniques path 2473 # need to save uniques path
2336 unless ($self->{deny_save}) { 2474 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq; 2475 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338 2476
… …
2668 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2669 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2670 if $x <= 0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2671 2809
2672 $map->load; 2810 $map->load;
2673 $map->load_neighbours;
2674 2811
2675 return unless $self->contr->active; 2812 return unless $self->contr->active;
2676 2813
2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2678 if ($self->enter_map ($map, $x, $y)) { 2815 if ($self->enter_map ($map, $x, $y)) {
… …
2734 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2735 } 2872 }
2736 } 2873 }
2737 2874
2738 my $map = eval { 2875 my $map = eval {
2739 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2740 2877
2741 if ($map) { 2878 if ($map) {
2742 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2743 $map = $check->($map, $x, $y, $self) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2744 } else { 2881 } else {
… …
2834 $Coro::current->{desc} = "enter_exit"; 2971 $Coro::current->{desc} = "enter_exit";
2835 2972
2836 unless (eval { 2973 unless (eval {
2837 $self->deactivate_recursive; # just to be sure 2974 $self->deactivate_recursive; # just to be sure
2838 2975
2839 # random map handling
2840 {
2841 my $guard = cf::lock_acquire "exit_prepare:$exit";
2842
2843 prepare_random_map $exit
2844 if $exit->slaying eq "/!";
2845 }
2846
2847 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2848 my $x = $exit->stats->hp; 2977 my $x = $exit->stats->hp;
2849 my $y = $exit->stats->sp; 2978 my $y = $exit->stats->sp;
2979
2980 # special map handling
2981 my $slaying = $exit->slaying;
2982
2983 # special map handling
2984 if ($slaying eq "/!") {
2985 my $guard = cf::lock_acquire "exit_prepare:$exit";
2986
2987 prepare_random_map $exit
2988 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2989
2990 $map = $exit->slaying;
2991
2992 } elsif ($slaying eq '!up') {
2993 $map = $exit->map->tile_path (cf::TILE_UP);
2994 $x = $exit->x;
2995 $y = $exit->y;
2996
2997 } elsif ($slaying eq '!down') {
2998 $map = $exit->map->tile_path (cf::TILE_DOWN);
2999 $x = $exit->x;
3000 $y = $exit->y;
3001 }
2850 3002
2851 $self->goto ($map, $x, $y); 3003 $self->goto ($map, $x, $y);
2852 3004
2853 # if exit is damned, update players death & WoR home-position 3005 # if exit is damned, update players death & WoR home-position
2854 $self->contr->savebed ($map, $x, $y) 3006 $self->contr->savebed ($map, $x, $y)
… …
3096=cut 3248=cut
3097 3249
3098sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
3099 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
3100 3252
3101 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3255 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3103 } elsif ($self->extcmd == 1) {
3104 #TODO: version 1, remove
3105 unshift @msg, msgtype => "reply", msgid => $id;
3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3107 }
3108} 3256}
3109 3257
3110=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
3111 3259
3112Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
… …
3167 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
3168 3316
3169 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3170 3318
3171 if (ref $msg) { 3319 if (ref $msg) {
3172 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3173 "ARRAY" eq ref $msg
3174 ? @$msg
3175 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3176 3321
3177 my @reply; 3322 my @reply;
3178 3323
3179 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3180 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
… …
3273 decrease split destroy change_exp value msg lore send_msg)], 3418 decrease split destroy change_exp value msg lore send_msg)],
3274 ["cf::object::player" => qw(player)], 3419 ["cf::object::player" => qw(player)],
3275 ["cf::player" => qw(peaceful send_msg)], 3420 ["cf::player" => qw(peaceful send_msg)],
3276 ["cf::map" => qw(trigger)], 3421 ["cf::map" => qw(trigger)],
3277) { 3422) {
3278 no strict 'refs';
3279 my ($pkg, @funs) = @$_; 3423 my ($pkg, @funs) = @$_;
3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3424 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3281 for @funs; 3425 for @funs;
3282} 3426}
3283 3427
… …
3359=cut 3503=cut
3360 3504
3361############################################################################# 3505#############################################################################
3362# the server's init and main functions 3506# the server's init and main functions
3363 3507
3508our %FACEHASH; # hash => idx, #d# HACK for http server
3509
3364sub load_facedata($) { 3510sub load_facedata($) {
3365 my ($path) = @_; 3511 my ($path) = @_;
3366 3512
3367 # HACK to clear player env face cache, we need some signal framework 3513 # HACK to clear player env face cache, we need some signal framework
3368 # for this (global event?) 3514 # for this (global event?)
… …
3370 3516
3371 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3517 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3372 3518
3373 trace "loading facedata from $path\n"; 3519 trace "loading facedata from $path\n";
3374 3520
3375 my $facedata; 3521 my $facedata = decode_storable load_file $path;
3376 0 < aio_load $path, $facedata
3377 or die "$path: $!";
3378
3379 $facedata = Coro::Storable::thaw $facedata;
3380 3522
3381 $facedata->{version} == 2 3523 $facedata->{version} == 2
3382 or cf::cleanup "$path: version mismatch, cannot proceed."; 3524 or cf::cleanup "$path: version mismatch, cannot proceed.";
3383 3525
3384 # patch in the exptable 3526 # patch in the exptable
… …
3398 3540
3399 cf::face::set_visibility $idx, $info->{visibility}; 3541 cf::face::set_visibility $idx, $info->{visibility};
3400 cf::face::set_magicmap $idx, $info->{magicmap}; 3542 cf::face::set_magicmap $idx, $info->{magicmap};
3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3543 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3544 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3545 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3546 $FACEHASH{$info->{hash64}} = $idx;#d#
3403 3547
3404 cf::cede_to_tick; 3548 cf::cede_to_tick;
3405 } 3549 }
3406 3550
3407 while (my ($face, $info) = each %$faces) { 3551 while (my ($face, $info) = each %$faces) {
… …
3434 3578
3435 { 3579 {
3436 my $res = $facedata->{resource}; 3580 my $res = $facedata->{resource};
3437 3581
3438 while (my ($name, $info) = each %$res) { 3582 while (my ($name, $info) = each %$res) {
3439 if (defined $info->{type}) { 3583 if (defined (my $type = $info->{type})) {
3584 # TODO: different hash - must free and use new index, or cache ixface data queue
3440 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3585 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3441 3586
3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3587 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3443 cf::face::set_type $idx, $info->{type}; 3588 cf::face::set_type $idx, $type;
3589 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3590 $FACEHASH{$info->{hash}} = $idx;#d#
3444 } else { 3591 } else {
3445 $RESOURCE{$name} = $info; # unused 3592# $RESOURCE{$name} = $info; # unused
3446 } 3593 }
3447 3594
3448 cf::cede_to_tick; 3595 cf::cede_to_tick;
3449 } 3596 }
3450 } 3597 }
… …
3502} 3649}
3503 3650
3504sub reload_sound { 3651sub reload_sound {
3505 trace "loading sound config from $DATADIR/sound\n"; 3652 trace "loading sound config from $DATADIR/sound\n";
3506 3653
3507 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3508 or die "$DATADIR/sound $!";
3509
3510 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3654 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3511 3655
3512 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3656 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513 my $sound = $soundconf->{compat}[$_] 3657 my $sound = $soundconf->{compat}[$_]
3514 or next; 3658 or next;
3515 3659
… …
3525} 3669}
3526 3670
3527sub reload_resources { 3671sub reload_resources {
3528 trace "reloading resource files...\n"; 3672 trace "reloading resource files...\n";
3529 3673
3674 reload_exp_table;
3675 reload_materials;
3530 reload_facedata; 3676 reload_facedata;
3531 reload_sound; 3677 reload_sound;
3532 reload_archetypes; 3678 reload_archetypes;
3533 reload_regions; 3679 reload_regions;
3534 reload_treasures; 3680 reload_treasures;
… …
3537} 3683}
3538 3684
3539sub reload_config { 3685sub reload_config {
3540 trace "reloading config file...\n"; 3686 trace "reloading config file...\n";
3541 3687
3542 open my $fh, "<:utf8", "$CONFDIR/config" 3688 my $config = load_file "$CONFDIR/config";
3543 or return; 3689 utf8::decode $config;
3544 3690 *CFG = decode_yaml $config;
3545 local $/;
3546 *CFG = YAML::XS::Load scalar <$fh>;
3547 3691
3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3692 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3549 3693
3550 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3694 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3551 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3695 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3555 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3699 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3556 and die "WARNING: m(un)lockall failed: $!\n"; 3700 and die "WARNING: m(un)lockall failed: $!\n";
3557 }; 3701 };
3558 warn $@ if $@; 3702 warn $@ if $@;
3559 } 3703 }
3560
3561 trace "finished reloading resource files\n";
3562} 3704}
3563 3705
3564sub pidfile() { 3706sub pidfile() {
3565 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3707 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3566 or die "$PIDFILE: $!"; 3708 or die "$PIDFILE: $!";
… …
3591 3733
3592sub main { 3734sub main {
3593 cf::init_globals; # initialise logging 3735 cf::init_globals; # initialise logging
3594 3736
3595 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3737 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3596 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3738 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3597 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3739 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3598 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3740 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3599 3741
3600 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3742 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3601 3743
… …
3609 }; 3751 };
3610 3752
3611 evthread_start IO::AIO::poll_fileno; 3753 evthread_start IO::AIO::poll_fileno;
3612 3754
3613 cf::sync_job { 3755 cf::sync_job {
3614 cf::init_experience; 3756 cf::incloader::init ();
3757
3615 cf::init_anim; 3758 cf::init_anim;
3616 cf::init_attackmess; 3759 cf::init_attackmess;
3617 cf::init_dynamic; 3760 cf::init_dynamic;
3618 3761
3619 cf::load_settings; 3762 cf::load_settings;
3620 cf::load_materials;
3621 3763
3622 reload_resources; 3764 reload_resources;
3623 reload_config; 3765 reload_config;
3624 db_init; 3766 db_init;
3625 3767
… …
3637 3779
3638 # no (long-running) fork's whatsoever before this point(!) 3780 # no (long-running) fork's whatsoever before this point(!)
3639 use POSIX (); 3781 use POSIX ();
3640 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3782 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3641 3783
3642 (pop @POST_INIT)->(0) while @POST_INIT; 3784 cf::_post_init 0;
3643 }; 3785 };
3644 3786
3645 cf::object::thawer::errors_are_fatal 0; 3787 cf::object::thawer::errors_are_fatal 0;
3646 info "parse errors in files are no longer fatal from this point on.\n"; 3788 info "parse errors in files are no longer fatal from this point on.\n";
3647 3789
3790 AE::postpone {
3791 undef &main; # free gobs of memory :)
3792 };
3793
3648 main_loop; 3794 goto &main_loop;
3649} 3795}
3650 3796
3651############################################################################# 3797#############################################################################
3652# initialisation and cleanup 3798# initialisation and cleanup
3653 3799
… …
3797 cf::write_runtime_sync; # external watchdog should not bark 3943 cf::write_runtime_sync; # external watchdog should not bark
3798 3944
3799 trace "emergency_perl_save: syncing database to disk"; 3945 trace "emergency_perl_save: syncing database to disk";
3800 BDB::db_env_txn_checkpoint $DB_ENV; 3946 BDB::db_env_txn_checkpoint $DB_ENV;
3801 3947
3802 info "emergency_perl_save: starting sync()\n"; 3948 info "emergency_perl_save: starting sync\n";
3803 IO::AIO::aio_sync sub { 3949 IO::AIO::aio_sync sub {
3804 info "emergency_perl_save: finished sync()\n"; 3950 info "emergency_perl_save: finished sync\n";
3805 }; 3951 };
3806 3952
3807 cf::write_runtime_sync; # external watchdog should not bark 3953 cf::write_runtime_sync; # external watchdog should not bark
3808 3954
3809 trace "emergency_perl_save: flushing outstanding aio requests"; 3955 trace "emergency_perl_save: flushing outstanding aio requests";
3810 while (IO::AIO::nreqs || BDB::nreqs) { 3956 while (IO::AIO::nreqs || BDB::nreqs) {
3811 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3957 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3812 } 3958 }
3813 3959
3814 cf::write_runtime_sync; # external watchdog should not bark 3960 cf::write_runtime_sync; # external watchdog should not bark
3815 }; 3961 };
3816 3962
3817 info "emergency_perl_save: leave\n"; 3963 info "emergency_perl_save: leave\n";
3818} 3964}
3819 3965
3820sub post_cleanup { 3966sub post_cleanup {
3821 my ($make_core) = @_; 3967 my ($make_core) = @_;
3822
3823 IO::AIO::flush;
3824 3968
3825 IO::AIO::flush; 3969 IO::AIO::flush;
3826 3970
3827 error Carp::longmess "post_cleanup backtrace" 3971 error Carp::longmess "post_cleanup backtrace"
3828 if $make_core; 3972 if $make_core;
… …
3856 } 4000 }
3857} 4001}
3858 4002
3859sub do_reload_perl() { 4003sub do_reload_perl() {
3860 # can/must only be called in main 4004 # can/must only be called in main
3861 if (in_main) { 4005 unless (in_main) {
3862 error "can only reload from main coroutine"; 4006 error "can only reload from main coroutine";
3863 return; 4007 return;
3864 } 4008 }
3865 4009
3866 return if $RELOAD++; 4010 return if $RELOAD++;
3867 4011
3868 my $t1 = AE::time; 4012 my $t1 = AE::time;
3869 4013
3870 while ($RELOAD) { 4014 while ($RELOAD) {
4015 cf::get_slot 0.1, -1, "reload_perl";
3871 info "reloading..."; 4016 info "perl_reload: reloading...";
3872 4017
3873 trace "entering sync_job"; 4018 trace "perl_reload: entering sync_job";
3874 4019
3875 cf::sync_job { 4020 cf::sync_job {
3876 cf::emergency_save; 4021 #cf::emergency_save;
3877 4022
3878 trace "cancelling all extension coros"; 4023 trace "perl_reload: cancelling all extension coros";
3879 $_->cancel for values %EXT_CORO; 4024 $_->cancel for values %EXT_CORO;
3880 %EXT_CORO = (); 4025 %EXT_CORO = ();
3881 4026
3882 trace "removing commands"; 4027 trace "perl_reload: removing commands";
3883 %COMMAND = (); 4028 %COMMAND = ();
3884 4029
3885 trace "removing ext/exti commands"; 4030 trace "perl_reload: removing ext/exti commands";
3886 %EXTCMD = (); 4031 %EXTCMD = ();
3887 %EXTICMD = (); 4032 %EXTICMD = ();
3888 4033
3889 trace "unloading/nuking all extensions"; 4034 trace "perl_reload: unloading/nuking all extensions";
3890 for my $pkg (@EXTS) { 4035 for my $pkg (@EXTS) {
3891 trace "... unloading $pkg"; 4036 trace "... unloading $pkg";
3892 4037
3893 if (my $cb = $pkg->can ("unload")) { 4038 if (my $cb = $pkg->can ("unload")) {
3894 eval { 4039 eval {
… …
3899 4044
3900 trace "... clearing $pkg"; 4045 trace "... clearing $pkg";
3901 clear_package $pkg; 4046 clear_package $pkg;
3902 } 4047 }
3903 4048
3904 trace "unloading all perl modules loaded from $LIBDIR"; 4049 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3905 while (my ($k, $v) = each %INC) { 4050 while (my ($k, $v) = each %INC) {
3906 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4051 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3907 4052
3908 trace "... unloading $k"; 4053 trace "... unloading $k";
3909 delete $INC{$k}; 4054 delete $INC{$k};
… …
3916 } 4061 }
3917 4062
3918 clear_package $k; 4063 clear_package $k;
3919 } 4064 }
3920 4065
3921 trace "getting rid of safe::, as good as possible"; 4066 trace "perl_reload: getting rid of safe::, as good as possible";
3922 clear_package "safe::$_" 4067 clear_package "safe::$_"
3923 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4068 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3924 4069
3925 trace "unloading cf.pm \"a bit\""; 4070 trace "perl_reload: unloading cf.pm \"a bit\"";
3926 delete $INC{"cf.pm"}; 4071 delete $INC{"cf.pm"};
3927 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4072 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3928 4073
3929 # don't, removes xs symbols, too, 4074 # don't, removes xs symbols, too,
3930 # and global variables created in xs 4075 # and global variables created in xs
3931 #clear_package __PACKAGE__; 4076 #clear_package __PACKAGE__;
3932 4077
3933 info "unload completed, starting to reload now"; 4078 info "perl_reload: unload completed, starting to reload now";
3934 4079
3935 trace "reloading cf.pm"; 4080 trace "perl_reload: reloading cf.pm";
3936 require cf; 4081 require cf;
3937 cf::_connect_to_perl_1; 4082 cf::_connect_to_perl_1;
3938 4083
3939 trace "loading config and database again"; 4084 trace "perl_reload: loading config and database again";
3940 cf::reload_config; 4085 cf::reload_config;
3941 4086
3942 trace "loading extensions"; 4087 trace "perl_reload: loading extensions";
3943 cf::load_extensions; 4088 cf::load_extensions;
3944 4089
3945 if ($REATTACH_ON_RELOAD) { 4090 if ($REATTACH_ON_RELOAD) {
3946 trace "reattaching attachments to objects/players"; 4091 trace "perl_reload: reattaching attachments to objects/players";
3947 _global_reattach; # objects, sockets 4092 _global_reattach; # objects, sockets
3948 trace "reattaching attachments to maps"; 4093 trace "perl_reload: reattaching attachments to maps";
3949 reattach $_ for values %MAP; 4094 reattach $_ for values %MAP;
3950 trace "reattaching attachments to players"; 4095 trace "perl_reload: reattaching attachments to players";
3951 reattach $_ for values %PLAYER; 4096 reattach $_ for values %PLAYER;
3952 } 4097 }
3953 4098
3954 trace "running post_init jobs"; 4099 cf::_post_init 1;
3955 (pop @POST_INIT)->(1) while @POST_INIT;
3956 4100
3957 trace "leaving sync_job"; 4101 trace "perl_reload: leaving sync_job";
3958 4102
3959 1 4103 1
3960 } or do { 4104 } or do {
3961 error $@; 4105 error $@;
3962 cf::cleanup "error while reloading, exiting."; 4106 cf::cleanup "perl_reload: error, exiting.";
3963 }; 4107 };
3964 4108
3965 info "reloaded";
3966 --$RELOAD; 4109 --$RELOAD;
3967 } 4110 }
3968 4111
3969 $t1 = AE::time - $t1; 4112 $t1 = AE::time - $t1;
3970 info "reload completed in ${t1}s\n"; 4113 info "perl_reload: completed in ${t1}s\n";
3971}; 4114};
3972 4115
3973our $RELOAD_WATCHER; # used only during reload 4116our $RELOAD_WATCHER; # used only during reload
3974 4117
3975sub reload_perl() { 4118sub reload_perl() {
… …
3996 reload_perl; 4139 reload_perl;
3997 }; 4140 };
3998 } 4141 }
3999}; 4142};
4000 4143
4001unshift @INC, $LIBDIR; 4144#############################################################################
4002 4145
4003my $bug_warning = 0; 4146my $bug_warning = 0;
4004 4147
4005our @WAIT_FOR_TICK;
4006our @WAIT_FOR_TICK_BEGIN;
4007
4008sub wait_for_tick { 4148sub wait_for_tick() {
4009 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4149 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4010 4150
4011 my $signal = new Coro::Signal; 4151 $WAIT_FOR_TICK->wait;
4012 push @WAIT_FOR_TICK, $signal;
4013 $signal->wait;
4014} 4152}
4015 4153
4016sub wait_for_tick_begin { 4154sub wait_for_tick_begin() {
4017 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4155 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4018 4156
4019 my $signal = new Coro::Signal; 4157 my $signal = new Coro::Signal;
4020 push @WAIT_FOR_TICK_BEGIN, $signal; 4158 push @WAIT_FOR_TICK_BEGIN, $signal;
4021 $signal->wait; 4159 $signal->wait;
4022} 4160}
… …
4026 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4164 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4027 unless ++$bug_warning > 10; 4165 unless ++$bug_warning > 10;
4028 return; 4166 return;
4029 } 4167 }
4030 4168
4031 cf::server_tick; # one server iteration 4169 cf::one_tick; # one server iteration
4032 4170
4033 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4171 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4034 4172
4035 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4173 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4036 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4174 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4042 } 4180 }
4043 4181
4044 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4182 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4045 $sig->send; 4183 $sig->send;
4046 } 4184 }
4047 while (my $sig = shift @WAIT_FOR_TICK) { 4185 $WAIT_FOR_TICK->broadcast;
4048 $sig->send;
4049 }
4050 4186
4051 $LOAD = ($NOW - $TICK_START) / $TICK; 4187 $LOAD = ($NOW - $TICK_START) / $TICK;
4052 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4188 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4053 4189
4054 if (0) { 4190 if (0) {
… …
4063{ 4199{
4064 # configure BDB 4200 # configure BDB
4065 4201
4066 BDB::min_parallel 16; 4202 BDB::min_parallel 16;
4067 BDB::max_poll_reqs $TICK * 0.1; 4203 BDB::max_poll_reqs $TICK * 0.1;
4068 $AnyEvent::BDB::WATCHER->priority (1); 4204 #$AnyEvent::BDB::WATCHER->priority (1);
4069 4205
4070 unless ($DB_ENV) { 4206 unless ($DB_ENV) {
4071 $DB_ENV = BDB::db_env_create; 4207 $DB_ENV = BDB::db_env_create;
4072 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4208 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4073 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4209 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4108 IO::AIO::min_parallel 8; 4244 IO::AIO::min_parallel 8;
4109 IO::AIO::max_poll_time $TICK * 0.1; 4245 IO::AIO::max_poll_time $TICK * 0.1;
4110 undef $AnyEvent::AIO::WATCHER; 4246 undef $AnyEvent::AIO::WATCHER;
4111} 4247}
4112 4248
4113my $_log_backtrace; 4249our $_log_backtrace;
4250our $_log_backtrace_last;
4114 4251
4115sub _log_backtrace { 4252sub _log_backtrace {
4116 my ($msg, @addr) = @_; 4253 my ($msg, @addr) = @_;
4117 4254
4118 $msg =~ s/\n//; 4255 $msg =~ s/\n$//;
4119 4256
4257 if ($_log_backtrace_last eq $msg) {
4258 LOG llevInfo, "[ABT] $msg\n";
4259 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4120 # limit the # of concurrent backtraces 4260 # limit the # of concurrent backtraces
4121 if ($_log_backtrace < 2) { 4261 } elsif ($_log_backtrace < 2) {
4262 $_log_backtrace_last = $msg;
4122 ++$_log_backtrace; 4263 ++$_log_backtrace;
4123 my $perl_bt = Carp::longmess $msg; 4264 my $perl_bt = Carp::longmess $msg;
4124 async { 4265 async {
4125 $Coro::current->{desc} = "abt $msg"; 4266 $Coro::current->{desc} = "abt $msg";
4126 4267
… …
4146 LOG llevInfo, "[ABT] $_\n" for @bt; 4287 LOG llevInfo, "[ABT] $_\n" for @bt;
4147 --$_log_backtrace; 4288 --$_log_backtrace;
4148 }; 4289 };
4149 } else { 4290 } else {
4150 LOG llevInfo, "[ABT] $msg\n"; 4291 LOG llevInfo, "[ABT] $msg\n";
4151 LOG llevInfo, "[ABT] [suppressed]\n"; 4292 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4152 } 4293 }
4153} 4294}
4154 4295
4155# load additional modules 4296# load additional modules
4156require "cf/$_.pm" for @EXTRA_MODULES; 4297require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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