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.450 by root, Mon Sep 22 01:33:09 2008 UTC vs.
Revision 1.539 by root, Tue May 4 22:49:21 2010 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your 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 GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# 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>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
50 52
51use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
52use BDB (); 54use BDB ();
53use Data::Dumper; 55use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 56use Fcntl;
56use YAML (); 57use YAML::XS ();
57use IO::AIO (); 58use IO::AIO ();
58use Time::HiRes; 59use Time::HiRes;
59use Compress::LZF; 60use Compress::LZF;
60use Digest::MD5 (); 61use Digest::MD5 ();
61 62
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 71
71# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
74 78
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76 80
77our %COMMAND = (); 81our %COMMAND = ();
78our %COMMAND_TIME = (); 82our %COMMAND_TIME = ();
81our %EXTCMD = (); 85our %EXTCMD = ();
82our %EXTICMD = (); 86our %EXTICMD = ();
83our %EXT_CORO = (); # coroutines bound to extensions 87our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 88our %EXT_MAP = (); # pluggable maps
85 89
86our $RELOAD; # number of reloads so far 90our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 91our @EVENT;
92our @REFLECT; # set by XS
93our %REFLECT; # set by us
88 94
89our $CONFDIR = confdir; 95our $CONFDIR = confdir;
90our $DATADIR = datadir; 96our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 97our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 98our $PODDIR = "$DATADIR/pod";
98our $RANDOMDIR = "$LOCALDIR/random"; 104our $RANDOMDIR = "$LOCALDIR/random";
99our $BDBDIR = "$LOCALDIR/db"; 105our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid"; 106our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 107our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 108
103our %RESOURCE; 109our %RESOURCE; # unused
110
111our $OUTPUT_RATE_MIN = 3000;
112our $OUTPUT_RATE_MAX = 1000000;
113
114our $MAX_LINKS = 32; # how many chained exits to follow
115our $VERBOSE_IO = 1;
104 116
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 117our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 118our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 119our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 120our $USE_FSYNC = 1; # use fsync to write maps - default on
109 121
110our $BDB_DEADLOCK_WATCHER; 122our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 123our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 124our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 125our $DB_ENV;
114 126
127our @EXTRA_MODULES = qw(pod match mapscript);
128
115our %CFG; 129our %CFG;
116 130
117our $UPTIME; $UPTIME ||= time; 131our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 132our $RUNTIME;
119our $NOW; 133our $NOW;
127 141
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 142our $LOAD; # a number between 0 (idle) and 1 (too many objects)
129our $LOADAVG; # same thing, but with alpha-smoothing 143our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 144our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 145our $TICK_START; # for load detecting purposes
146
147our @POST_INIT;
148
149our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
150our $REALLY_UNLOOP; # never set to true, please :)
132 151
133binmode STDOUT; 152binmode STDOUT;
134binmode STDERR; 153binmode STDERR;
135 154
136# read virtual server time, if available 155# read virtual server time, if available
138 open my $fh, "<", $RUNTIMEFILE 157 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 158 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 159 $RUNTIME = <$fh> + 0.;
141} 160}
142 161
162eval "sub TICK() { $TICK } 1" or die;
163
143mkdir $_ 164mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 165 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 166
146our $EMERGENCY_POSITION; 167our $EMERGENCY_POSITION;
147 168
148sub cf::map::normalise; 169sub cf::map::normalise;
170
171sub in_main() {
172 $Coro::current == $Coro::main
173}
174
175#############################################################################
176
177%REFLECT = ();
178for (@REFLECT) {
179 my $reflect = JSON::XS::decode_json $_;
180 $REFLECT{$reflect->{class}} = $reflect;
181}
182
183# this is decidedly evil
184$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
149 185
150############################################################################# 186#############################################################################
151 187
152=head2 GLOBAL VARIABLES 188=head2 GLOBAL VARIABLES
153 189
200returns directly I<after> the tick processing (and consequently, can only wake one process 236returns directly I<after> the tick processing (and consequently, can only wake one process
201per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 237per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
202 238
203=item @cf::INVOKE_RESULTS 239=item @cf::INVOKE_RESULTS
204 240
205This array contains the results of the last C<invoke ()> call. When 241This array contains the results of the last C<invoke ()> call. When
206C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 242C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
207that call. 243that call.
208 244
245=item %cf::REFLECT
246
247Contains, for each (C++) class name, a hash reference with information
248about object members (methods, scalars, arrays and flags) and other
249metadata, which is useful for introspection.
250
209=back 251=back
210 252
211=cut 253=cut
212 254
213BEGIN { 255sub error(@) { LOG llevError, join "", @_ }
214 *CORE::GLOBAL::warn = sub { 256sub warn (@) { LOG llevWarn , join "", @_ }
257sub info (@) { LOG llevInfo , join "", @_ }
258sub debug(@) { LOG llevDebug, join "", @_ }
259sub trace(@) { LOG llevTrace, join "", @_ }
260
261$Coro::State::WARNHOOK = sub {
215 my $msg = join "", @_; 262 my $msg = join "", @_;
216 263
217 $msg .= "\n" 264 $msg .= "\n"
218 unless $msg =~ /\n$/; 265 unless $msg =~ /\n$/;
219 266
220 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 267 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
221 268
222 LOG llevError, $msg; 269 LOG llevWarn, $msg;
223 }; 270};
224}
225 271
226$Coro::State::DIEHOOK = sub { 272$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 273 return unless $^S eq 0; # "eq", not "=="
228 274
229 if ($Coro::current == $Coro::main) {#d# 275 error Carp::longmess $_[0];
276
277 if (in_main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 278 error "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 279 return;#d#
232 }#d# 280 }#d#
233 281
234 # kill coroutine otherwise 282 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 283 Coro::terminate
237}; 284};
238
239$SIG{__DIE__} = sub { }; #d#?
240 285
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 286@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 287@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 288@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 289@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
258)) { 303)) {
259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 304 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
260} 305}
261 306
262$EV::DIED = sub { 307$EV::DIED = sub {
263 warn "error in event callback: @_"; 308 Carp::cluck "error in event callback: @_";
264}; 309};
265 310
266############################################################################# 311#############################################################################
267 312
268=head2 UTILITY FUNCTIONS 313=head2 UTILITY FUNCTIONS
305our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 350our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
306 351
307sub encode_json($) { $json_coder->encode ($_[0]) } 352sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 353sub decode_json($) { $json_coder->decode ($_[0]) }
309 354
355=item cf::post_init { BLOCK }
356
357Execute the given codeblock, I<after> all extensions have been (re-)loaded,
358but I<before> the server starts ticking again.
359
360The cdoeblock will have a single boolean argument to indicate whether this
361is a reload or not.
362
363=cut
364
365sub post_init(&) {
366 push @POST_INIT, shift;
367}
368
310=item cf::lock_wait $string 369=item cf::lock_wait $string
311 370
312Wait until the given lock is available. See cf::lock_acquire. 371Wait until the given lock is available. See cf::lock_acquire.
313 372
314=item my $lock = cf::lock_acquire $string 373=item my $lock = cf::lock_acquire $string
315 374
316Wait until the given lock is available and then acquires it and returns 375Wait until the given lock is available and then acquires it and returns
317a Coro::guard object. If the guard object gets destroyed (goes out of scope, 376a L<Guard> object. If the guard object gets destroyed (goes out of scope,
318for example when the coroutine gets canceled), the lock is automatically 377for example when the coroutine gets canceled), the lock is automatically
319returned. 378returned.
320 379
321Locks are *not* recursive, locking from the same coro twice results in a 380Locks are *not* recursive, locking from the same coro twice results in a
322deadlocked coro. 381deadlocked coro.
328 387
329Return true if the lock is currently active, i.e. somebody has locked it. 388Return true if the lock is currently active, i.e. somebody has locked it.
330 389
331=cut 390=cut
332 391
333our %LOCK; 392our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 393
336sub lock_wait($) { 394sub lock_wait($) {
337 my ($key) = @_; 395 $LOCKS->wait ($_[0]);
338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
343
344 # wait for lock, if any
345 while ($LOCK{$key}) {
346 push @{ $LOCK{$key} }, $Coro::current;
347 Coro::schedule;
348 }
349} 396}
350 397
351sub lock_acquire($) { 398sub lock_acquire($) {
352 my ($key) = @_; 399 $LOCKS->guard ($_[0])
353
354 # wait, to be sure we are not locked
355 lock_wait $key;
356
357 $LOCK{$key} = [];
358 $LOCKER{$key} = $Coro::current;#d#
359
360 Coro::guard {
361 delete $LOCKER{$key};#d#
362 # wake up all waiters, to be on the safe side
363 $_->ready for @{ delete $LOCK{$key} };
364 }
365} 400}
366 401
367sub lock_active($) { 402sub lock_active($) {
368 my ($key) = @_; 403 $LOCKS->count ($_[0]) < 1
369
370 ! ! $LOCK{$key}
371} 404}
372 405
373sub freeze_mainloop { 406sub freeze_mainloop {
374 tick_inhibit_inc; 407 tick_inhibit_inc;
375 408
376 Coro::guard \&tick_inhibit_dec; 409 &Guard::guard (\&tick_inhibit_dec);
377} 410}
378 411
379=item cf::periodic $interval, $cb 412=item cf::periodic $interval, $cb
380 413
381Like EV::periodic, but randomly selects a starting point so that the actions 414Like EV::periodic, but randomly selects a starting point so that the actions
382get spread over timer. 415get spread over time.
383 416
384=cut 417=cut
385 418
386sub periodic($$) { 419sub periodic($$) {
387 my ($interval, $cb) = @_; 420 my ($interval, $cb) = @_;
404 437
405=cut 438=cut
406 439
407our @SLOT_QUEUE; 440our @SLOT_QUEUE;
408our $SLOT_QUEUE; 441our $SLOT_QUEUE;
442our $SLOT_DECAY = 0.9;
409 443
410$SLOT_QUEUE->cancel if $SLOT_QUEUE; 444$SLOT_QUEUE->cancel if $SLOT_QUEUE;
411$SLOT_QUEUE = Coro::async { 445$SLOT_QUEUE = Coro::async {
412 $Coro::current->desc ("timeslot manager"); 446 $Coro::current->desc ("timeslot manager");
413 447
414 my $signal = new Coro::Signal; 448 my $signal = new Coro::Signal;
449 my $busy;
415 450
416 while () { 451 while () {
417 next_job: 452 next_job:
453
418 my $avail = cf::till_tick; 454 my $avail = cf::till_tick;
419 if ($avail > 0.01) { 455
420 for (0 .. $#SLOT_QUEUE) { 456 for (0 .. $#SLOT_QUEUE) {
421 if ($SLOT_QUEUE[$_][0] < $avail) { 457 if ($SLOT_QUEUE[$_][0] <= $avail) {
458 $busy = 0;
422 my $job = splice @SLOT_QUEUE, $_, 1, (); 459 my $job = splice @SLOT_QUEUE, $_, 1, ();
423 $job->[2]->send; 460 $job->[2]->send;
424 Coro::cede; 461 Coro::cede;
425 goto next_job; 462 goto next_job;
426 } 463 } else {
464 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
427 } 465 }
428 } 466 }
429 467
430 if (@SLOT_QUEUE) { 468 if (@SLOT_QUEUE) {
431 # we do not use wait_for_tick() as it returns immediately when tick is inactive 469 # we do not use wait_for_tick() as it returns immediately when tick is inactive
432 push @cf::WAIT_FOR_TICK, $signal; 470 push @cf::WAIT_FOR_TICK, $signal;
433 $signal->wait; 471 $signal->wait;
434 } else { 472 } else {
473 $busy = 0;
435 Coro::schedule; 474 Coro::schedule;
436 } 475 }
437 } 476 }
438}; 477};
439 478
440sub get_slot($;$$) { 479sub get_slot($;$$) {
441 return if tick_inhibit || $Coro::current == $Coro::main; 480 return if tick_inhibit || $Coro::current == $Coro::main;
442 481
443 my ($time, $pri, $name) = @_; 482 my ($time, $pri, $name) = @_;
444 483
445 $time = $TICK * .6 if $time > $TICK * .6; 484 $time = clamp $time, 0.01, $TICK * .6;
485
446 my $sig = new Coro::Signal; 486 my $sig = new Coro::Signal;
447 487
448 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 488 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
449 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 489 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
450 $SLOT_QUEUE->ready; 490 $SLOT_QUEUE->ready;
476=cut 516=cut
477 517
478sub sync_job(&) { 518sub sync_job(&) {
479 my ($job) = @_; 519 my ($job) = @_;
480 520
481 if ($Coro::current == $Coro::main) { 521 if (in_main) {
482 my $time = EV::time; 522 my $time = AE::time;
483 523
484 # this is the main coro, too bad, we have to block 524 # this is the main coro, too bad, we have to block
485 # till the operation succeeds, freezing the server :/ 525 # till the operation succeeds, freezing the server :/
486 526
487 LOG llevError, Carp::longmess "sync job";#d# 527 #LOG llevError, Carp::longmess "sync job";#d#
488 528
489 my $freeze_guard = freeze_mainloop; 529 my $freeze_guard = freeze_mainloop;
490 530
491 my $busy = 1; 531 my $busy = 1;
492 my @res; 532 my @res;
493 533
494 (async { 534 (async {
495 $Coro::current->desc ("sync job coro"); 535 $Coro::current->desc ("sync job coro");
496 @res = eval { $job->() }; 536 @res = eval { $job->() };
497 warn $@ if $@; 537 error $@ if $@;
498 undef $busy; 538 undef $busy;
499 })->prio (Coro::PRIO_MAX); 539 })->prio (Coro::PRIO_MAX);
500 540
501 while ($busy) { 541 while ($busy) {
502 if (Coro::nready) { 542 if (Coro::nready) {
504 } else { 544 } else {
505 EV::loop EV::LOOP_ONESHOT; 545 EV::loop EV::LOOP_ONESHOT;
506 } 546 }
507 } 547 }
508 548
509 my $time = EV::time - $time; 549 my $time = AE::time - $time;
510 550
511 $TICK_START += $time; # do not account sync jobs to server load 551 $TICK_START += $time; # do not account sync jobs to server load
512 552
513 wantarray ? @res : $res[0] 553 wantarray ? @res : $res[0]
514 } else { 554 } else {
558 reset_signals; 598 reset_signals;
559 &$cb 599 &$cb
560 }, @args; 600 }, @args;
561 601
562 wantarray ? @res : $res[-1] 602 wantarray ? @res : $res[-1]
603}
604
605sub objinfo {
606 (
607 "counter value" => cf::object::object_count,
608 "objects created" => cf::object::create_count,
609 "objects destroyed" => cf::object::destroy_count,
610 "freelist size" => cf::object::free_count,
611 "allocated objects" => cf::object::objects_size,
612 "active objects" => cf::object::actives_size,
613 )
563} 614}
564 615
565=item $coin = coin_from_name $name 616=item $coin = coin_from_name $name
566 617
567=cut 618=cut
604within each server. 655within each server.
605 656
606=cut 657=cut
607 658
608sub db_table($) { 659sub db_table($) {
660 cf::error "db_get called from main context"
661 if $Coro::current == $Coro::main;
662
609 my ($name) = @_; 663 my ($name) = @_;
610 my $db = BDB::db_create $DB_ENV; 664 my $db = BDB::db_create $DB_ENV;
611 665
612 eval { 666 eval {
613 $db->set_flags (BDB::CHKSUM); 667 $db->set_flags (BDB::CHKSUM);
623} 677}
624 678
625our $DB; 679our $DB;
626 680
627sub db_init { 681sub db_init {
628 cf::sync_job {
629 $DB ||= db_table "db"; 682 $DB ||= db_table "db";
630 };
631} 683}
632 684
633sub db_get($$) { 685sub db_get($$) {
634 my $key = "$_[0]/$_[1]"; 686 my $key = "$_[0]/$_[1]";
635 687
636 cf::sync_job { 688 cf::error "db_get called from main context"
689 if $Coro::current == $Coro::main;
690
637 BDB::db_get $DB, undef, $key, my $data; 691 BDB::db_get $DB, undef, $key, my $data;
638 692
639 $! ? () 693 $! ? ()
640 : $data 694 : $data
641 }
642} 695}
643 696
644sub db_put($$$) { 697sub db_put($$$) {
645 BDB::dbreq_pri 4; 698 BDB::dbreq_pri 4;
646 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 699 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
702 755
703 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
704 my $data = $process->(\@data); 757 my $data = $process->(\@data);
705 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
706 759
707 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
708 761
709 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
710 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
711 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
712 765
722 775
723=cut 776=cut
724 777
725sub datalog($@) { 778sub datalog($@) {
726 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
727 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
728} 781}
729 782
730=back 783=back
731 784
732=cut 785=cut
927 980
928 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
929 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
930 983
931 } elsif (ref $type) { 984 } elsif (ref $type) {
932 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
933 986
934 } else { 987 } else {
935 shift @arg; 988 shift @arg;
936 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
937 } 990 }
938 } 991 }
939} 992}
940 993
941sub _object_attach { 994sub _object_attach {
951 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
952 } 1005 }
953 1006
954 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
955 } else { 1008 } else {
956 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
957 } 1010 }
958 1011
959 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
960} 1013}
961 1014
1020 1073
1021 for (@$callbacks) { 1074 for (@$callbacks) {
1022 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
1023 1076
1024 if ($@) { 1077 if ($@) {
1025 warn "$@";
1026 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1027 override; 1079 override;
1028 } 1080 }
1029 1081
1030 return 1 if $override; 1082 return 1 if $override;
1031 } 1083 }
1110 for (@$attach) { 1162 for (@$attach) {
1111 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
1112 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
1113 } 1165 }
1114 } else { 1166 } else {
1115 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
1116 } 1168 }
1117 } 1169 }
1118} 1170}
1119 1171
1120cf::attachable->attach ( 1172cf::attachable->attach (
1147 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1148 1200
1149 sync_job { 1201 sync_job {
1150 if (length $$rdata) { 1202 if (length $$rdata) {
1151 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1152 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1153 $decname, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1154 1207
1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1156 aio_chmod $fh, SAVE_MODE; 1209 aio_chmod $fh, SAVE_MODE;
1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1158 aio_fsync $fh if $cf::USE_FSYNC; 1211 if ($cf::USE_FSYNC) {
1212 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1213 aio_fsync $fh;
1214 }
1159 aio_close $fh; 1215 aio_close $fh;
1160 1216
1161 if (@$objs) { 1217 if (@$objs) {
1162 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1218 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1163 aio_chmod $fh, SAVE_MODE; 1219 aio_chmod $fh, SAVE_MODE;
1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1220 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1165 aio_write $fh, 0, (length $data), $data, 0; 1221 aio_write $fh, 0, (length $data), $data, 0;
1166 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1224 aio_fsync $fh;
1225 }
1167 aio_close $fh; 1226 aio_close $fh;
1168 aio_rename "$filename.pst~", "$filename.pst"; 1227 aio_rename "$filename.pst~", "$filename.pst";
1169 } 1228 }
1170 } else { 1229 } else {
1171 aio_unlink "$filename.pst"; 1230 aio_unlink "$filename.pst";
1172 } 1231 }
1173 1232
1174 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1234
1235 $filename =~ s%/[^/]+$%%;
1236 aio_pathsync $filename if $cf::USE_FSYNC;
1175 } else { 1237 } else {
1176 warn "FATAL: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1177 } 1239 }
1178 } else { 1240 } else {
1179 aio_unlink $filename; 1241 aio_unlink $filename;
1180 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1181 } 1243 }
1205 my $st = eval { Coro::Storable::thaw $av }; 1267 my $st = eval { Coro::Storable::thaw $av };
1206 $av = $st->{objs}; 1268 $av = $st->{objs};
1207 } 1269 }
1208 1270
1209 utf8::decode (my $decname = $filename); 1271 utf8::decode (my $decname = $filename);
1210 warn sprintf "loading %s (%d,%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1211 $decname, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1212 1275
1213 ($data, $av) 1276 ($data, $av)
1214} 1277}
1215 1278
1216=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
1272 my ($name, $cb) = @_; 1335 my ($name, $cb) = @_;
1273 1336
1274 $EXTICMD{$name} = $cb; 1337 $EXTICMD{$name} = $cb;
1275} 1338}
1276 1339
1340use File::Glob ();
1341
1277cf::player->attach ( 1342cf::player->attach (
1278 on_command => sub { 1343 on_unknown_command => sub {
1279 my ($pl, $name, $params) = @_; 1344 my ($pl, $name, $params) = @_;
1280 1345
1281 my $cb = $COMMAND{$name} 1346 my $cb = $COMMAND{$name}
1282 or return; 1347 or return;
1283 1348
1306 1371
1307 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1308 if $reply; 1373 if $reply;
1309 1374
1310 } else { 1375 } else {
1311 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1312 } 1377 }
1313 1378
1314 cf::override; 1379 cf::override;
1315 }, 1380 },
1316); 1381);
1317 1382
1383# "readahead" all extensions
1384sub cache_extensions {
1385 my $grp = IO::AIO::aio_group;
1386
1387 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1388 for (grep /\.ext$/, @{$_[0]}) {
1389 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1390 }
1391 };
1392
1393 $grp
1394}
1395
1318sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1319 cf::sync_job { 1399 cf::sync_job {
1320 my %todo; 1400 my %todo;
1321 1401
1322 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1323 next unless -r $path; 1403 next unless -r $path;
1341 1421
1342 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1422 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1343 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1423 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1344 1424
1345 $ext{source} = 1425 $ext{source} =
1346 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1426 "package $pkg; use common::sense;\n"
1347 . "#line 1 \"$path\"\n{\n" 1427 . "#line 1 \"$path\"\n{\n"
1348 . $source 1428 . $source
1349 . "\n};\n1"; 1429 . "\n};\n1";
1350 1430
1351 $todo{$base} = \%ext; 1431 $todo{$base} = \%ext;
1352 } 1432 }
1353 1433
1434 my $pass = 0;
1354 my %done; 1435 my %done;
1355 while (%todo) { 1436 while (%todo) {
1356 my $progress; 1437 my $progress;
1357 1438
1439 ++$pass;
1440
1441 ext:
1358 while (my ($k, $v) = each %todo) { 1442 while (my ($k, $v) = each %todo) {
1359 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1360 goto skip 1444 next ext
1361 unless exists $done{$_}; 1445 unless exists $done{$_};
1362 } 1446 }
1363 1447
1364 warn "... loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1365 1449
1366 unless (eval $v->{source}) { 1450 my $active = eval $v->{source};
1451
1452 if (length $@) {
1367 my $msg = $@ ? "$v->{path}: $@\n" 1453 error "$v->{path}: $@\n";
1368 : "$v->{base}: extension inactive.\n"; 1454 undef $@; # work around perl 5.10.0 utf-8 caching bug
1369 1455
1370 if (exists $v->{meta}{mandatory}) {
1371 warn $msg;
1372 cf::cleanup "mandatory extension failed to load, exiting."; 1456 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1373 } 1457 if exists $v->{meta}{mandatory};
1374 1458
1375 warn $msg; 1459 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1460 delete $todo{$k};
1461 } else {
1462 $done{$k} = delete $todo{$k};
1463 push @EXTS, $v->{pkg};
1464 $progress = 1;
1465
1466 info "$v->{base}: extension inactive.\n"
1467 unless $active;
1376 } 1468 }
1377
1378 $done{$k} = delete $todo{$k};
1379 push @EXTS, $v->{pkg};
1380 $progress = 1;
1381 } 1469 }
1382 1470
1383 skip: 1471 unless ($progress) {
1384 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1472 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1385 unless $progress; 1473
1474 while (my ($k, $v) = each %todo) {
1475 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1476 if exists $v->{meta}{mandatory};
1477 }
1478 }
1386 } 1479 }
1387 }; 1480 };
1388} 1481}
1389 1482
1390############################################################################# 1483#############################################################################
1444 1537
1445sub exists($) { 1538sub exists($) {
1446 my ($login) = @_; 1539 my ($login) = @_;
1447 1540
1448 $cf::PLAYER{$login} 1541 $cf::PLAYER{$login}
1449 or cf::sync_job { !aio_stat path $login } 1542 or !aio_stat path $login
1450} 1543}
1451 1544
1452sub find($) { 1545sub find($) {
1453 return $cf::PLAYER{$_[0]} || do { 1546 return $cf::PLAYER{$_[0]} || do {
1454 my $login = $_[0]; 1547 my $login = $_[0];
1474 $cf::PLAYER{$login} = $pl 1567 $cf::PLAYER{$login} = $pl
1475 } 1568 }
1476 } 1569 }
1477} 1570}
1478 1571
1572cf::player->attach (
1573 on_load => sub {
1574 my ($pl, $path) = @_;
1575
1576 # restore slots saved in save, below
1577 my $slots = delete $pl->{_slots};
1578
1579 $pl->ob->current_weapon ($slots->[0]);
1580 $pl->combat_ob ($slots->[1]);
1581 $pl->ranged_ob ($slots->[2]);
1582 },
1583);
1584
1479sub save($) { 1585sub save($) {
1480 my ($pl) = @_; 1586 my ($pl) = @_;
1481 1587
1482 return if $pl->{deny_save}; 1588 return if $pl->{deny_save};
1483 1589
1488 1594
1489 aio_mkdir playerdir $pl, 0770; 1595 aio_mkdir playerdir $pl, 0770;
1490 $pl->{last_save} = $cf::RUNTIME; 1596 $pl->{last_save} = $cf::RUNTIME;
1491 1597
1492 cf::get_slot 0.01; 1598 cf::get_slot 0.01;
1599
1600 # save slots, to be restored later
1601 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1493 1602
1494 $pl->save_pl ($path); 1603 $pl->save_pl ($path);
1495 cf::cede_to_tick; 1604 cf::cede_to_tick;
1496} 1605}
1497 1606
1534 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1643 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1535 1644
1536 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1645 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1537 $pl->deactivate; 1646 $pl->deactivate;
1538 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1647 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1539 $pl->ob->check_score;
1540 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1648 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1541 $pl->ns->destroy if $pl->ns; 1649 $pl->ns->destroy if $pl->ns;
1542 1650
1543 my $path = playerdir $pl; 1651 my $path = playerdir $pl;
1544 my $temp = "$path~$cf::RUNTIME~deleting~"; 1652 my $temp = "$path~$cf::RUNTIME~deleting~";
1599 \@logins 1707 \@logins
1600} 1708}
1601 1709
1602=item $player->maps 1710=item $player->maps
1603 1711
1712=item cf::player::maps $login
1713
1604Returns an arrayref of map paths that are private for this 1714Returns an arrayref of map paths that are private for this
1605player. May block. 1715player. May block.
1606 1716
1607=cut 1717=cut
1608 1718
1670=cut 1780=cut
1671 1781
1672sub find_by_path($) { 1782sub find_by_path($) {
1673 my ($path) = @_; 1783 my ($path) = @_;
1674 1784
1785 $path =~ s/^~[^\/]*//; # skip ~login
1786
1675 my ($match, $specificity); 1787 my ($match, $specificity);
1676 1788
1677 for my $region (list) { 1789 for my $region (list) {
1678 if ($region->{match} && $path =~ $region->{match}) { 1790 if ($region->{match} && $path =~ $region->{match}) {
1679 ($match, $specificity) = ($region, $region->specificity) 1791 ($match, $specificity) = ($region, $region->specificity)
1710 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1822 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1711 1823
1712 # mit "rum" bekleckern, nicht 1824 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1825 $self->_create_random_map (
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1826 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1827 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1828 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1717 $rmp->{exit_on_final_map}, 1829 $rmp->{exit_on_final_map},
1718 $rmp->{xsize}, $rmp->{ysize}, 1830 $rmp->{xsize}, $rmp->{ysize},
1719 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1831 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1720 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1832 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1735 1847
1736sub register { 1848sub register {
1737 my (undef, $regex, $prio) = @_; 1849 my (undef, $regex, $prio) = @_;
1738 my $pkg = caller; 1850 my $pkg = caller;
1739 1851
1740 no strict;
1741 push @{"$pkg\::ISA"}, __PACKAGE__; 1852 push @{"$pkg\::ISA"}, __PACKAGE__;
1742 1853
1743 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1744} 1855}
1745 1856
1746# also paths starting with '/' 1857# also paths starting with '/'
1747$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1748 1859
1749sub thawer_merge { 1860sub thawer_merge {
1750 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1751 1862
1752 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
1850 1961
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1962 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1963 "$UNIQUEDIR/$path"
1853} 1964}
1854 1965
1855# and all this just because we cannot iterate over
1856# all maps in C++...
1857sub change_all_map_light {
1858 my ($change) = @_;
1859
1860 $_->change_map_light ($change)
1861 for grep $_->outdoor, values %cf::MAP;
1862}
1863
1864sub decay_objects { 1966sub decay_objects {
1865 my ($self) = @_; 1967 my ($self) = @_;
1866 1968
1867 return if $self->{deny_reset}; 1969 return if $self->{deny_reset};
1868 1970
1950sub find { 2052sub find {
1951 my ($path, $origin) = @_; 2053 my ($path, $origin) = @_;
1952 2054
1953 $path = normalise $path, $origin && $origin->path; 2055 $path = normalise $path, $origin && $origin->path;
1954 2056
1955 cf::lock_wait "map_data:$path";#d#remove 2057 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 2058 my $guard2 = cf::lock_acquire "map_find:$path";
1957 2059
1958 $cf::MAP{$path} || do { 2060 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1960 my $guard2 = cf::lock_acquire "map_find:$path";
1961
1962 my $map = new_from_path cf::map $path 2061 my $map = new_from_path cf::map $path
1963 or return; 2062 or return;
1964 2063
1965 $map->{last_save} = $cf::RUNTIME; 2064 $map->{last_save} = $cf::RUNTIME;
1966 2065
1978 2077
1979 $cf::MAP{$path} = $map 2078 $cf::MAP{$path} = $map
1980 } 2079 }
1981} 2080}
1982 2081
1983sub pre_load { } 2082sub pre_load { }
1984sub post_load { } 2083#sub post_load { } # XS
1985 2084
1986sub load { 2085sub load {
1987 my ($self) = @_; 2086 my ($self) = @_;
1988 2087
1989 local $self->{deny_reset} = 1; # loading can take a long time 2088 local $self->{deny_reset} = 1; # loading can take a long time
2034 unless ($self->{deny_activate}) { 2133 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2134 $self->decay_objects;
2036 $self->fix_auto_apply; 2135 $self->fix_auto_apply;
2037 $self->update_buttons; 2136 $self->update_buttons;
2038 cf::cede_to_tick; 2137 cf::cede_to_tick;
2039 $self->set_darkness_map;
2040 cf::cede_to_tick;
2041 $self->activate; 2138 $self->activate;
2042 } 2139 }
2043 2140
2044 $self->{last_save} = $cf::RUNTIME; 2141 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2142 $self->last_access ($cf::RUNTIME);
2048 } 2145 }
2049 2146
2050 $self->post_load; 2147 $self->post_load;
2051} 2148}
2052 2149
2150# customize the map for a given player, i.e.
2151# return the _real_ map. used by e.g. per-player
2152# maps to change the path to ~playername/mappath
2053sub customise_for { 2153sub customise_for {
2054 my ($self, $ob) = @_; 2154 my ($self, $ob) = @_;
2055 2155
2056 return find "~" . $ob->name . "/" . $self->{path} 2156 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2157 if $self->per_player;
2073 or next; 2173 or next;
2074 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
2075 or next; 2175 or next;
2076 $neigh->load; 2176 $neigh->load;
2077 2177
2178 # now find the diagonal neighbours
2078 push @neigh, 2179 push @neigh,
2079 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2080 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2081 } 2182 }
2082 2183
2089} 2190}
2090 2191
2091sub find_sync { 2192sub find_sync {
2092 my ($path, $origin) = @_; 2193 my ($path, $origin) = @_;
2093 2194
2094 cf::sync_job { find $path, $origin } 2195 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2196 if $Coro::current == $Coro::main;
2197
2198 find $path, $origin
2095} 2199}
2096 2200
2097sub do_load_sync { 2201sub do_load_sync {
2098 my ($map) = @_; 2202 my ($map) = @_;
2099 2203
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2204 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main; 2205 if $Coro::current == $Coro::main;
2102 2206
2103 cf::sync_job { $map->load }; 2207 $map->load;
2104} 2208}
2105 2209
2106our %MAP_PREFETCH; 2210our %MAP_PREFETCH;
2107our $MAP_PREFETCHER = undef; 2211our $MAP_PREFETCHER = undef;
2108 2212
2134 $MAP_PREFETCHER->prio (6); 2238 $MAP_PREFETCHER->prio (6);
2135 2239
2136 () 2240 ()
2137} 2241}
2138 2242
2243# common code, used by both ->save and ->swapout
2139sub save { 2244sub _save {
2140 my ($self) = @_; 2245 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2246
2144 $self->{last_save} = $cf::RUNTIME; 2247 $self->{last_save} = $cf::RUNTIME;
2145 2248
2146 return unless $self->dirty; 2249 return unless $self->dirty;
2147 2250
2167 } else { 2270 } else {
2168 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2271 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2169 } 2272 }
2170} 2273}
2171 2274
2275sub save {
2276 my ($self) = @_;
2277
2278 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279
2280 $self->_save;
2281}
2282
2172sub swap_out { 2283sub swap_out {
2173 my ($self) = @_; 2284 my ($self) = @_;
2174 2285
2175 # save first because save cedes
2176 $self->save;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2287
2180 return if $self->players;
2181 return if $self->in_memory != cf::MAP_ACTIVE; 2288 return if $self->in_memory != cf::MAP_ACTIVE;
2182 return if $self->{deny_save}; 2289 return if $self->{deny_save};
2290 return if $self->players;
2183 2291
2292 # first deactivate the map and "unlink" it from the core
2293 $self->deactivate;
2294 $_->clear_links_to ($self) for values %cf::MAP;
2184 $self->in_memory (cf::MAP_SWAPPED); 2295 $self->in_memory (cf::MAP_SWAPPED);
2296
2297 # then atomically save
2298 $self->_save;
2299
2300 # then free the map
2301 $self->clear;
2302}
2303
2304sub reset_at {
2305 my ($self) = @_;
2306
2307 # TODO: safety, remove and allow resettable per-player maps
2308 return 1e99 if $self->{deny_reset};
2309
2310 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2311 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2312
2313 $time + $to
2314}
2315
2316sub should_reset {
2317 my ($self) = @_;
2318
2319 $self->reset_at <= $cf::RUNTIME
2320}
2321
2322sub reset {
2323 my ($self) = @_;
2324
2325 my $lock = cf::lock_acquire "map_data:$self->{path}";
2326
2327 return if $self->players;
2328
2329 cf::trace "resetting map ", $self->path, "\n";
2330
2331 $self->in_memory (cf::MAP_SWAPPED);
2332
2333 # need to save uniques path
2334 unless ($self->{deny_save}) {
2335 my $uniq = $self->uniq_path; utf8::encode $uniq;
2336
2337 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2338 if $uniq;
2339 }
2340
2341 delete $cf::MAP{$self->path};
2185 2342
2186 $self->deactivate; 2343 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP; 2344 $_->clear_links_to ($self) for values %cf::MAP;
2188 $self->clear; 2345 $self->clear;
2189}
2190
2191sub reset_at {
2192 my ($self) = @_;
2193
2194 # TODO: safety, remove and allow resettable per-player maps
2195 return 1e99 if $self->{deny_reset};
2196
2197 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2198 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2199
2200 $time + $to
2201}
2202
2203sub should_reset {
2204 my ($self) = @_;
2205
2206 $self->reset_at <= $cf::RUNTIME
2207}
2208
2209sub reset {
2210 my ($self) = @_;
2211
2212 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213
2214 return if $self->players;
2215
2216 warn "resetting map ", $self->path;
2217
2218 $self->in_memory (cf::MAP_SWAPPED);
2219
2220 # need to save uniques path
2221 unless ($self->{deny_save}) {
2222 my $uniq = $self->uniq_path; utf8::encode $uniq;
2223
2224 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2225 if $uniq;
2226 }
2227
2228 delete $cf::MAP{$self->path};
2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
2232 $self->clear;
2233 2346
2234 $self->unlink_save; 2347 $self->unlink_save;
2235 $self->destroy; 2348 $self->destroy;
2236} 2349}
2237 2350
2245 2358
2246 delete $cf::MAP{$self->path}; 2359 delete $cf::MAP{$self->path};
2247 2360
2248 $self->unlink_save; 2361 $self->unlink_save;
2249 2362
2250 bless $self, "cf::map"; 2363 bless $self, "cf::map::wrap";
2251 delete $self->{deny_reset}; 2364 delete $self->{deny_reset};
2252 $self->{deny_save} = 1; 2365 $self->{deny_save} = 1;
2253 $self->reset_timeout (1); 2366 $self->reset_timeout (1);
2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2367 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2255 2368
2312 : normalise $_ 2425 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2426 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2427 ]
2315} 2428}
2316 2429
2430=item cf::map::static_maps
2431
2432Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2433file in the shared directory excluding F</styles> and F</editor>). May
2434block.
2435
2436=cut
2437
2438sub static_maps() {
2439 my @dirs = "";
2440 my @maps;
2441
2442 while (@dirs) {
2443 my $dir = shift @dirs;
2444
2445 next if $dir eq "/styles" || $dir eq "/editor";
2446
2447 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2448 or return;
2449
2450 for (@$files) {
2451 s/\.map$// or next;
2452 utf8::decode $_;
2453 push @maps, "$dir/$_";
2454 }
2455
2456 push @dirs, map "$dir/$_", @$dirs;
2457 }
2458
2459 \@maps
2460}
2461
2317=back 2462=back
2318 2463
2319=head3 cf::object 2464=head3 cf::object
2320 2465
2321=cut 2466=cut
2386 2531
2387our $SAY_CHANNEL = { 2532our $SAY_CHANNEL = {
2388 id => "say", 2533 id => "say",
2389 title => "Map", 2534 title => "Map",
2390 reply => "say ", 2535 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2536 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2392}; 2537};
2393 2538
2394our $CHAT_CHANNEL = { 2539our $CHAT_CHANNEL = {
2395 id => "chat", 2540 id => "chat",
2396 title => "Chat", 2541 title => "Chat",
2453 2598
2454Freezes the player and moves him/her to a special map (C<{link}>). 2599Freezes the player and moves him/her to a special map (C<{link}>).
2455 2600
2456The player should be reasonably safe there for short amounts of time (e.g. 2601The player should be reasonably safe there for short amounts of time (e.g.
2457for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2602for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2458though, as the palyer cannot control the character while it is on the link 2603though, as the player cannot control the character while it is on the link
2459map. 2604map.
2460 2605
2461Will never block. 2606Will never block.
2462 2607
2463=item $player_object->leave_link ($map, $x, $y) 2608=item $player_object->leave_link ($map, $x, $y)
2484sub cf::object::player::enter_link { 2629sub cf::object::player::enter_link {
2485 my ($self) = @_; 2630 my ($self) = @_;
2486 2631
2487 $self->deactivate_recursive; 2632 $self->deactivate_recursive;
2488 2633
2634 ++$self->{_link_recursion};
2635
2489 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2636 return if UNIVERSAL::isa $self->map, "ext::map_link";
2490 2637
2491 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2638 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2492 if $self->map && $self->map->{path} ne "{link}"; 2639 if $self->map && $self->map->{path} ne "{link}";
2493 2640
2494 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2641 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2495} 2642}
2496 2643
2497sub cf::object::player::leave_link { 2644sub cf::object::player::leave_link {
2498 my ($self, $map, $x, $y) = @_; 2645 my ($self, $map, $x, $y) = @_;
2499 2646
2516 ($x, $y) = (-1, -1) 2663 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2664 unless (defined $x) && (defined $y);
2518 2665
2519 # use -1 or undef as default coordinates, not 0, 0 2666 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2667 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2668 if $x <= 0 && $y <= 0;
2522 2669
2523 $map->load; 2670 $map->load;
2524 $map->load_neighbours; 2671 $map->load_neighbours;
2525 2672
2526 return unless $self->contr->active; 2673 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2674
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2675 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2676 if ($self->enter_map ($map, $x, $y)) {
2532} 2677 # entering was successful
2678 delete $self->{_link_recursion};
2679 # only activate afterwards, to support waiting in hooks
2680 $self->activate_recursive;
2681 }
2533 2682
2683}
2684
2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2685=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2535 2686
2536Moves the player to the given map-path and coordinates by first freezing 2687Moves the player to the given map-path and coordinates by first freezing
2537her, loading and preparing them map, calling the provided $check callback 2688her, loading and preparing them map, calling the provided $check callback
2538that has to return the map if sucecssful, and then unfreezes the player on 2689that has to return the map if sucecssful, and then unfreezes the player on
2539the new (success) or old (failed) map position. In either case, $done will 2690the new (success) or old (failed) map position. In either case, $done will
2546 2697
2547our $GOTOGEN; 2698our $GOTOGEN;
2548 2699
2549sub cf::object::player::goto { 2700sub cf::object::player::goto {
2550 my ($self, $path, $x, $y, $check, $done) = @_; 2701 my ($self, $path, $x, $y, $check, $done) = @_;
2702
2703 if ($self->{_link_recursion} >= $MAX_LINKS) {
2704 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2705 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2706 ($path, $x, $y) = @$EMERGENCY_POSITION;
2707 }
2551 2708
2552 # do generation counting so two concurrent goto's will be executed in-order 2709 # do generation counting so two concurrent goto's will be executed in-order
2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2710 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2554 2711
2555 $self->enter_link; 2712 $self->enter_link;
2579 my $map = eval { 2736 my $map = eval {
2580 my $map = defined $path ? cf::map::find $path : undef; 2737 my $map = defined $path ? cf::map::find $path : undef;
2581 2738
2582 if ($map) { 2739 if ($map) {
2583 $map = $map->customise_for ($self); 2740 $map = $map->customise_for ($self);
2584 $map = $check->($map) if $check && $map; 2741 $map = $check->($map, $x, $y, $self) if $check && $map;
2585 } else { 2742 } else {
2586 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2743 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2587 } 2744 }
2588 2745
2589 $map 2746 $map
2597 if ($gen == $self->{_goto_generation}) { 2754 if ($gen == $self->{_goto_generation}) {
2598 delete $self->{_goto_generation}; 2755 delete $self->{_goto_generation};
2599 $self->leave_link ($map, $x, $y); 2756 $self->leave_link ($map, $x, $y);
2600 } 2757 }
2601 2758
2602 $done->() if $done; 2759 $done->($self) if $done;
2603 })->prio (1); 2760 })->prio (1);
2604} 2761}
2605 2762
2606=item $player_object->enter_exit ($exit_object) 2763=item $player_object->enter_exit ($exit_object)
2607 2764
2700 $self->message ("Something went wrong deep within the deliantra server. " 2857 $self->message ("Something went wrong deep within the deliantra server. "
2701 . "I'll try to bring you back to the map you were before. " 2858 . "I'll try to bring you back to the map you were before. "
2702 . "Please report this to the dungeon master!", 2859 . "Please report this to the dungeon master!",
2703 cf::NDI_UNIQUE | cf::NDI_RED); 2860 cf::NDI_UNIQUE | cf::NDI_RED);
2704 2861
2705 warn "ERROR in enter_exit: $@"; 2862 error "ERROR in enter_exit: $@";
2706 $self->leave_link; 2863 $self->leave_link;
2707 } 2864 }
2708 })->prio (1); 2865 })->prio (1);
2709} 2866}
2710 2867
2722sub cf::client::send_drawinfo { 2879sub cf::client::send_drawinfo {
2723 my ($self, $text, $flags) = @_; 2880 my ($self, $text, $flags) = @_;
2724 2881
2725 utf8::encode $text; 2882 utf8::encode $text;
2726 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2883 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2884}
2885
2886=item $client->send_big_packet ($pkt)
2887
2888Like C<send_packet>, but tries to compress large packets, and fragments
2889them as required.
2890
2891=cut
2892
2893our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2894
2895sub cf::client::send_big_packet {
2896 my ($self, $pkt) = @_;
2897
2898 # try lzf for large packets
2899 $pkt = "lzf " . Compress::LZF::compress $pkt
2900 if 1024 <= length $pkt and $self->{can_lzf};
2901
2902 # split very large packets
2903 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2904 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2905 $pkt = "frag";
2906 }
2907
2908 $self->send_packet ($pkt);
2727} 2909}
2728 2910
2729=item $client->send_msg ($channel, $msg, $color, [extra...]) 2911=item $client->send_msg ($channel, $msg, $color, [extra...])
2730 2912
2731Send a drawinfo or msg packet to the client, formatting the msg for the 2913Send a drawinfo or msg packet to the client, formatting the msg for the
2735 2917
2736=cut 2918=cut
2737 2919
2738# non-persistent channels (usually the info channel) 2920# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 2921our %CHANNEL = (
2922 "c/motd" => {
2923 id => "infobox",
2924 title => "MOTD",
2925 reply => undef,
2926 tooltip => "The message of the day",
2927 },
2740 "c/identify" => { 2928 "c/identify" => {
2741 id => "infobox", 2929 id => "infobox",
2742 title => "Identify", 2930 title => "Identify",
2743 reply => undef, 2931 reply => undef,
2744 tooltip => "Items recently identified", 2932 tooltip => "Items recently identified",
2746 "c/examine" => { 2934 "c/examine" => {
2747 id => "infobox", 2935 id => "infobox",
2748 title => "Examine", 2936 title => "Examine",
2749 reply => undef, 2937 reply => undef,
2750 tooltip => "Signs and other items you examined", 2938 tooltip => "Signs and other items you examined",
2939 },
2940 "c/shopinfo" => {
2941 id => "infobox",
2942 title => "Shop Info",
2943 reply => undef,
2944 tooltip => "What your bargaining skill tells you about the shop",
2751 }, 2945 },
2752 "c/book" => { 2946 "c/book" => {
2753 id => "infobox", 2947 id => "infobox",
2754 title => "Book", 2948 title => "Book",
2755 reply => undef, 2949 reply => undef,
2771 id => "infobox", 2965 id => "infobox",
2772 title => "Body Parts", 2966 title => "Body Parts",
2773 reply => undef, 2967 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available", 2968 tooltip => "Shows which body parts you posess and are available",
2775 }, 2969 },
2970 "c/statistics" => {
2971 id => "infobox",
2972 title => "Statistics",
2973 reply => undef,
2974 tooltip => "Shows your primary statistics",
2975 },
2776 "c/skills" => { 2976 "c/skills" => {
2777 id => "infobox", 2977 id => "infobox",
2778 title => "Skills", 2978 title => "Skills",
2779 reply => undef, 2979 reply => undef,
2780 tooltip => "Shows your experience per skill and item power", 2980 tooltip => "Shows your experience per skill and item power",
2981 },
2982 "c/shopitems" => {
2983 id => "infobox",
2984 title => "Shop Items",
2985 reply => undef,
2986 tooltip => "Shows the items currently for sale in this shop",
2987 },
2988 "c/resistances" => {
2989 id => "infobox",
2990 title => "Resistances",
2991 reply => undef,
2992 tooltip => "Shows your resistances",
2993 },
2994 "c/pets" => {
2995 id => "infobox",
2996 title => "Pets",
2997 reply => undef,
2998 tooltip => "Shows information abotu your pets/a specific pet",
2999 },
3000 "c/perceiveself" => {
3001 id => "infobox",
3002 title => "Perceive Self",
3003 reply => undef,
3004 tooltip => "You gained detailed knowledge about yourself",
2781 }, 3005 },
2782 "c/uptime" => { 3006 "c/uptime" => {
2783 id => "infobox", 3007 id => "infobox",
2784 title => "Uptime", 3008 title => "Uptime",
2785 reply => undef, 3009 reply => undef,
2795 id => "party", 3019 id => "party",
2796 title => "Party", 3020 title => "Party",
2797 reply => "gsay ", 3021 reply => "gsay ",
2798 tooltip => "Messages and chat related to your party", 3022 tooltip => "Messages and chat related to your party",
2799 }, 3023 },
3024 "c/death" => {
3025 id => "death",
3026 title => "Death",
3027 reply => undef,
3028 tooltip => "Reason for and more info about your most recent death",
3029 },
3030 "c/say" => $SAY_CHANNEL,
3031 "c/chat" => $CHAT_CHANNEL,
2800); 3032);
2801 3033
2802sub cf::client::send_msg { 3034sub cf::client::send_msg {
2803 my ($self, $channel, $msg, $color, @extra) = @_; 3035 my ($self, $channel, $msg, $color, @extra) = @_;
2804 3036
2809 3041
2810 # check predefined channels, for the benefit of C 3042 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 3043 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 3044 $channel = $CHANNEL{$channel};
2813 3045
2814 $self->ext_msg (channel_info => $channel) 3046 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 3047 $channel = $channel->{id};
2818 3048
2819 } elsif (ref $channel) { 3049 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 3050 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 3051 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 3052 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 3053 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 3054 }
2826 3055
2827 $channel = $channel->{id}; 3056 $channel = $channel->{id};
2828 } 3057 }
2829 3058
2830 return unless @extra || length $msg; 3059 return unless @extra || length $msg;
2831 3060
2832 if ($self->can_msg) {
2833 # default colour, mask it out 3061 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3062 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 3063 if $color & cf::NDI_DEF;
2836 3064
2837 my $pkt = "msg " 3065 my $pkt = "msg "
2838 . $self->{json_coder}->encode ( 3066 . $self->{json_coder}->encode (
2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3067 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 ); 3068 );
2841 3069
2842 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf};
2845
2846 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag";
2850 }
2851
2852 $self->send_packet ($pkt); 3070 $self->send_big_packet ($pkt);
2853 } else {
2854 if ($color >= 0) {
2855 # replace some tags by gcfclient-compatible ones
2856 for ($msg) {
2857 1 while
2858 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2859 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2860 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2861 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2862 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2863 }
2864
2865 $color &= cf::NDI_COLOR_MASK;
2866
2867 utf8::encode $msg;
2868
2869 if (0 && $msg =~ /\[/) {
2870 # COMMAND/INFO
2871 $self->send_packet ("drawextinfo $color 10 8 $msg")
2872 } else {
2873 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2874 $self->send_packet ("drawinfo $color $msg")
2875 }
2876 }
2877 }
2878} 3071}
2879 3072
2880=item $client->ext_msg ($type, @msg) 3073=item $client->ext_msg ($type, @msg)
2881 3074
2882Sends an ext event to the client. 3075Sends an ext event to the client.
2885 3078
2886sub cf::client::ext_msg($$@) { 3079sub cf::client::ext_msg($$@) {
2887 my ($self, $type, @msg) = @_; 3080 my ($self, $type, @msg) = @_;
2888 3081
2889 if ($self->extcmd == 2) { 3082 if ($self->extcmd == 2) {
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3083 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2891 } elsif ($self->extcmd == 1) { # TODO: remove 3084 } elsif ($self->extcmd == 1) { # TODO: remove
2892 push @msg, msgtype => "event_$type"; 3085 push @msg, msgtype => "event_$type";
2893 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3086 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2894 } 3087 }
2895} 3088}
2896 3089
2897=item $client->ext_reply ($msgid, @msg) 3090=item $client->ext_reply ($msgid, @msg)
2898 3091
2902 3095
2903sub cf::client::ext_reply($$@) { 3096sub cf::client::ext_reply($$@) {
2904 my ($self, $id, @msg) = @_; 3097 my ($self, $id, @msg) = @_;
2905 3098
2906 if ($self->extcmd == 2) { 3099 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3100 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2908 } elsif ($self->extcmd == 1) { 3101 } elsif ($self->extcmd == 1) {
2909 #TODO: version 1, remove 3102 #TODO: version 1, remove
2910 unshift @msg, msgtype => "reply", msgid => $id; 3103 unshift @msg, msgtype => "reply", msgid => $id;
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3104 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2912 } 3105 }
2913} 3106}
2914 3107
2915=item $success = $client->query ($flags, "text", \&cb) 3108=item $success = $client->query ($flags, "text", \&cb)
2916 3109
2987 3180
2988 $ns->ext_reply ($reply, @reply) 3181 $ns->ext_reply ($reply, @reply)
2989 if $reply; 3182 if $reply;
2990 3183
2991 } else { 3184 } else {
2992 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3185 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2993 } 3186 }
2994 3187
2995 cf::override; 3188 cf::override;
2996 }, 3189 },
2997); 3190);
3017 3210
3018 $coro 3211 $coro
3019} 3212}
3020 3213
3021cf::client->attach ( 3214cf::client->attach (
3022 on_destroy => sub { 3215 on_client_destroy => sub {
3023 my ($ns) = @_; 3216 my ($ns) = @_;
3024 3217
3025 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3218 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3026 }, 3219 },
3027); 3220);
3043our $safe_hole = new Safe::Hole; 3236our $safe_hole = new Safe::Hole;
3044 3237
3045$SIG{FPE} = 'IGNORE'; 3238$SIG{FPE} = 'IGNORE';
3046 3239
3047$safe->permit_only (Opcode::opset qw( 3240$safe->permit_only (Opcode::opset qw(
3048 :base_core :base_mem :base_orig :base_math 3241 :base_core :base_mem :base_orig :base_math :base_loop
3049 grepstart grepwhile mapstart mapwhile 3242 grepstart grepwhile mapstart mapwhile
3050 sort time 3243 sort time
3051)); 3244));
3052 3245
3053# here we export the classes and methods available to script code 3246# here we export the classes and methods available to script code
3057The following functions and methods are available within a safe environment: 3250The following functions and methods are available within a safe environment:
3058 3251
3059 cf::object 3252 cf::object
3060 contr pay_amount pay_player map x y force_find force_add destroy 3253 contr pay_amount pay_player map x y force_find force_add destroy
3061 insert remove name archname title slaying race decrease split 3254 insert remove name archname title slaying race decrease split
3255 value
3062 3256
3063 cf::object::player 3257 cf::object::player
3064 player 3258 player
3065 3259
3066 cf::player 3260 cf::player
3072=cut 3266=cut
3073 3267
3074for ( 3268for (
3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3269 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3076 insert remove inv nrof name archname title slaying race 3270 insert remove inv nrof name archname title slaying race
3077 decrease split destroy change_exp)], 3271 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3272 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful)], 3273 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3274 ["cf::map" => qw(trigger)],
3081) { 3275) {
3082 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3276 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3277 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3085 for @funs; 3278 for @funs;
3086} 3279}
3087 3280
3102 3295
3103 my $qcode = $code; 3296 my $qcode = $code;
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3297 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3298 $qcode =~ s/\n/\\n/g;
3106 3299
3300 %vars = (_dummy => 0) unless %vars;
3301
3302 my @res;
3107 local $_; 3303 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars;
3109 3304
3110 my $eval = 3305 my $eval =
3111 "do {\n" 3306 "do {\n"
3112 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3307 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3113 . "#line 0 \"{$qcode}\"\n" 3308 . "#line 0 \"{$qcode}\"\n"
3114 . $code 3309 . $code
3115 . "\n}" 3310 . "\n}"
3116 ; 3311 ;
3117 3312
3313 if ($CFG{safe_eval}) {
3118 sub_generation_inc; 3314 sub_generation_inc;
3315 local @safe::cf::_safe_eval_args = values %vars;
3119 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3316 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3120 sub_generation_inc; 3317 sub_generation_inc;
3318 } else {
3319 local @cf::_safe_eval_args = values %vars;
3320 @res = wantarray ? eval eval : scalar eval $eval;
3321 }
3121 3322
3122 if ($@) { 3323 if ($@) {
3123 warn "$@"; 3324 warn "$@",
3124 warn "while executing safe code '$code'\n"; 3325 "while executing safe code '$code'\n",
3125 warn "with arguments " . (join " ", %vars) . "\n"; 3326 "with arguments " . (join " ", %vars) . "\n";
3126 } 3327 }
3127 3328
3128 wantarray ? @res : $res[0] 3329 wantarray ? @res : $res[0]
3129} 3330}
3130 3331
3144=cut 3345=cut
3145 3346
3146sub register_script_function { 3347sub register_script_function {
3147 my ($fun, $cb) = @_; 3348 my ($fun, $cb) = @_;
3148 3349
3149 no strict 'refs'; 3350 $fun = "safe::$fun" if $CFG{safe_eval};
3150 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3351 *$fun = $safe_hole->wrap ($cb);
3151} 3352}
3152 3353
3153=back 3354=back
3154 3355
3155=cut 3356=cut
3164 # for this (global event?) 3365 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = (); 3366 %ext::player_env::MUSIC_FACE_CACHE = ();
3166 3367
3167 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3368 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3168 3369
3169 warn "loading facedata from $path\n"; 3370 trace "loading facedata from $path\n";
3170 3371
3171 my $facedata; 3372 my $facedata;
3172 0 < aio_load $path, $facedata 3373 0 < aio_load $path, $facedata
3173 or die "$path: $!"; 3374 or die "$path: $!";
3174 3375
3176 3377
3177 $facedata->{version} == 2 3378 $facedata->{version} == 2
3178 or cf::cleanup "$path: version mismatch, cannot proceed."; 3379 or cf::cleanup "$path: version mismatch, cannot proceed.";
3179 3380
3180 # patch in the exptable 3381 # patch in the exptable
3382 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3181 $facedata->{resource}{"res/exp_table"} = { 3383 $facedata->{resource}{"res/exp_table"} = {
3182 type => FT_RSRC, 3384 type => FT_RSRC,
3183 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3385 data => $exp_table,
3386 hash => (Digest::MD5::md5 $exp_table),
3184 }; 3387 };
3185 cf::cede_to_tick; 3388 cf::cede_to_tick;
3186 3389
3187 { 3390 {
3188 my $faces = $facedata->{faceinfo}; 3391 my $faces = $facedata->{faceinfo};
3190 while (my ($face, $info) = each %$faces) { 3393 while (my ($face, $info) = each %$faces) {
3191 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3394 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192 3395
3193 cf::face::set_visibility $idx, $info->{visibility}; 3396 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap}; 3397 cf::face::set_magicmap $idx, $info->{magicmap};
3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3398 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3399 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3197 3400
3198 cf::cede_to_tick; 3401 cf::cede_to_tick;
3199 } 3402 }
3200 3403
3201 while (my ($face, $info) = each %$faces) { 3404 while (my ($face, $info) = each %$faces) {
3206 3409
3207 if (my $smooth = cf::face::find $info->{smooth}) { 3410 if (my $smooth = cf::face::find $info->{smooth}) {
3208 cf::face::set_smooth $idx, $smooth; 3411 cf::face::set_smooth $idx, $smooth;
3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3412 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3210 } else { 3413 } else {
3211 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3414 error "smooth face '$info->{smooth}' not found for face '$face'";
3212 } 3415 }
3213 3416
3214 cf::cede_to_tick; 3417 cf::cede_to_tick;
3215 } 3418 }
3216 } 3419 }
3225 3428
3226 cf::anim::invalidate_all; # d'oh 3429 cf::anim::invalidate_all; # d'oh
3227 } 3430 }
3228 3431
3229 { 3432 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource}; 3433 my $res = $facedata->{resource};
3233 3434
3234 while (my ($name, $info) = each %$res) { 3435 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) { 3436 if (defined $info->{type}) {
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3437 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238 3438
3239 if ($info->{type} & 1) { 3439 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3240 # prepend meta info
3241
3242 my $meta = $enc->encode ({
3243 name => $name,
3244 %{ $info->{meta} || {} },
3245 });
3246
3247 $data = pack "(w/a*)*", $meta, $info->{data};
3248 } else {
3249 $data = $info->{data};
3250 }
3251
3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type}; 3440 cf::face::set_type $idx, $info->{type};
3254 } else { 3441 } else {
3255 $RESOURCE{$name} = $info; 3442 $RESOURCE{$name} = $info; # unused
3256 } 3443 }
3257 3444
3258 cf::cede_to_tick; 3445 cf::cede_to_tick;
3259 } 3446 }
3260 } 3447 }
3261 3448
3262 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3449 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3263 3450
3264 1 3451 1
3265} 3452}
3266
3267cf::global->attach (on_resource_update => sub {
3268 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3269 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3270
3271 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3272 my $sound = $soundconf->{compat}[$_]
3273 or next;
3274
3275 my $face = cf::face::find "sound/$sound->[1]";
3276 cf::sound::set $sound->[0] => $face;
3277 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3278 }
3279
3280 while (my ($k, $v) = each %{$soundconf->{event}}) {
3281 my $face = cf::face::find "sound/$v";
3282 cf::sound::set $k => $face;
3283 }
3284 }
3285});
3286 3453
3287register_exticmd fx_want => sub { 3454register_exticmd fx_want => sub {
3288 my ($ns, $want) = @_; 3455 my ($ns, $want) = @_;
3289 3456
3290 while (my ($k, $v) = each %$want) { 3457 while (my ($k, $v) = each %$want) {
3329sub reload_treasures { 3496sub reload_treasures {
3330 load_resource_file "$DATADIR/treasures" 3497 load_resource_file "$DATADIR/treasures"
3331 or die "unable to load treasurelists\n"; 3498 or die "unable to load treasurelists\n";
3332} 3499}
3333 3500
3501sub reload_sound {
3502 trace "loading sound config from $DATADIR/sound\n";
3503
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);
3508
3509 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3510 my $sound = $soundconf->{compat}[$_]
3511 or next;
3512
3513 my $face = cf::face::find "sound/$sound->[1]";
3514 cf::sound::set $sound->[0] => $face;
3515 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3516 }
3517
3518 while (my ($k, $v) = each %{$soundconf->{event}}) {
3519 my $face = cf::face::find "sound/$v";
3520 cf::sound::set $k => $face;
3521 }
3522}
3523
3334sub reload_resources { 3524sub reload_resources {
3335 warn "reloading resource files...\n"; 3525 trace "reloading resource files...\n";
3336 3526
3337 reload_facedata; 3527 reload_facedata;
3528 reload_sound;
3338 reload_archetypes; 3529 reload_archetypes;
3339 reload_regions; 3530 reload_regions;
3340 reload_treasures; 3531 reload_treasures;
3341 3532
3342 warn "finished reloading resource files\n"; 3533 trace "finished reloading resource files\n";
3343}
3344
3345sub init {
3346 my $guard = freeze_mainloop;
3347
3348 evthread_start IO::AIO::poll_fileno;
3349
3350 reload_resources;
3351} 3534}
3352 3535
3353sub reload_config { 3536sub reload_config {
3537 trace "reloading config file...\n";
3538
3354 open my $fh, "<:utf8", "$CONFDIR/config" 3539 open my $fh, "<:utf8", "$CONFDIR/config"
3355 or return; 3540 or return;
3356 3541
3357 local $/; 3542 local $/;
3358 *CFG = YAML::Load <$fh>; 3543 *CFG = YAML::XS::Load scalar <$fh>;
3359 3544
3360 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3545 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3361 3546
3362 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3547 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3363 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3548 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3364 3549
3365 if (exists $CFG{mlockall}) { 3550 if (exists $CFG{mlockall}) {
3367 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3552 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3368 and die "WARNING: m(un)lockall failed: $!\n"; 3553 and die "WARNING: m(un)lockall failed: $!\n";
3369 }; 3554 };
3370 warn $@ if $@; 3555 warn $@ if $@;
3371 } 3556 }
3557
3558 trace "finished reloading resource files\n";
3372} 3559}
3373 3560
3374sub pidfile() { 3561sub pidfile() {
3375 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3562 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3376 or die "$PIDFILE: $!"; 3563 or die "$PIDFILE: $!";
3388 3575
3389 seek $fh, 0, 0; 3576 seek $fh, 0, 0;
3390 print $fh $$; 3577 print $fh $$;
3391} 3578}
3392 3579
3580sub main_loop {
3581 trace "EV::loop starting\n";
3582 if (1) {
3583 EV::loop;
3584 }
3585 trace "EV::loop returned\n";
3586 goto &main_loop unless $REALLY_UNLOOP;
3587}
3588
3393sub main { 3589sub main {
3394 atomic; 3590 cf::init_globals; # initialise logging
3591
3592 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3593 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3594 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3595 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3596
3597 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 3598
3396 # we must not ever block the main coroutine 3599 # we must not ever block the main coroutine
3397 local $Coro::idle = sub { 3600 local $Coro::idle = sub {
3398 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3601 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3399 (async { 3602 (async {
3400 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3603 $Coro::current->{desc} = "IDLE BUG HANDLER";
3401 EV::loop EV::LOOP_ONESHOT; 3604 EV::loop EV::LOOP_ONESHOT;
3402 })->prio (Coro::PRIO_MAX); 3605 })->prio (Coro::PRIO_MAX);
3403 }; 3606 };
3404 3607
3405 { 3608 evthread_start IO::AIO::poll_fileno;
3406 my $guard = freeze_mainloop; 3609
3610 cf::sync_job {
3611 cf::init_experience;
3612 cf::init_anim;
3613 cf::init_attackmess;
3614 cf::init_dynamic;
3615
3616 cf::load_settings;
3617 cf::load_materials;
3618
3619 reload_resources;
3407 reload_config; 3620 reload_config;
3408 db_init; 3621 db_init;
3622
3623 cf::init_uuid;
3624 cf::init_signals;
3625 cf::init_skills;
3626
3627 cf::init_beforeplay;
3628
3629 atomic;
3630
3409 load_extensions; 3631 load_extensions;
3410 3632
3411 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3412 }
3413
3414 utime time, time, $RUNTIMEFILE; 3633 utime time, time, $RUNTIMEFILE;
3415 3634
3416 # no (long-running) fork's whatsoever before this point(!) 3635 # no (long-running) fork's whatsoever before this point(!)
3636 use POSIX ();
3417 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3637 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3418 3638
3419 EV::loop; 3639 (pop @POST_INIT)->(0) while @POST_INIT;
3640 };
3641
3642 cf::object::thawer::errors_are_fatal 0;
3643 info "parse errors in files are no longer fatal from this point on.\n";
3644
3645 main_loop;
3420} 3646}
3421 3647
3422############################################################################# 3648#############################################################################
3423# initialisation and cleanup 3649# initialisation and cleanup
3424 3650
3425# install some emergency cleanup handlers 3651# install some emergency cleanup handlers
3426BEGIN { 3652BEGIN {
3427 our %SIGWATCHER = (); 3653 our %SIGWATCHER = ();
3428 for my $signal (qw(INT HUP TERM)) { 3654 for my $signal (qw(INT HUP TERM)) {
3429 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3655 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3430 cf::cleanup "SIG$signal"; 3656 cf::cleanup "SIG$signal";
3431 }; 3657 };
3432 } 3658 }
3433} 3659}
3434 3660
3435sub write_runtime_sync { 3661sub write_runtime_sync {
3662 my $t0 = AE::time;
3663
3436 # first touch the runtime file to show we are still running: 3664 # first touch the runtime file to show we are still running:
3437 # the fsync below can take a very very long time. 3665 # the fsync below can take a very very long time.
3438 3666
3439 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3667 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3440 3668
3441 my $guard = cf::lock_acquire "write_runtime"; 3669 my $guard = cf::lock_acquire "write_runtime";
3442 3670
3443 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3671 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3444 or return; 3672 or return;
3445 3673
3446 my $value = $cf::RUNTIME + 90 + 10; 3674 my $value = $cf::RUNTIME + 90 + 10;
3447 # 10 is the runtime save interval, for a monotonic clock 3675 # 10 is the runtime save interval, for a monotonic clock
3448 # 60 allows for the watchdog to kill the server. 3676 # 60 allows for the watchdog to kill the server.
3461 or return; 3689 or return;
3462 3690
3463 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3691 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3464 and return; 3692 and return;
3465 3693
3466 warn "runtime file written.\n"; 3694 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3467 3695
3468 1 3696 1
3469} 3697}
3470 3698
3471our $uuid_lock; 3699our $uuid_lock;
3480 my $uuid = "$LOCALDIR/uuid"; 3708 my $uuid = "$LOCALDIR/uuid";
3481 3709
3482 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3710 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3483 or return; 3711 or return;
3484 3712
3485 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3713 my $value = uuid_seq uuid_cur;
3714
3715 unless ($value) {
3716 info "cowardly refusing to write zero uuid value!\n";
3717 return;
3718 }
3719
3720 my $value = uuid_str $value + $uuid_skip;
3486 $uuid_skip = 0; 3721 $uuid_skip = 0;
3487 3722
3488 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3723 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3489 and return; 3724 and return;
3490 3725
3496 or return; 3731 or return;
3497 3732
3498 aio_rename "$uuid~", $uuid 3733 aio_rename "$uuid~", $uuid
3499 and return; 3734 and return;
3500 3735
3501 warn "uuid file written ($value).\n"; 3736 trace "uuid file written ($value).\n";
3502 3737
3503 1 3738 1
3504 3739
3505} 3740}
3506 3741
3512} 3747}
3513 3748
3514sub emergency_save() { 3749sub emergency_save() {
3515 my $freeze_guard = cf::freeze_mainloop; 3750 my $freeze_guard = cf::freeze_mainloop;
3516 3751
3517 warn "enter emergency perl save\n"; 3752 info "emergency_perl_save: enter\n";
3753
3754 # this is a trade-off: we want to be very quick here, so
3755 # save all maps without fsync, and later call a global sync
3756 # (which in turn might be very very slow)
3757 local $USE_FSYNC = 0;
3518 3758
3519 cf::sync_job { 3759 cf::sync_job {
3760 cf::write_runtime_sync; # external watchdog should not bark
3761
3520 # use a peculiar iteration method to avoid tripping on perl 3762 # use a peculiar iteration method to avoid tripping on perl
3521 # refcount bugs in for. also avoids problems with players 3763 # refcount bugs in for. also avoids problems with players
3522 # and maps saved/destroyed asynchronously. 3764 # and maps saved/destroyed asynchronously.
3523 warn "begin emergency player save\n"; 3765 info "emergency_perl_save: begin player save\n";
3524 for my $login (keys %cf::PLAYER) { 3766 for my $login (keys %cf::PLAYER) {
3525 my $pl = $cf::PLAYER{$login} or next; 3767 my $pl = $cf::PLAYER{$login} or next;
3526 $pl->valid or next; 3768 $pl->valid or next;
3527 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3769 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3528 $pl->save; 3770 $pl->save;
3529 } 3771 }
3530 warn "end emergency player save\n"; 3772 info "emergency_perl_save: end player save\n";
3531 3773
3532 warn "begin emergency map save\n"; 3774 cf::write_runtime_sync; # external watchdog should not bark
3775
3776 info "emergency_perl_save: begin map save\n";
3533 for my $path (keys %cf::MAP) { 3777 for my $path (keys %cf::MAP) {
3534 my $map = $cf::MAP{$path} or next; 3778 my $map = $cf::MAP{$path} or next;
3535 $map->valid or next; 3779 $map->valid or next;
3536 $map->save; 3780 $map->save;
3537 } 3781 }
3538 warn "end emergency map save\n"; 3782 info "emergency_perl_save: end map save\n";
3539 3783
3540 warn "begin emergency database checkpoint\n"; 3784 cf::write_runtime_sync; # external watchdog should not bark
3785
3786 info "emergency_perl_save: begin database checkpoint\n";
3541 BDB::db_env_txn_checkpoint $DB_ENV; 3787 BDB::db_env_txn_checkpoint $DB_ENV;
3542 warn "end emergency database checkpoint\n"; 3788 info "emergency_perl_save: end database checkpoint\n";
3543 3789
3544 warn "begin write uuid\n"; 3790 info "emergency_perl_save: begin write uuid\n";
3545 write_uuid_sync 1; 3791 write_uuid_sync 1;
3546 warn "end write uuid\n"; 3792 info "emergency_perl_save: end write uuid\n";
3793
3794 cf::write_runtime_sync; # external watchdog should not bark
3795
3796 trace "emergency_perl_save: syncing database to disk";
3797 BDB::db_env_txn_checkpoint $DB_ENV;
3798
3799 info "emergency_perl_save: starting sync\n";
3800 IO::AIO::aio_sync sub {
3801 info "emergency_perl_save: finished sync\n";
3802 };
3803
3804 cf::write_runtime_sync; # external watchdog should not bark
3805
3806 trace "emergency_perl_save: flushing outstanding aio requests";
3807 while (IO::AIO::nreqs || BDB::nreqs) {
3808 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3809 }
3810
3811 cf::write_runtime_sync; # external watchdog should not bark
3547 }; 3812 };
3548 3813
3549 warn "leave emergency perl save\n"; 3814 info "emergency_perl_save: leave\n";
3550} 3815}
3551 3816
3552sub post_cleanup { 3817sub post_cleanup {
3553 my ($make_core) = @_; 3818 my ($make_core) = @_;
3554 3819
3820 IO::AIO::flush;
3821
3555 warn Carp::longmess "post_cleanup backtrace" 3822 error Carp::longmess "post_cleanup backtrace"
3556 if $make_core; 3823 if $make_core;
3557 3824
3558 my $fh = pidfile; 3825 my $fh = pidfile;
3559 unlink $PIDFILE if <$fh> == $$; 3826 unlink $PIDFILE if <$fh> == $$;
3560} 3827}
3580 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3847 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3581 for my $name (keys %$leaf_symtab) { 3848 for my $name (keys %$leaf_symtab) {
3582 _gv_clear *{"$pkg$name"}; 3849 _gv_clear *{"$pkg$name"};
3583# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3850# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3584 } 3851 }
3585 warn "cleared package #$pkg\n";#d#
3586} 3852}
3587
3588our $RELOAD; # how many times to reload
3589 3853
3590sub do_reload_perl() { 3854sub do_reload_perl() {
3591 # can/must only be called in main 3855 # can/must only be called in main
3592 if ($Coro::current != $Coro::main) { 3856 if (in_main) {
3593 warn "can only reload from main coroutine"; 3857 error "can only reload from main coroutine";
3594 return; 3858 return;
3595 } 3859 }
3596 3860
3597 return if $RELOAD++; 3861 return if $RELOAD++;
3598 3862
3863 my $t1 = AE::time;
3864
3599 while ($RELOAD) { 3865 while ($RELOAD) {
3600 warn "reloading..."; 3866 info "reloading...";
3601 3867
3602 warn "entering sync_job"; 3868 trace "entering sync_job";
3603 3869
3604 cf::sync_job { 3870 cf::sync_job {
3605 cf::write_runtime_sync; # external watchdog should not bark
3606 cf::emergency_save; 3871 cf::emergency_save;
3607 cf::write_runtime_sync; # external watchdog should not bark
3608 3872
3609 warn "syncing database to disk";
3610 BDB::db_env_txn_checkpoint $DB_ENV;
3611
3612 # if anything goes wrong in here, we should simply crash as we already saved
3613
3614 warn "flushing outstanding aio requests";
3615 while (IO::AIO::nreqs || BDB::nreqs) {
3616 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3617 }
3618
3619 warn "cancelling all extension coros"; 3873 trace "cancelling all extension coros";
3620 $_->cancel for values %EXT_CORO; 3874 $_->cancel for values %EXT_CORO;
3621 %EXT_CORO = (); 3875 %EXT_CORO = ();
3622 3876
3623 warn "removing commands"; 3877 trace "removing commands";
3624 %COMMAND = (); 3878 %COMMAND = ();
3625 3879
3626 warn "removing ext/exti commands"; 3880 trace "removing ext/exti commands";
3627 %EXTCMD = (); 3881 %EXTCMD = ();
3628 %EXTICMD = (); 3882 %EXTICMD = ();
3629 3883
3630 warn "unloading/nuking all extensions"; 3884 trace "unloading/nuking all extensions";
3631 for my $pkg (@EXTS) { 3885 for my $pkg (@EXTS) {
3632 warn "... unloading $pkg"; 3886 trace "... unloading $pkg";
3633 3887
3634 if (my $cb = $pkg->can ("unload")) { 3888 if (my $cb = $pkg->can ("unload")) {
3635 eval { 3889 eval {
3636 $cb->($pkg); 3890 $cb->($pkg);
3637 1 3891 1
3638 } or warn "$pkg unloaded, but with errors: $@"; 3892 } or error "$pkg unloaded, but with errors: $@";
3639 } 3893 }
3640 3894
3641 warn "... clearing $pkg"; 3895 trace "... clearing $pkg";
3642 clear_package $pkg; 3896 clear_package $pkg;
3643 } 3897 }
3644 3898
3645 warn "unloading all perl modules loaded from $LIBDIR"; 3899 trace "unloading all perl modules loaded from $LIBDIR";
3646 while (my ($k, $v) = each %INC) { 3900 while (my ($k, $v) = each %INC) {
3647 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3901 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3648 3902
3649 warn "... unloading $k"; 3903 trace "... unloading $k";
3650 delete $INC{$k}; 3904 delete $INC{$k};
3651 3905
3652 $k =~ s/\.pm$//; 3906 $k =~ s/\.pm$//;
3653 $k =~ s/\//::/g; 3907 $k =~ s/\//::/g;
3654 3908
3657 } 3911 }
3658 3912
3659 clear_package $k; 3913 clear_package $k;
3660 } 3914 }
3661 3915
3662 warn "getting rid of safe::, as good as possible"; 3916 trace "getting rid of safe::, as good as possible";
3663 clear_package "safe::$_" 3917 clear_package "safe::$_"
3664 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3918 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3665 3919
3666 warn "unloading cf.pm \"a bit\""; 3920 trace "unloading cf.pm \"a bit\"";
3667 delete $INC{"cf.pm"}; 3921 delete $INC{"cf.pm"};
3668 delete $INC{"cf/pod.pm"}; 3922 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3669 3923
3670 # don't, removes xs symbols, too, 3924 # don't, removes xs symbols, too,
3671 # and global variables created in xs 3925 # and global variables created in xs
3672 #clear_package __PACKAGE__; 3926 #clear_package __PACKAGE__;
3673 3927
3674 warn "unload completed, starting to reload now"; 3928 info "unload completed, starting to reload now";
3675 3929
3676 warn "reloading cf.pm"; 3930 trace "reloading cf.pm";
3677 require cf; 3931 require cf;
3678 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3932 cf::_connect_to_perl_1;
3679 3933
3680 warn "loading config and database again"; 3934 trace "loading config and database again";
3681 cf::reload_config; 3935 cf::reload_config;
3682 3936
3683 warn "loading extensions"; 3937 trace "loading extensions";
3684 cf::load_extensions; 3938 cf::load_extensions;
3685 3939
3940 if ($REATTACH_ON_RELOAD) {
3686 warn "reattaching attachments to objects/players"; 3941 trace "reattaching attachments to objects/players";
3687 _global_reattach; # objects, sockets 3942 _global_reattach; # objects, sockets
3688 warn "reattaching attachments to maps"; 3943 trace "reattaching attachments to maps";
3689 reattach $_ for values %MAP; 3944 reattach $_ for values %MAP;
3690 warn "reattaching attachments to players"; 3945 trace "reattaching attachments to players";
3691 reattach $_ for values %PLAYER; 3946 reattach $_ for values %PLAYER;
3947 }
3692 3948
3949 trace "running post_init jobs";
3950 (pop @POST_INIT)->(1) while @POST_INIT;
3951
3693 warn "leaving sync_job"; 3952 trace "leaving sync_job";
3694 3953
3695 1 3954 1
3696 } or do { 3955 } or do {
3697 warn $@; 3956 error $@;
3698 cf::cleanup "error while reloading, exiting."; 3957 cf::cleanup "error while reloading, exiting.";
3699 }; 3958 };
3700 3959
3701 warn "reloaded"; 3960 info "reloaded";
3702 --$RELOAD; 3961 --$RELOAD;
3703 } 3962 }
3963
3964 $t1 = AE::time - $t1;
3965 info "reload completed in ${t1}s\n";
3704}; 3966};
3705 3967
3706our $RELOAD_WATCHER; # used only during reload 3968our $RELOAD_WATCHER; # used only during reload
3707 3969
3708sub reload_perl() { 3970sub reload_perl() {
3709 # doing reload synchronously and two reloads happen back-to-back, 3971 # doing reload synchronously and two reloads happen back-to-back,
3710 # coro crashes during coro_state_free->destroy here. 3972 # coro crashes during coro_state_free->destroy here.
3711 3973
3974 $RELOAD_WATCHER ||= cf::async {
3975 Coro::AIO::aio_wait cache_extensions;
3976
3712 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3977 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3713 do_reload_perl; 3978 do_reload_perl;
3714 undef $RELOAD_WATCHER; 3979 undef $RELOAD_WATCHER;
3980 };
3715 }; 3981 };
3716} 3982}
3717 3983
3718register_command "reload" => sub { 3984register_command "reload" => sub {
3719 my ($who, $arg) = @_; 3985 my ($who, $arg) = @_;
3733 3999
3734our @WAIT_FOR_TICK; 4000our @WAIT_FOR_TICK;
3735our @WAIT_FOR_TICK_BEGIN; 4001our @WAIT_FOR_TICK_BEGIN;
3736 4002
3737sub wait_for_tick { 4003sub wait_for_tick {
3738 return if tick_inhibit || $Coro::current == $Coro::main; 4004 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3739 4005
3740 my $signal = new Coro::Signal; 4006 my $signal = new Coro::Signal;
3741 push @WAIT_FOR_TICK, $signal; 4007 push @WAIT_FOR_TICK, $signal;
3742 $signal->wait; 4008 $signal->wait;
3743} 4009}
3744 4010
3745sub wait_for_tick_begin { 4011sub wait_for_tick_begin {
3746 return if tick_inhibit || $Coro::current == $Coro::main; 4012 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3747 4013
3748 my $signal = new Coro::Signal; 4014 my $signal = new Coro::Signal;
3749 push @WAIT_FOR_TICK_BEGIN, $signal; 4015 push @WAIT_FOR_TICK_BEGIN, $signal;
3750 $signal->wait; 4016 $signal->wait;
3751} 4017}
3757 return; 4023 return;
3758 } 4024 }
3759 4025
3760 cf::server_tick; # one server iteration 4026 cf::server_tick; # one server iteration
3761 4027
4028 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4029
3762 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4030 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3763 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4031 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3764 Coro::async_pool { 4032 Coro::async_pool {
3765 $Coro::current->{desc} = "runtime saver"; 4033 $Coro::current->{desc} = "runtime saver";
3766 write_runtime_sync 4034 write_runtime_sync
3767 or warn "ERROR: unable to write runtime file: $!"; 4035 or error "ERROR: unable to write runtime file: $!";
3768 }; 4036 };
3769 } 4037 }
3770 4038
3771 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4039 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3772 $sig->send; 4040 $sig->send;
3780 4048
3781 if (0) { 4049 if (0) {
3782 if ($NEXT_TICK) { 4050 if ($NEXT_TICK) {
3783 my $jitter = $TICK_START - $NEXT_TICK; 4051 my $jitter = $TICK_START - $NEXT_TICK;
3784 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4052 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3785 warn "jitter $JITTER\n";#d# 4053 debug "jitter $JITTER\n";#d#
3786 } 4054 }
3787 } 4055 }
3788} 4056}
3789 4057
3790{ 4058{
3791 # configure BDB 4059 # configure BDB
3792 4060
3793 BDB::min_parallel 8; 4061 BDB::min_parallel 16;
3794 BDB::max_poll_reqs $TICK * 0.1; 4062 BDB::max_poll_reqs $TICK * 0.1;
3795 $AnyEvent::BDB::WATCHER->priority (1); 4063 $AnyEvent::BDB::WATCHER->priority (1);
3796 4064
3797 unless ($DB_ENV) { 4065 unless ($DB_ENV) {
3798 $DB_ENV = BDB::db_env_create; 4066 $DB_ENV = BDB::db_env_create;
3878 LOG llevInfo, "[ABT] [suppressed]\n"; 4146 LOG llevInfo, "[ABT] [suppressed]\n";
3879 } 4147 }
3880} 4148}
3881 4149
3882# load additional modules 4150# load additional modules
3883use cf::pod; 4151require "cf/$_.pm" for @EXTRA_MODULES;
4152cf::_connect_to_perl_2;
3884 4153
3885END { cf::emergency_save } 4154END { cf::emergency_save }
3886 4155
38871 41561
3888 4157

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines