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.539 by root, Tue May 4 22:49:21 2010 UTC vs.
Revision 1.588 by root, Thu Nov 1 13:02:52 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 ();
… …
76# strictly for debugging 80# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78 82
79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80 84
85our @ORIG_INC;
86
81our %COMMAND = (); 87our %COMMAND = ();
82our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
83 89
84our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
85our %EXTCMD = (); 91our %EXTCMD = ();
… …
91our @EVENT; 97our @EVENT;
92our @REFLECT; # set by XS 98our @REFLECT; # set by XS
93our %REFLECT; # set by us 99our %REFLECT; # set by us
94 100
95our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
96our $DATADIR = datadir; 103our $DATADIR = datadir;
97our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
98our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
99our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
100our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
101our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
102our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
103our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
104our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
105our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
106our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
107our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
108 116
109our %RESOURCE; # unused 117#our %RESOURCE; # unused
110 118
111our $OUTPUT_RATE_MIN = 3000; 119our $OUTPUT_RATE_MIN = 3000;
112our $OUTPUT_RATE_MAX = 1000000; 120our $OUTPUT_RATE_MAX = 1000000;
113 121
114our $MAX_LINKS = 32; # how many chained exits to follow 122our $MAX_LINKS = 32; # how many chained exits to follow
… …
122our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
123our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
124our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
125our $DB_ENV; 133our $DB_ENV;
126 134
127our @EXTRA_MODULES = qw(pod match mapscript); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
128 136
129our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
130 139
131our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
132our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
133our $NOW; 143our $NOW;
134 144
135our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
136our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
137our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
… …
146 156
147our @POST_INIT; 157our @POST_INIT;
148 158
149our $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)
150our $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;
151 164
152binmode STDOUT; 165binmode STDOUT;
153binmode STDERR; 166binmode STDERR;
154 167
155# read virtual server time, if available 168# read virtual server time, if available
… …
189 202
190=over 4 203=over 4
191 204
192=item $cf::UPTIME 205=item $cf::UPTIME
193 206
194The 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.
195 223
196=item $cf::RUNTIME 224=item $cf::RUNTIME
197 225
198The 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
199every server tick. 227every server tick.
… …
205Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
206directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
207unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
208database environment. 236database environment.
209 237
210=item $cf::NOW
211
212The time of the last (current) server tick.
213
214=item $cf::TICK
215
216The interval between server ticks, in seconds.
217
218=item $cf::LOADAVG 238=item $cf::LOADAVG
219 239
220The 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
221(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
222objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
… …
231from wherever your confdir points to. 251from wherever your confdir points to.
232 252
233=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
234 254
235These 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
236returns directly I<after> the tick processing (and consequently, can only wake one process 256returns directly I<after> the tick processing (and consequently, can only wake one thread
237per 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.
270
271=cut
272
273sub wait_for_tick();
274sub wait_for_tick_begin();
238 275
239=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
240 277
241This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
242C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 279C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
303)) { 340)) {
304 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
305} 342}
306 343
307$EV::DIED = sub { 344$EV::DIED = sub {
308 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
309}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
310 352
311############################################################################# 353#############################################################################
312 354
313=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
314 356
… …
335 $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;
336 $d 378 $d
337 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
338} 380}
339 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
340=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
341 435
342Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
343 437
344=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
… …
350our $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
351 445
352sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
353sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
354 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
457=item $ref = cf::decode_yaml $scalar
458
459Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
460
461=cut
462
463sub decode_yaml($) {
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]
478}
479
355=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
356 481
357Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
358but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
359 484
360The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
361is a reload or not. 486is a reload or not.
362 487
363=cut 488=cut
364 489
365sub post_init(&) { 490sub post_init(&) {
366 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 }
367} 509}
368 510
369=item cf::lock_wait $string 511=item cf::lock_wait $string
370 512
371Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
… …
424 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
425} 567}
426 568
427=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
428 570
429Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
430This 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
431of 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.
432 578
433The 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
434used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
435 581
436Useful for short background jobs. 582Useful for short background jobs.
… …
465 } 611 }
466 } 612 }
467 613
468 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
469 # 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
470 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
471 $signal->wait;
472 } else { 617 } else {
473 $busy = 0; 618 $busy = 0;
474 Coro::schedule; 619 Coro::schedule;
475 } 620 }
476 } 621 }
… …
576 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
577 722
578 $coro 723 $coro
579} 724}
580 725
581=item fork_call { }, $args 726=item fork_call { }, @args
582 727
583Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
584process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
585Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
586never block itself or use any form of event handling. 731never block itself or use any form of event handling.
587 732
588=cut 733=cut
589 734
735sub post_fork {
736 reset_signals;
737}
738
590sub fork_call(&@) { 739sub fork_call(&@) {
591 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
592 741
593 # we seemingly have to make a local copy of the whole thing, 742 # we seemingly have to make a local copy of the whole thing,
594 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
595 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
596 745
597 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
598 reset_signals; 747 cf::post_fork;
599 &$cb 748 &$cb
600 }, @args; 749 } @args;
601 750
602 wantarray ? @res : $res[-1] 751 wantarray ? @res : $res[-1]
603} 752}
604 753
605sub objinfo { 754sub objinfo {
… …
727 876
728 my @data; 877 my @data;
729 my $md5; 878 my $md5;
730 879
731 for (0 .. $#$src) { 880 for (0 .. $#$src) {
732 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
733 or Carp::croak "$src->[$_]: $!";
734 } 882 }
735 883
736 # if processing is expensive, check 884 # if processing is expensive, check
737 # checksum first 885 # checksum first
738 if (1) { 886 if (1) {
… …
1356 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1357 1505
1358 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1359 1507
1360 if (ref $msg) { 1508 if (ref $msg) {
1361 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1362 "ARRAY" eq ref $msg
1363 ? @$msg
1364 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1365 1510
1366 my @reply; 1511 my @reply;
1367 1512
1368 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1369 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
… …
1391 }; 1536 };
1392 1537
1393 $grp 1538 $grp
1394} 1539}
1395 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
1396sub load_extensions { 1552sub load_extensions {
1397 info "loading extensions..."; 1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1398 1556
1399 cf::sync_job { 1557 cf::sync_job {
1400 my %todo; 1558 my %todo;
1401 1559
1402 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
… …
1445 unless exists $done{$_}; 1603 unless exists $done{$_};
1446 } 1604 }
1447 1605
1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1449 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
1450 my $active = eval $v->{source}; 1617 my $active = eval $source;
1451 1618
1452 if (length $@) { 1619 if (length $@) {
1453 error "$v->{path}: $@\n"; 1620 error "$v->{path}: $@\n";
1454 undef $@; # work around perl 5.10.0 utf-8 caching bug
1455 1621
1456 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1457 if exists $v->{meta}{mandatory}; 1623 if exists $v->{meta}{mandatory};
1458 1624
1459 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1625 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1473 1639
1474 while (my ($k, $v) = each %todo) { 1640 while (my ($k, $v) = each %todo) {
1475 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1476 if exists $v->{meta}{mandatory}; 1642 if exists $v->{meta}{mandatory};
1477 } 1643 }
1644
1645 last;
1478 } 1646 }
1479 } 1647 }
1480 }; 1648 };
1481} 1649}
1482 1650
… …
1640 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1641 1809
1642 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1643 $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
1644 1812
1645 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1646 $pl->deactivate; 1814 $pl->deactivate;
1815
1647 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;
1648 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1649 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1650 1821
1651 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1652 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1653 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
… …
1819sub generate_random_map { 1990sub generate_random_map {
1820 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1821 1992
1822 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
1823 1994
1824 # mit "rum" bekleckern, nicht
1825 $self->_create_random_map ( 1995 $self->_create_random_map ($rmp);
1826 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1827 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1828 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1829 $rmp->{exit_on_final_map},
1830 $rmp->{xsize}, $rmp->{ysize},
1831 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1832 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1833 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1834 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1835 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1836 (cf::region::find $rmp->{region}), $rmp->{custom}
1837 )
1838} 1996}
1839 1997
1840=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1841 1999
1842Register 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
… …
1868} 2026}
1869 2027
1870sub normalise { 2028sub normalise {
1871 my ($path, $base) = @_; 2029 my ($path, $base) = @_;
1872 2030
1873 $path = "$path"; # make sure its a string 2031 $path = "$path"; # make sure it's a string
1874 2032
1875 $path =~ s/\.map$//; 2033 $path =~ s/\.map$//;
1876 2034
1877 # map plan: 2035 # map plan:
1878 # 2036 #
… …
1893 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1894 $path = "$base/$path"; 2052 $path = "$base/$path";
1895 } 2053 }
1896 2054
1897 for ($path) { 2055 for ($path) {
1898 redo if s{//}{/};
1899 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1900 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1901 } 2058 }
1902 2059
1903 $path 2060 $path
… …
1917 $self->init; # pass $1 etc. 2074 $self->init; # pass $1 etc.
1918 return $self; 2075 return $self;
1919 } 2076 }
1920 } 2077 }
1921 2078
1922 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1923 () 2080 ()
1924} 2081}
1925 2082
2083# may re-bless or do other evil things
1926sub init { 2084sub init {
1927 my ($self) = @_; 2085 my ($self) = @_;
1928 2086
1929 $self 2087 $self
1930} 2088}
… …
1995 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
1996 2154
1997 1 2155 1
1998} 2156}
1999 2157
2158# used to laod the header of an original map
2000sub load_header_orig { 2159sub load_header_orig {
2001 my ($self) = @_; 2160 my ($self) = @_;
2002 2161
2003 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
2004} 2163}
2005 2164
2165# used to laod the header of an instantiated map
2006sub load_header_temp { 2166sub load_header_temp {
2007 my ($self) = @_; 2167 my ($self) = @_;
2008 2168
2009 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
2010} 2170}
2011 2171
2172# called after loading the header from an instantiated map
2012sub prepare_temp { 2173sub prepare_temp {
2013 my ($self) = @_; 2174 my ($self) = @_;
2014 2175
2015 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
2016 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
2017 # safety 2178 # safety
2018 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
2019 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
2020} 2181}
2021 2182
2183# called after loading the header from an original map
2022sub prepare_orig { 2184sub prepare_orig {
2023 my ($self) = @_; 2185 my ($self) = @_;
2024 2186
2025 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
2026 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
… …
2050 2212
2051sub find; 2213sub find;
2052sub find { 2214sub find {
2053 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
2054 2216
2217 cf::cede_to_tick;
2218
2055 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
2056 2220
2057 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2058 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
2059 2223
2060 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
… …
2091 2255
2092 { 2256 {
2093 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2094 2258
2095 return unless $self->valid; 2259 return unless $self->valid;
2096 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2097
2098 $self->in_memory (cf::MAP_LOADING);
2099 2261
2100 $self->alloc; 2262 $self->alloc;
2101 2263
2102 $self->pre_load; 2264 $self->pre_load;
2103 cf::cede_to_tick; 2265 cf::cede_to_tick;
2104 2266
2267 if (exists $self->{load_path}) {
2105 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2106 $f->skip_block; 2269 $f->skip_block;
2107 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2108 or return; 2271 or return;
2109 2272
2110 $self->post_load_original 2273 $self->post_load_original
2111 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2112 2275
2113 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2114 utf8::encode $uniq; 2277 utf8::encode $uniq;
2115 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2116 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2117 $self->clear_unique_items; 2280 $self->clear_unique_items;
2118 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2119 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2120 } 2284 }
2121 } 2285 }
2122 }
2123 2286
2124 $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);
2125 2294
2126 cf::cede_to_tick; 2295 cf::cede_to_tick;
2127 # now do the right thing for maps 2296 # now do the right thing for maps
2128 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2129 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
… …
2133 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2134 $self->decay_objects; 2303 $self->decay_objects;
2135 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2136 $self->update_buttons; 2305 $self->update_buttons;
2137 cf::cede_to_tick; 2306 cf::cede_to_tick;
2138 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2139 } 2308 }
2140 2309
2141 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2142 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2143
2144 $self->in_memory (cf::MAP_ACTIVE);
2145 } 2312 }
2146 2313
2147 $self->post_load; 2314 $self->post_load;
2315
2316 1
2148} 2317}
2149 2318
2150# customize the map for a given player, i.e. 2319# customize the map for a given player, i.e.
2151# return the _real_ map. used by e.g. per-player 2320# return the _real_ map. used by e.g. per-player
2152# maps to change the path to ~playername/mappath 2321# maps to change the path to ~playername/mappath
… …
2160# if $self->per_party; 2329# if $self->per_party;
2161 2330
2162 $self 2331 $self
2163} 2332}
2164 2333
2165# find and load all maps in the 3x3 area around a map
2166sub load_neighbours {
2167 my ($map) = @_;
2168
2169 my @neigh; # diagonal neighbours
2170
2171 for (0 .. 3) {
2172 my $neigh = $map->tile_path ($_)
2173 or next;
2174 $neigh = find $neigh, $map
2175 or next;
2176 $neigh->load;
2177
2178 # now find the diagonal neighbours
2179 push @neigh,
2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2182 }
2183
2184 for (grep defined $_->[0], @neigh) {
2185 my ($path, $origin) = @$_;
2186 my $neigh = find $path, $origin
2187 or next;
2188 $neigh->load;
2189 }
2190}
2191
2192sub find_sync { 2334sub find_sync {
2193 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2194 2336
2337 # it's a bug to call this from the main context
2195 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2196 if $Coro::current == $Coro::main; 2339 if $Coro::current == $Coro::main;
2197 2340
2198 find $path, $origin 2341 find $path, $origin
2199} 2342}
2200 2343
2201sub do_load_sync { 2344sub do_load_sync {
2202 my ($map) = @_; 2345 my ($map) = @_;
2203 2346
2347 # it's a bug to call this from the main context
2204 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2205 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2206 2350
2207 $map->load; 2351 $map->load;
2208} 2352}
… …
2211our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2212 2356
2213sub find_async { 2357sub find_async {
2214 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2215 2359
2216 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2217 2361
2218 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2219 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2220 } 2364 }
2221 2365
2222 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2223 2367
2224 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
… …
2283sub swap_out { 2427sub swap_out {
2284 my ($self) = @_; 2428 my ($self) = @_;
2285 2429
2286 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2287 2431
2288 return if $self->in_memory != cf::MAP_ACTIVE; 2432 return if !$self->linkable;
2289 return if $self->{deny_save}; 2433 return if $self->{deny_save};
2290 return if $self->players; 2434 return if $self->players;
2291 2435
2292 # first deactivate the map and "unlink" it from the core 2436 # first deactivate the map and "unlink" it from the core
2293 $self->deactivate; 2437 $self->deactivate;
2294 $_->clear_links_to ($self) for values %cf::MAP; 2438 $_->clear_links_to ($self) for values %cf::MAP;
2295 $self->in_memory (cf::MAP_SWAPPED); 2439 $self->state (cf::MAP_SWAPPED);
2296 2440
2297 # then atomically save 2441 # then atomically save
2298 $self->_save; 2442 $self->_save;
2299 2443
2300 # then free the map 2444 # then free the map
… …
2326 2470
2327 return if $self->players; 2471 return if $self->players;
2328 2472
2329 cf::trace "resetting map ", $self->path, "\n"; 2473 cf::trace "resetting map ", $self->path, "\n";
2330 2474
2331 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2332 2476
2333 # need to save uniques path 2477 # need to save uniques path
2334 unless ($self->{deny_save}) { 2478 unless ($self->{deny_save}) {
2335 my $uniq = $self->uniq_path; utf8::encode $uniq; 2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2336 2480
… …
2666 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2667 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2668 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2669 2813
2670 $map->load; 2814 $map->load;
2671 $map->load_neighbours;
2672 2815
2673 return unless $self->contr->active; 2816 return unless $self->contr->active;
2674 2817
2675 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2676 if ($self->enter_map ($map, $x, $y)) { 2819 if ($self->enter_map ($map, $x, $y)) {
… …
2732 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2733 } 2876 }
2734 } 2877 }
2735 2878
2736 my $map = eval { 2879 my $map = eval {
2737 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2738 2881
2739 if ($map) { 2882 if ($map) {
2740 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2741 $map = $check->($map, $x, $y, $self) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2742 } else { 2885 } else {
… …
2832 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2833 2976
2834 unless (eval { 2977 unless (eval {
2835 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2836 2979
2837 # random map handling
2838 {
2839 my $guard = cf::lock_acquire "exit_prepare:$exit";
2840
2841 prepare_random_map $exit
2842 if $exit->slaying eq "/!";
2843 }
2844
2845 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2846 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2847 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 }
2848 3006
2849 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2850 3008
2851 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2852 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
… …
3094=cut 3252=cut
3095 3253
3096sub cf::client::ext_reply($$@) { 3254sub cf::client::ext_reply($$@) {
3097 my ($self, $id, @msg) = @_; 3255 my ($self, $id, @msg) = @_;
3098 3256
3099 if ($self->extcmd == 2) { 3257 return unless $self->extcmd == 2;
3258
3100 $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]));
3101 } elsif ($self->extcmd == 1) {
3102 #TODO: version 1, remove
3103 unshift @msg, msgtype => "reply", msgid => $id;
3104 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3105 }
3106} 3260}
3107 3261
3108=item $success = $client->query ($flags, "text", \&cb) 3262=item $success = $client->query ($flags, "text", \&cb)
3109 3263
3110Queues a query to the client, calling the given callback with 3264Queues a query to the client, calling the given callback with
… …
3165 my ($ns, $buf) = @_; 3319 my ($ns, $buf) = @_;
3166 3320
3167 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3321 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3168 3322
3169 if (ref $msg) { 3323 if (ref $msg) {
3170 my ($type, $reply, @payload) = 3324 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3171 "ARRAY" eq ref $msg
3172 ? @$msg
3173 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3174 3325
3175 my @reply; 3326 my @reply;
3176 3327
3177 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTICMD{$type}) {
3178 @reply = $cb->($ns, @payload); 3329 @reply = $cb->($ns, @payload);
… …
3356=cut 3507=cut
3357 3508
3358############################################################################# 3509#############################################################################
3359# the server's init and main functions 3510# the server's init and main functions
3360 3511
3512our %FACEHASH; # hash => idx, #d# HACK for http server
3513
3361sub load_facedata($) { 3514sub load_facedata($) {
3362 my ($path) = @_; 3515 my ($path) = @_;
3363 3516
3364 # 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
3365 # for this (global event?) 3518 # for this (global event?)
… …
3367 3520
3368 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3521 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3369 3522
3370 trace "loading facedata from $path\n"; 3523 trace "loading facedata from $path\n";
3371 3524
3372 my $facedata; 3525 my $facedata = decode_storable load_file $path;
3373 0 < aio_load $path, $facedata
3374 or die "$path: $!";
3375
3376 $facedata = Coro::Storable::thaw $facedata;
3377 3526
3378 $facedata->{version} == 2 3527 $facedata->{version} == 2
3379 or cf::cleanup "$path: version mismatch, cannot proceed."; 3528 or cf::cleanup "$path: version mismatch, cannot proceed.";
3380 3529
3381 # patch in the exptable 3530 # patch in the exptable
3382 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3531 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3383 $facedata->{resource}{"res/exp_table"} = { 3532 $facedata->{resource}{"res/exp_table"} = {
3384 type => FT_RSRC, 3533 type => FT_RSRC,
3385 data => $exp_table, 3534 data => $exp_table,
3386 hash => (Digest::MD5::md5 $exp_table), 3535 hash => (cf::face::mangle_chksum Digest::MD5::md5 $exp_table),
3387 }; 3536 };
3388 cf::cede_to_tick; 3537 cf::cede_to_tick;
3389 3538
3390 { 3539 {
3391 my $faces = $facedata->{faceinfo}; 3540 my $faces = $facedata->{faceinfo};
3392 3541
3393 while (my ($face, $info) = each %$faces) { 3542 for my $face (sort keys %$faces) {
3543 my $info = $faces->{$face};
3394 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3544 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3395 3545
3396 cf::face::set_visibility $idx, $info->{visibility}; 3546 cf::face::set_visibility $idx, $info->{visibility};
3397 cf::face::set_magicmap $idx, $info->{magicmap}; 3547 cf::face::set_magicmap $idx, $info->{magicmap};
3398 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3548 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3399 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#
3400 3552
3401 cf::cede_to_tick; 3553 cf::cede_to_tick;
3402 } 3554 }
3403 3555
3404 while (my ($face, $info) = each %$faces) { 3556 while (my ($face, $info) = each %$faces) {
… …
3431 3583
3432 { 3584 {
3433 my $res = $facedata->{resource}; 3585 my $res = $facedata->{resource};
3434 3586
3435 while (my ($name, $info) = each %$res) { 3587 while (my ($name, $info) = each %$res) {
3436 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
3437 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3590 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3438 3591
3439 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3592 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3440 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#
3441 } else { 3596 } else {
3442 $RESOURCE{$name} = $info; # unused 3597# $RESOURCE{$name} = $info; # unused
3443 } 3598 }
3444 3599
3445 cf::cede_to_tick; 3600 cf::cede_to_tick;
3446 } 3601 }
3447 } 3602 }
… …
3499} 3654}
3500 3655
3501sub reload_sound { 3656sub reload_sound {
3502 trace "loading sound config from $DATADIR/sound\n"; 3657 trace "loading sound config from $DATADIR/sound\n";
3503 3658
3504 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3505 or die "$DATADIR/sound $!";
3506
3507 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3659 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3508 3660
3509 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3661 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3510 my $sound = $soundconf->{compat}[$_] 3662 my $sound = $soundconf->{compat}[$_]
3511 or next; 3663 or next;
3512 3664
… …
3522} 3674}
3523 3675
3524sub reload_resources { 3676sub reload_resources {
3525 trace "reloading resource files...\n"; 3677 trace "reloading resource files...\n";
3526 3678
3679 reload_exp_table;
3680 reload_materials;
3527 reload_facedata; 3681 reload_facedata;
3528 reload_sound; 3682 reload_sound;
3529 reload_archetypes; 3683 reload_archetypes;
3530 reload_regions; 3684 reload_regions;
3531 reload_treasures; 3685 reload_treasures;
… …
3534} 3688}
3535 3689
3536sub reload_config { 3690sub reload_config {
3537 trace "reloading config file...\n"; 3691 trace "reloading config file...\n";
3538 3692
3539 open my $fh, "<:utf8", "$CONFDIR/config" 3693 my $config = load_file "$CONFDIR/config";
3540 or return; 3694 utf8::decode $config;
3541 3695 *CFG = decode_yaml $config;
3542 local $/;
3543 *CFG = YAML::XS::Load scalar <$fh>;
3544 3696
3545 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3697 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3546 3698
3547 $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};
3548 $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};
… …
3552 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3704 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3553 and die "WARNING: m(un)lockall failed: $!\n"; 3705 and die "WARNING: m(un)lockall failed: $!\n";
3554 }; 3706 };
3555 warn $@ if $@; 3707 warn $@ if $@;
3556 } 3708 }
3557
3558 trace "finished reloading resource files\n";
3559} 3709}
3560 3710
3561sub pidfile() { 3711sub pidfile() {
3562 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3712 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3563 or die "$PIDFILE: $!"; 3713 or die "$PIDFILE: $!";
… …
3588 3738
3589sub main { 3739sub main {
3590 cf::init_globals; # initialise logging 3740 cf::init_globals; # initialise logging
3591 3741
3592 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3742 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3593 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3743 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3594 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3744 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3595 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3745 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3596 3746
3597 $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
3598 3748
3599 # we must not ever block the main coroutine 3749 # we must not ever block the main coroutine
3600 local $Coro::idle = sub { 3750 $Coro::idle = sub {
3601 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#
3602 (async { 3752 (async {
3603 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3753 $Coro::current->{desc} = "IDLE BUG HANDLER";
3604 EV::loop EV::LOOP_ONESHOT; 3754 EV::loop EV::LOOP_ONESHOT;
3605 })->prio (Coro::PRIO_MAX); 3755 })->prio (Coro::PRIO_MAX);
3606 }; 3756 };
3607 3757
3608 evthread_start IO::AIO::poll_fileno; 3758 evthread_start IO::AIO::poll_fileno;
3609 3759
3610 cf::sync_job { 3760 cf::sync_job {
3611 cf::init_experience; 3761 cf::incloader::init ();
3762
3612 cf::init_anim; 3763 cf::init_anim;
3613 cf::init_attackmess; 3764 cf::init_attackmess;
3614 cf::init_dynamic; 3765 cf::init_dynamic;
3615 3766
3616 cf::load_settings; 3767 cf::load_settings;
3617 cf::load_materials;
3618 3768
3619 reload_resources; 3769 reload_resources;
3620 reload_config; 3770 reload_config;
3621 db_init; 3771 db_init;
3622 3772
… …
3634 3784
3635 # no (long-running) fork's whatsoever before this point(!) 3785 # no (long-running) fork's whatsoever before this point(!)
3636 use POSIX (); 3786 use POSIX ();
3637 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};
3638 3788
3639 (pop @POST_INIT)->(0) while @POST_INIT; 3789 cf::_post_init 0;
3640 }; 3790 };
3641 3791
3642 cf::object::thawer::errors_are_fatal 0; 3792 cf::object::thawer::errors_are_fatal 0;
3643 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";
3644 3794
3795 AE::postpone {
3796 undef &main; # free gobs of memory :)
3797 };
3798
3645 main_loop; 3799 goto &main_loop;
3646} 3800}
3647 3801
3648############################################################################# 3802#############################################################################
3649# initialisation and cleanup 3803# initialisation and cleanup
3650 3804
… …
3803 3957
3804 cf::write_runtime_sync; # external watchdog should not bark 3958 cf::write_runtime_sync; # external watchdog should not bark
3805 3959
3806 trace "emergency_perl_save: flushing outstanding aio requests"; 3960 trace "emergency_perl_save: flushing outstanding aio requests";
3807 while (IO::AIO::nreqs || BDB::nreqs) { 3961 while (IO::AIO::nreqs || BDB::nreqs) {
3808 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
3809 } 3963 }
3810 3964
3811 cf::write_runtime_sync; # external watchdog should not bark 3965 cf::write_runtime_sync; # external watchdog should not bark
3812 }; 3966 };
3813 3967
… …
3851 } 4005 }
3852} 4006}
3853 4007
3854sub do_reload_perl() { 4008sub do_reload_perl() {
3855 # can/must only be called in main 4009 # can/must only be called in main
3856 if (in_main) { 4010 unless (in_main) {
3857 error "can only reload from main coroutine"; 4011 error "can only reload from main coroutine";
3858 return; 4012 return;
3859 } 4013 }
3860 4014
3861 return if $RELOAD++; 4015 return if $RELOAD++;
3862 4016
3863 my $t1 = AE::time; 4017 my $t1 = AE::time;
3864 4018
3865 while ($RELOAD) { 4019 while ($RELOAD) {
4020 cf::get_slot 0.1, -1, "reload_perl";
3866 info "reloading..."; 4021 info "perl_reload: reloading...";
3867 4022
3868 trace "entering sync_job"; 4023 trace "perl_reload: entering sync_job";
3869 4024
3870 cf::sync_job { 4025 cf::sync_job {
3871 cf::emergency_save; 4026 #cf::emergency_save;
3872 4027
3873 trace "cancelling all extension coros"; 4028 trace "perl_reload: cancelling all extension coros";
3874 $_->cancel for values %EXT_CORO; 4029 $_->cancel for values %EXT_CORO;
3875 %EXT_CORO = (); 4030 %EXT_CORO = ();
3876 4031
3877 trace "removing commands"; 4032 trace "perl_reload: removing commands";
3878 %COMMAND = (); 4033 %COMMAND = ();
3879 4034
3880 trace "removing ext/exti commands"; 4035 trace "perl_reload: removing ext/exti commands";
3881 %EXTCMD = (); 4036 %EXTCMD = ();
3882 %EXTICMD = (); 4037 %EXTICMD = ();
3883 4038
3884 trace "unloading/nuking all extensions"; 4039 trace "perl_reload: unloading/nuking all extensions";
3885 for my $pkg (@EXTS) { 4040 for my $pkg (@EXTS) {
3886 trace "... unloading $pkg"; 4041 trace "... unloading $pkg";
3887 4042
3888 if (my $cb = $pkg->can ("unload")) { 4043 if (my $cb = $pkg->can ("unload")) {
3889 eval { 4044 eval {
… …
3894 4049
3895 trace "... clearing $pkg"; 4050 trace "... clearing $pkg";
3896 clear_package $pkg; 4051 clear_package $pkg;
3897 } 4052 }
3898 4053
3899 trace "unloading all perl modules loaded from $LIBDIR"; 4054 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3900 while (my ($k, $v) = each %INC) { 4055 while (my ($k, $v) = each %INC) {
3901 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4056 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3902 4057
3903 trace "... unloading $k"; 4058 trace "... unloading $k";
3904 delete $INC{$k}; 4059 delete $INC{$k};
… …
3911 } 4066 }
3912 4067
3913 clear_package $k; 4068 clear_package $k;
3914 } 4069 }
3915 4070
3916 trace "getting rid of safe::, as good as possible"; 4071 trace "perl_reload: getting rid of safe::, as good as possible";
3917 clear_package "safe::$_" 4072 clear_package "safe::$_"
3918 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);
3919 4074
3920 trace "unloading cf.pm \"a bit\""; 4075 trace "perl_reload: unloading cf.pm \"a bit\"";
3921 delete $INC{"cf.pm"}; 4076 delete $INC{"cf.pm"};
3922 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4077 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3923 4078
3924 # don't, removes xs symbols, too, 4079 # don't, removes xs symbols, too,
3925 # and global variables created in xs 4080 # and global variables created in xs
3926 #clear_package __PACKAGE__; 4081 #clear_package __PACKAGE__;
3927 4082
3928 info "unload completed, starting to reload now"; 4083 info "perl_reload: unload completed, starting to reload now";
3929 4084
3930 trace "reloading cf.pm"; 4085 trace "perl_reload: reloading cf.pm";
3931 require cf; 4086 require cf;
3932 cf::_connect_to_perl_1; 4087 cf::_connect_to_perl_1;
3933 4088
3934 trace "loading config and database again"; 4089 trace "perl_reload: loading config and database again";
3935 cf::reload_config; 4090 cf::reload_config;
3936 4091
3937 trace "loading extensions"; 4092 trace "perl_reload: loading extensions";
3938 cf::load_extensions; 4093 cf::load_extensions;
3939 4094
3940 if ($REATTACH_ON_RELOAD) { 4095 if ($REATTACH_ON_RELOAD) {
3941 trace "reattaching attachments to objects/players"; 4096 trace "perl_reload: reattaching attachments to objects/players";
3942 _global_reattach; # objects, sockets 4097 _global_reattach; # objects, sockets
3943 trace "reattaching attachments to maps"; 4098 trace "perl_reload: reattaching attachments to maps";
3944 reattach $_ for values %MAP; 4099 reattach $_ for values %MAP;
3945 trace "reattaching attachments to players"; 4100 trace "perl_reload: reattaching attachments to players";
3946 reattach $_ for values %PLAYER; 4101 reattach $_ for values %PLAYER;
3947 } 4102 }
3948 4103
3949 trace "running post_init jobs"; 4104 cf::_post_init 1;
3950 (pop @POST_INIT)->(1) while @POST_INIT;
3951 4105
3952 trace "leaving sync_job"; 4106 trace "perl_reload: leaving sync_job";
3953 4107
3954 1 4108 1
3955 } or do { 4109 } or do {
3956 error $@; 4110 error $@;
3957 cf::cleanup "error while reloading, exiting."; 4111 cf::cleanup "perl_reload: error, exiting.";
3958 }; 4112 };
3959 4113
3960 info "reloaded";
3961 --$RELOAD; 4114 --$RELOAD;
3962 } 4115 }
3963 4116
3964 $t1 = AE::time - $t1; 4117 $t1 = AE::time - $t1;
3965 info "reload completed in ${t1}s\n"; 4118 info "perl_reload: completed in ${t1}s\n";
3966}; 4119};
3967 4120
3968our $RELOAD_WATCHER; # used only during reload 4121our $RELOAD_WATCHER; # used only during reload
3969 4122
3970sub reload_perl() { 4123sub reload_perl() {
… …
3991 reload_perl; 4144 reload_perl;
3992 }; 4145 };
3993 } 4146 }
3994}; 4147};
3995 4148
3996unshift @INC, $LIBDIR; 4149#############################################################################
3997 4150
3998my $bug_warning = 0; 4151my $bug_warning = 0;
3999 4152
4000our @WAIT_FOR_TICK;
4001our @WAIT_FOR_TICK_BEGIN;
4002
4003sub wait_for_tick { 4153sub wait_for_tick() {
4004 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4154 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4005 4155
4006 my $signal = new Coro::Signal; 4156 $WAIT_FOR_TICK->wait;
4007 push @WAIT_FOR_TICK, $signal;
4008 $signal->wait;
4009} 4157}
4010 4158
4011sub wait_for_tick_begin { 4159sub wait_for_tick_begin() {
4012 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4160 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4013 4161
4014 my $signal = new Coro::Signal; 4162 my $signal = new Coro::Signal;
4015 push @WAIT_FOR_TICK_BEGIN, $signal; 4163 push @WAIT_FOR_TICK_BEGIN, $signal;
4016 $signal->wait; 4164 $signal->wait;
4017} 4165}
… …
4021 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"
4022 unless ++$bug_warning > 10; 4170 unless ++$bug_warning > 10;
4023 return; 4171 return;
4024 } 4172 }
4025 4173
4026 cf::server_tick; # one server iteration 4174 cf::one_tick; # one server iteration
4027 4175
4028 #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#
4029 4177
4030 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4178 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4031 $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.;
… …
4037 } 4185 }
4038 4186
4039 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4187 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4040 $sig->send; 4188 $sig->send;
4041 } 4189 }
4042 while (my $sig = shift @WAIT_FOR_TICK) { 4190 $WAIT_FOR_TICK->broadcast;
4043 $sig->send;
4044 }
4045 4191
4046 $LOAD = ($NOW - $TICK_START) / $TICK; 4192 $LOAD = ($NOW - $TICK_START) / $TICK;
4047 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4193 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4048 4194
4049 if (0) { 4195 if (0) {
… …
4058{ 4204{
4059 # configure BDB 4205 # configure BDB
4060 4206
4061 BDB::min_parallel 16; 4207 BDB::min_parallel 16;
4062 BDB::max_poll_reqs $TICK * 0.1; 4208 BDB::max_poll_reqs $TICK * 0.1;
4063 $AnyEvent::BDB::WATCHER->priority (1); 4209 #$AnyEvent::BDB::WATCHER->priority (1);
4064 4210
4065 unless ($DB_ENV) { 4211 unless ($DB_ENV) {
4066 $DB_ENV = BDB::db_env_create; 4212 $DB_ENV = BDB::db_env_create;
4067 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4213 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4068 $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;
… …
4103 IO::AIO::min_parallel 8; 4249 IO::AIO::min_parallel 8;
4104 IO::AIO::max_poll_time $TICK * 0.1; 4250 IO::AIO::max_poll_time $TICK * 0.1;
4105 undef $AnyEvent::AIO::WATCHER; 4251 undef $AnyEvent::AIO::WATCHER;
4106} 4252}
4107 4253
4108my $_log_backtrace; 4254our $_log_backtrace;
4255our $_log_backtrace_last;
4109 4256
4110sub _log_backtrace { 4257sub _log_backtrace {
4111 my ($msg, @addr) = @_; 4258 my ($msg, @addr) = @_;
4112 4259
4113 $msg =~ s/\n//; 4260 $msg =~ s/\n$//;
4114 4261
4262 if ($_log_backtrace_last eq $msg) {
4263 LOG llevInfo, "[ABT] $msg\n";
4264 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4115 # limit the # of concurrent backtraces 4265 # limit the # of concurrent backtraces
4116 if ($_log_backtrace < 2) { 4266 } elsif ($_log_backtrace < 2) {
4267 $_log_backtrace_last = $msg;
4117 ++$_log_backtrace; 4268 ++$_log_backtrace;
4118 my $perl_bt = Carp::longmess $msg; 4269 my $perl_bt = Carp::longmess $msg;
4119 async { 4270 async {
4120 $Coro::current->{desc} = "abt $msg"; 4271 $Coro::current->{desc} = "abt $msg";
4121 4272
… …
4141 LOG llevInfo, "[ABT] $_\n" for @bt; 4292 LOG llevInfo, "[ABT] $_\n" for @bt;
4142 --$_log_backtrace; 4293 --$_log_backtrace;
4143 }; 4294 };
4144 } else { 4295 } else {
4145 LOG llevInfo, "[ABT] $msg\n"; 4296 LOG llevInfo, "[ABT] $msg\n";
4146 LOG llevInfo, "[ABT] [suppressed]\n"; 4297 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4147 } 4298 }
4148} 4299}
4149 4300
4150# load additional modules 4301# load additional modules
4151require "cf/$_.pm" for @EXTRA_MODULES; 4302require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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