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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines