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.442 by root, Sun Aug 31 09:03:31 2008 UTC vs.
Revision 1.541 by root, Tue May 4 23:33:16 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
63 64
64# configure various modules to our taste 65# configure various modules to our taste
65# 66#
66$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::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
69 75
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71 78
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
76 85
77our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
87our $DATADIR = datadir; 98our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
97our %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;
98 118
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 121our $NEXT_TICK;
102our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
103 123
104our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 127our $DB_ENV;
108 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
109our %CFG; 131our %CFG;
110 132
111our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 134our $RUNTIME;
113our $NOW; 135our $NOW;
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 146our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
126 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 :)
153
127binmode STDOUT; 154binmode STDOUT;
128binmode STDERR; 155binmode STDERR;
129 156
130# read virtual server time, if available 157# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
135} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
136 165
137mkdir $_ 166mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139 168
140our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
141 170
142sub 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::"} };
143 187
144############################################################################# 188#############################################################################
145 189
146=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
147 191
194returns 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
195per 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.
196 240
197=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
198 242
199This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
200C<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
201that call. 245that call.
202 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
203=back 253=back
204 254
205=cut 255=cut
206 256
207BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
208 *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 {
209 my $msg = join "", @_; 264 my $msg = join "", @_;
210 265
211 $msg .= "\n" 266 $msg .= "\n"
212 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
213 268
214 $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;
215 270
216 LOG llevError, $msg; 271 LOG llevWarn, $msg;
217 }; 272};
218}
219 273
220$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
222 276
223 if ($Coro::current == $Coro::main) {#d# 277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d# 281 return;#d#
226 }#d# 282 }#d#
227 283
228 # kill coroutine otherwise 284 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate 285 Coro::terminate
231}; 286};
232
233$SIG{__DIE__} = sub { }; #d#?
234 287
235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
252)) { 305)) {
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 307}
255 308
256$EV::DIED = sub { 309$EV::DIED = sub {
257 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
258}; 311};
259 312
260############################################################################# 313#############################################################################
261 314
262=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
299our $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
300 353
301sub encode_json($) { $json_coder->encode ($_[0]) } 354sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 355sub decode_json($) { $json_coder->decode ($_[0]) }
303 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
304=item cf::lock_wait $string 371=item cf::lock_wait $string
305 372
306Wait until the given lock is available. See cf::lock_acquire. 373Wait until the given lock is available. See cf::lock_acquire.
307 374
308=item my $lock = cf::lock_acquire $string 375=item my $lock = cf::lock_acquire $string
309 376
310Wait 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
311a 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,
312for example when the coroutine gets canceled), the lock is automatically 379for example when the coroutine gets canceled), the lock is automatically
313returned. 380returned.
314 381
315Locks 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
316deadlocked coro. 383deadlocked coro.
322 389
323Return 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.
324 391
325=cut 392=cut
326 393
327our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 395
330sub lock_wait($) { 396sub lock_wait($) {
331 my ($key) = @_; 397 $LOCKS->wait ($_[0]);
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
337
338 # wait for lock, if any
339 while ($LOCK{$key}) {
340 push @{ $LOCK{$key} }, $Coro::current;
341 Coro::schedule;
342 }
343} 398}
344 399
345sub lock_acquire($) { 400sub lock_acquire($) {
346 my ($key) = @_; 401 $LOCKS->guard ($_[0])
347
348 # wait, to be sure we are not locked
349 lock_wait $key;
350
351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
353
354 Coro::guard {
355 delete $LOCKER{$key};#d#
356 # wake up all waiters, to be on the safe side
357 $_->ready for @{ delete $LOCK{$key} };
358 }
359} 402}
360 403
361sub lock_active($) { 404sub lock_active($) {
362 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 406}
366 407
367sub freeze_mainloop { 408sub freeze_mainloop {
368 tick_inhibit_inc; 409 tick_inhibit_inc;
369 410
370 Coro::guard \&tick_inhibit_dec; 411 &Guard::guard (\&tick_inhibit_dec);
371} 412}
372 413
373=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
374 415
375Like 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
376get spread over timer. 417get spread over time.
377 418
378=cut 419=cut
379 420
380sub periodic($$) { 421sub periodic($$) {
381 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
398 439
399=cut 440=cut
400 441
401our @SLOT_QUEUE; 442our @SLOT_QUEUE;
402our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
403 445
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
407 449
408 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
409 452
410 while () { 453 while () {
411 next_job: 454 next_job:
455
412 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 457
414 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 462 $job->[2]->send;
418 Coro::cede; 463 Coro::cede;
419 goto next_job; 464 goto next_job;
420 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 467 }
422 } 468 }
423 469
424 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
425 # 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
426 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 473 $signal->wait;
428 } else { 474 } else {
475 $busy = 0;
429 Coro::schedule; 476 Coro::schedule;
430 } 477 }
431 } 478 }
432}; 479};
433 480
434sub get_slot($;$$) { 481sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 482 return if tick_inhibit || $Coro::current == $Coro::main;
436 483
437 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
438 485
439 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
440 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
441 489
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
470=cut 518=cut
471 519
472sub sync_job(&) { 520sub sync_job(&) {
473 my ($job) = @_; 521 my ($job) = @_;
474 522
475 if ($Coro::current == $Coro::main) { 523 if (in_main) {
476 my $time = EV::time; 524 my $time = AE::time;
477 525
478 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
480 528
481 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
482 530
483 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
484 532
485 my $busy = 1; 533 my $busy = 1;
486 my @res; 534 my @res;
487 535
488 (async { 536 (async {
489 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 538 @res = eval { $job->() };
491 warn $@ if $@; 539 error $@ if $@;
492 undef $busy; 540 undef $busy;
493 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
494 542
495 while ($busy) { 543 while ($busy) {
496 if (Coro::nready) { 544 if (Coro::nready) {
498 } else { 546 } else {
499 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
500 } 548 }
501 } 549 }
502 550
503 my $time = EV::time - $time; 551 my $time = AE::time - $time;
504 552
505 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
506 554
507 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
508 } else { 556 } else {
552 reset_signals; 600 reset_signals;
553 &$cb 601 &$cb
554 }, @args; 602 }, @args;
555 603
556 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 )
557} 616}
558 617
559=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
560 619
561=cut 620=cut
598within each server. 657within each server.
599 658
600=cut 659=cut
601 660
602sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
603 my ($name) = @_; 665 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
605 667
606 eval { 668 eval {
607 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
617} 679}
618 680
619our $DB; 681our $DB;
620 682
621sub db_init { 683sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
624 };
625} 685}
626 686
627sub db_get($$) { 687sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
629 689
630 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
631 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
632 694
633 $! ? () 695 $! ? ()
634 : $data 696 : $data
635 }
636} 697}
637 698
638sub db_put($$$) { 699sub db_put($$$) {
639 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
696 757
697 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 759 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
700 761
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 763
703 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
706 767
716 777
717=cut 778=cut
718 779
719sub datalog($@) { 780sub datalog($@) {
720 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 783}
723 784
724=back 785=back
725 786
726=cut 787=cut
727 788
728############################################################################# 789#############################################################################
729 790
730=head2 ATTACHABLE OBJECTS 791=head2 ATTACHABLE OBJECTS
731 792
732Many objects in crossfire are so-called attachable objects. That means you can 793Many objects in deliantra are so-called attachable objects. That means you can
733attach callbacks/event handlers (a collection of which is called an "attachment") 794attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 795to it. All such attachable objects support the following methods.
735 796
736In the following description, CLASS can be any of C<global>, C<object> 797In the following description, CLASS can be any of C<global>, C<object>
737C<player>, C<client> or C<map> (i.e. the attachable objects in 798C<player>, C<client> or C<map> (i.e. the attachable objects in
787=item cf::CLASS::attachment $name, ... 848=item cf::CLASS::attachment $name, ...
788 849
789Register an attachment by C<$name> through which attachable objects of the 850Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 851given CLASS can refer to this attachment.
791 852
792Some classes such as crossfire maps and objects can specify attachments 853Some classes such as deliantra maps and objects can specify attachments
793that are attached at load/instantiate time, thus the need for a name. 854that are attached at load/instantiate time, thus the need for a name.
794 855
795These calls expect any number of the following handler/hook descriptions: 856These calls expect any number of the following handler/hook descriptions:
796 857
797=over 4 858=over 4
921 982
922 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 985
925 } elsif (ref $type) { 986 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
927 988
928 } else { 989 } else {
929 shift @arg; 990 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
931 } 992 }
932 } 993 }
933} 994}
934 995
935sub _object_attach { 996sub _object_attach {
945 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
946 } 1007 }
947 1008
948 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
949 } else { 1010 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1012 }
952 1013
953 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
954} 1015}
955 1016
1014 1075
1015 for (@$callbacks) { 1076 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1017 1078
1018 if ($@) { 1079 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1081 override;
1022 } 1082 }
1023 1083
1024 return 1 if $override; 1084 return 1 if $override;
1025 } 1085 }
1104 for (@$attach) { 1164 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1107 } 1167 }
1108 } else { 1168 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1170 }
1111 } 1171 }
1112} 1172}
1113 1173
1114cf::attachable->attach ( 1174cf::attachable->attach (
1141 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1142 1202
1143 sync_job { 1203 sync_job {
1144 if (length $$rdata) { 1204 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1148 1209
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 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 }
1153 aio_close $fh; 1217 aio_close $fh;
1154 1218
1155 if (@$objs) { 1219 if (@$objs) {
1156 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) {
1157 aio_chmod $fh, SAVE_MODE; 1221 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
1160 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 }
1161 aio_close $fh; 1228 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1230 }
1164 } else { 1231 } else {
1165 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
1166 } 1233 }
1167 1234
1168 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1236
1237 $filename =~ s%/[^/]+$%%;
1238 aio_pathsync $filename if $cf::USE_FSYNC;
1169 } else { 1239 } else {
1170 warn "FATAL: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1171 } 1241 }
1172 } else { 1242 } else {
1173 aio_unlink $filename; 1243 aio_unlink $filename;
1174 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1175 } 1245 }
1199 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs}; 1270 $av = $st->{objs};
1201 } 1271 }
1202 1272
1203 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1204 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1205 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1206 1277
1207 ($data, $av) 1278 ($data, $av)
1208} 1279}
1209 1280
1210=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1266 my ($name, $cb) = @_; 1337 my ($name, $cb) = @_;
1267 1338
1268 $EXTICMD{$name} = $cb; 1339 $EXTICMD{$name} = $cb;
1269} 1340}
1270 1341
1342use File::Glob ();
1343
1271cf::player->attach ( 1344cf::player->attach (
1272 on_command => sub { 1345 on_unknown_command => sub {
1273 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1274 1347
1275 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1276 or return; 1349 or return;
1277 1350
1300 1373
1301 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1302 if $reply; 1375 if $reply;
1303 1376
1304 } else { 1377 } else {
1305 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1306 } 1379 }
1307 1380
1308 cf::override; 1381 cf::override;
1309 }, 1382 },
1310); 1383);
1311 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
1312sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1313 cf::sync_job { 1401 cf::sync_job {
1314 my %todo; 1402 my %todo;
1315 1403
1316 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1317 next unless -r $path; 1405 next unless -r $path;
1335 1423
1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1338 1426
1339 $ext{source} = 1427 $ext{source} =
1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1341 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1342 . $source 1430 . $source
1343 . "\n};\n1"; 1431 . "\n};\n1";
1344 1432
1345 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1346 } 1434 }
1347 1435
1436 my $pass = 0;
1348 my %done; 1437 my %done;
1349 while (%todo) { 1438 while (%todo) {
1350 my $progress; 1439 my $progress;
1351 1440
1441 ++$pass;
1442
1443 ext:
1352 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1353 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1354 goto skip 1446 next ext
1355 unless exists $done{$_}; 1447 unless exists $done{$_};
1356 } 1448 }
1357 1449
1358 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1359 1451
1360 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1361 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1362 : "$v->{base}: extension inactive.\n"; 1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1363 1457
1364 if (exists $v->{meta}{mandatory}) {
1365 warn $msg;
1366 cf::cleanup "mandatory extension failed to load, exiting."; 1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1367 } 1459 if exists $v->{meta}{mandatory};
1368 1460
1369 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;
1370 } 1470 }
1371
1372 $done{$k} = delete $todo{$k};
1373 push @EXTS, $v->{pkg};
1374 $progress = 1;
1375 } 1471 }
1376 1472
1377 skip: 1473 unless ($progress) {
1378 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1474 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1379 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 }
1380 } 1481 }
1381 }; 1482 };
1382} 1483}
1383 1484
1384############################################################################# 1485#############################################################################
1385 1486
1386=back 1487=back
1387 1488
1388=head2 CORE EXTENSIONS 1489=head2 CORE EXTENSIONS
1389 1490
1390Functions and methods that extend core crossfire objects. 1491Functions and methods that extend core deliantra objects.
1391 1492
1392=cut 1493=cut
1393 1494
1394package cf::player; 1495package cf::player;
1395 1496
1438 1539
1439sub exists($) { 1540sub exists($) {
1440 my ($login) = @_; 1541 my ($login) = @_;
1441 1542
1442 $cf::PLAYER{$login} 1543 $cf::PLAYER{$login}
1443 or cf::sync_job { !aio_stat path $login } 1544 or !aio_stat path $login
1444} 1545}
1445 1546
1446sub find($) { 1547sub find($) {
1447 return $cf::PLAYER{$_[0]} || do { 1548 return $cf::PLAYER{$_[0]} || do {
1448 my $login = $_[0]; 1549 my $login = $_[0];
1468 $cf::PLAYER{$login} = $pl 1569 $cf::PLAYER{$login} = $pl
1469 } 1570 }
1470 } 1571 }
1471} 1572}
1472 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
1473sub save($) { 1587sub save($) {
1474 my ($pl) = @_; 1588 my ($pl) = @_;
1475 1589
1476 return if $pl->{deny_save}; 1590 return if $pl->{deny_save};
1477 1591
1482 1596
1483 aio_mkdir playerdir $pl, 0770; 1597 aio_mkdir playerdir $pl, 0770;
1484 $pl->{last_save} = $cf::RUNTIME; 1598 $pl->{last_save} = $cf::RUNTIME;
1485 1599
1486 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];
1487 1604
1488 $pl->save_pl ($path); 1605 $pl->save_pl ($path);
1489 cf::cede_to_tick; 1606 cf::cede_to_tick;
1490} 1607}
1491 1608
1523 my ($pl) = @_; 1640 my ($pl) = @_;
1524 1641
1525 my $name = $pl->ob->name; 1642 my $name = $pl->ob->name;
1526 1643
1527 $pl->{deny_save} = 1; 1644 $pl->{deny_save} = 1;
1528 $pl->password ("*"); # this should lock out the player until we nuked the dir 1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1529 1646
1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1531 $pl->deactivate; 1648 $pl->deactivate;
1532 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;
1533 $pl->ob->check_score;
1534 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1535 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1536 1652
1537 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1538 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
1593 \@logins 1709 \@logins
1594} 1710}
1595 1711
1596=item $player->maps 1712=item $player->maps
1597 1713
1714=item cf::player::maps $login
1715
1598Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1599player. May block. 1717player. May block.
1600 1718
1601=cut 1719=cut
1602 1720
1619 } 1737 }
1620 1738
1621 \@paths 1739 \@paths
1622} 1740}
1623 1741
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1742=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625 1743
1626Expand crossfire pod fragments into protocol xml. 1744Expand deliantra pod fragments into protocol xml.
1627
1628=cut
1629
1630sub expand_cfpod {
1631 my ($self, $pod) = @_;
1632
1633 my @nest = [qr<\G$>, undef, ""];
1634 my $xml;
1635
1636 for ($pod) {
1637 while () {
1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1639 $xml .= $1;
1640 } elsif (/\G\n(?=\S)/xgcs) {
1641 $xml .= " ";
1642 } elsif (/\G\n/xgcs) {
1643 $xml .= "\n";
1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1645 my ($code, $delim) = ($1, scalar reverse $2);
1646 $delim =~ y/</>/; # delim now contains the stop sequence
1647 $delim = qr{\G\Q$delim};
1648
1649 my $cb;
1650
1651 if ($code eq "B") {
1652 $cb = sub { "<b>$_[0]</b>" };
1653 } elsif ($code eq "C") {
1654 $cb = sub { "<tt>$_[0]</tt>" };
1655 } elsif ($code eq "E") {
1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1657 } elsif ($code eq "G") {
1658 $cb = sub {
1659 my ($male, $female) = split /\|/, $_[0];
1660 $self->gender ? $female : $male
1661 };
1662 } elsif ($code eq "H") {
1663 $cb = sub {
1664 (
1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1667 "",
1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1699 } else {
1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1707 }
1708 }
1709 }
1710
1711 $xml
1712}
1713
1714sub hintmode {
1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1716 $_[0]{hintmode}
1717}
1718 1745
1719=item $player->ext_reply ($msgid, @msg) 1746=item $player->ext_reply ($msgid, @msg)
1720 1747
1721Sends an ext reply to the player. 1748Sends an ext reply to the player.
1722 1749
1754 1781
1755=cut 1782=cut
1756 1783
1757sub find_by_path($) { 1784sub find_by_path($) {
1758 my ($path) = @_; 1785 my ($path) = @_;
1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1759 1788
1760 my ($match, $specificity); 1789 my ($match, $specificity);
1761 1790
1762 for my $region (list) { 1791 for my $region (list) {
1763 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
1795 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
1796 1825
1797 # mit "rum" bekleckern, nicht 1826 # mit "rum" bekleckern, nicht
1798 $self->_create_random_map ( 1827 $self->_create_random_map (
1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1802 $rmp->{exit_on_final_map}, 1831 $rmp->{exit_on_final_map},
1803 $rmp->{xsize}, $rmp->{ysize}, 1832 $rmp->{xsize}, $rmp->{ysize},
1804 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1805 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1820 1849
1821sub register { 1850sub register {
1822 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1823 my $pkg = caller; 1852 my $pkg = caller;
1824 1853
1825 no strict;
1826 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1827 1855
1828 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1829} 1857}
1830 1858
1831# also paths starting with '/' 1859# also paths starting with '/'
1832$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1833 1861
1834sub thawer_merge { 1862sub thawer_merge {
1835 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1836 1864
1837 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1935 1963
1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1964 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1937 "$UNIQUEDIR/$path" 1965 "$UNIQUEDIR/$path"
1938} 1966}
1939 1967
1940# and all this just because we cannot iterate over
1941# all maps in C++...
1942sub change_all_map_light {
1943 my ($change) = @_;
1944
1945 $_->change_map_light ($change)
1946 for grep $_->outdoor, values %cf::MAP;
1947}
1948
1949sub decay_objects { 1968sub decay_objects {
1950 my ($self) = @_; 1969 my ($self) = @_;
1951 1970
1952 return if $self->{deny_reset}; 1971 return if $self->{deny_reset};
1953 1972
2035sub find { 2054sub find {
2036 my ($path, $origin) = @_; 2055 my ($path, $origin) = @_;
2037 2056
2038 $path = normalise $path, $origin && $origin->path; 2057 $path = normalise $path, $origin && $origin->path;
2039 2058
2040 cf::lock_wait "map_data:$path";#d#remove 2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2041 cf::lock_wait "map_find:$path"; 2060 my $guard2 = cf::lock_acquire "map_find:$path";
2042 2061
2043 $cf::MAP{$path} || do { 2062 $cf::MAP{$path} || do {
2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2045 my $guard2 = cf::lock_acquire "map_find:$path";
2046
2047 my $map = new_from_path cf::map $path 2063 my $map = new_from_path cf::map $path
2048 or return; 2064 or return;
2049 2065
2050 $map->{last_save} = $cf::RUNTIME; 2066 $map->{last_save} = $cf::RUNTIME;
2051 2067
2063 2079
2064 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
2065 } 2081 }
2066} 2082}
2067 2083
2068sub pre_load { } 2084sub pre_load { }
2069sub post_load { } 2085#sub post_load { } # XS
2070 2086
2071sub load { 2087sub load {
2072 my ($self) = @_; 2088 my ($self) = @_;
2073 2089
2074 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
2119 unless ($self->{deny_activate}) { 2135 unless ($self->{deny_activate}) {
2120 $self->decay_objects; 2136 $self->decay_objects;
2121 $self->fix_auto_apply; 2137 $self->fix_auto_apply;
2122 $self->update_buttons; 2138 $self->update_buttons;
2123 cf::cede_to_tick; 2139 cf::cede_to_tick;
2124 $self->set_darkness_map;
2125 cf::cede_to_tick;
2126 $self->activate; 2140 $self->activate;
2127 } 2141 }
2128 2142
2129 $self->{last_save} = $cf::RUNTIME; 2143 $self->{last_save} = $cf::RUNTIME;
2130 $self->last_access ($cf::RUNTIME); 2144 $self->last_access ($cf::RUNTIME);
2133 } 2147 }
2134 2148
2135 $self->post_load; 2149 $self->post_load;
2136} 2150}
2137 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
2138sub customise_for { 2155sub customise_for {
2139 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
2140 2157
2141 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
2142 if $self->per_player; 2159 if $self->per_player;
2158 or next; 2175 or next;
2159 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2160 or next; 2177 or next;
2161 $neigh->load; 2178 $neigh->load;
2162 2179
2180 # now find the diagonal neighbours
2163 push @neigh, 2181 push @neigh,
2164 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2165 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2166 } 2184 }
2167 2185
2174} 2192}
2175 2193
2176sub find_sync { 2194sub find_sync {
2177 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2178 2196
2179 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
2180} 2201}
2181 2202
2182sub do_load_sync { 2203sub do_load_sync {
2183 my ($map) = @_; 2204 my ($map) = @_;
2184 2205
2185 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2186 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2187 2208
2188 cf::sync_job { $map->load }; 2209 $map->load;
2189} 2210}
2190 2211
2191our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2192our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2193 2214
2219 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2220 2241
2221 () 2242 ()
2222} 2243}
2223 2244
2245# common code, used by both ->save and ->swapout
2224sub save { 2246sub _save {
2225 my ($self) = @_; 2247 my ($self) = @_;
2226
2227 my $lock = cf::lock_acquire "map_data:$self->{path}";
2228 2248
2229 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2230 2250
2231 return unless $self->dirty; 2251 return unless $self->dirty;
2232 2252
2252 } else { 2272 } else {
2253 $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);
2254 } 2274 }
2255} 2275}
2256 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2257sub swap_out { 2285sub swap_out {
2258 my ($self) = @_; 2286 my ($self) = @_;
2259 2287
2260 # save first because save cedes
2261 $self->save;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264 2289
2265 return if $self->players;
2266 return if $self->in_memory != cf::MAP_ACTIVE; 2290 return if $self->in_memory != cf::MAP_ACTIVE;
2267 return if $self->{deny_save}; 2291 return if $self->{deny_save};
2292 return if $self->players;
2268 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2269 $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};
2270 2344
2271 $self->deactivate; 2345 $self->deactivate;
2272 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2273 $self->clear; 2347 $self->clear;
2274}
2275
2276sub reset_at {
2277 my ($self) = @_;
2278
2279 # TODO: safety, remove and allow resettable per-player maps
2280 return 1e99 if $self->{deny_reset};
2281
2282 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2283 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2284
2285 $time + $to
2286}
2287
2288sub should_reset {
2289 my ($self) = @_;
2290
2291 $self->reset_at <= $cf::RUNTIME
2292}
2293
2294sub reset {
2295 my ($self) = @_;
2296
2297 my $lock = cf::lock_acquire "map_data:$self->{path}";
2298
2299 return if $self->players;
2300
2301 warn "resetting map ", $self->path;
2302
2303 $self->in_memory (cf::MAP_SWAPPED);
2304
2305 # need to save uniques path
2306 unless ($self->{deny_save}) {
2307 my $uniq = $self->uniq_path; utf8::encode $uniq;
2308
2309 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2310 if $uniq;
2311 }
2312
2313 delete $cf::MAP{$self->path};
2314
2315 $self->deactivate;
2316 $_->clear_links_to ($self) for values %cf::MAP;
2317 $self->clear;
2318 2348
2319 $self->unlink_save; 2349 $self->unlink_save;
2320 $self->destroy; 2350 $self->destroy;
2321} 2351}
2322 2352
2330 2360
2331 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2332 2362
2333 $self->unlink_save; 2363 $self->unlink_save;
2334 2364
2335 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2336 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2337 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2338 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2339 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2340 2370
2397 : normalise $_ 2427 : normalise $_
2398 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2399 ] 2429 ]
2400} 2430}
2401 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
2402=back 2464=back
2403 2465
2404=head3 cf::object 2466=head3 cf::object
2405 2467
2406=cut 2468=cut
2471 2533
2472our $SAY_CHANNEL = { 2534our $SAY_CHANNEL = {
2473 id => "say", 2535 id => "say",
2474 title => "Map", 2536 title => "Map",
2475 reply => "say ", 2537 reply => "say ",
2476 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.",
2477}; 2539};
2478 2540
2479our $CHAT_CHANNEL = { 2541our $CHAT_CHANNEL = {
2480 id => "chat", 2542 id => "chat",
2481 title => "Chat", 2543 title => "Chat",
2536 2598
2537=item $player_object->enter_link 2599=item $player_object->enter_link
2538 2600
2539Freezes 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}>).
2540 2602
2541The player should be reasonably safe there for short amounts of time. You 2603The player should be reasonably safe there for short amounts of time (e.g.
2542I<MUST> call C<leave_link> as soon as possible, though. 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2605though, as the player cannot control the character while it is on the link
2606map.
2543 2607
2544Will never block. 2608Will never block.
2545 2609
2546=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2547 2611
2567sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2568 my ($self) = @_; 2632 my ($self) = @_;
2569 2633
2570 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2571 2635
2636 ++$self->{_link_recursion};
2637
2572 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2573 2639
2574 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2575 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2576 2642
2577 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2578} 2644}
2579 2645
2580sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2581 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2582 2648
2599 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2600 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2601 2667
2602 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2603 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2604 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2605 2671
2606 $map->load; 2672 $map->load;
2607 $map->load_neighbours; 2673 $map->load_neighbours;
2608 2674
2609 return unless $self->contr->active; 2675 return unless $self->contr->active;
2610 $self->activate_recursive;
2611 2676
2612 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2613 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2614} 2679 # entering was successful
2680 delete $self->{_link_recursion};
2681 # only activate afterwards, to support waiting in hooks
2682 $self->activate_recursive;
2683 }
2615 2684
2685}
2686
2616=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)]])
2617 2688
2618Moves 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
2619her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2620that 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
2621the 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
2628 2699
2629our $GOTOGEN; 2700our $GOTOGEN;
2630 2701
2631sub cf::object::player::goto { 2702sub cf::object::player::goto {
2632 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 }
2633 2710
2634 # 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
2635 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2636 2713
2637 $self->enter_link; 2714 $self->enter_link;
2661 my $map = eval { 2738 my $map = eval {
2662 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2663 2740
2664 if ($map) { 2741 if ($map) {
2665 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2666 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2667 } else { 2744 } else {
2668 $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);
2669 } 2746 }
2670 2747
2671 $map 2748 $map
2679 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2680 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2681 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2682 } 2759 }
2683 2760
2684 $done->() if $done; 2761 $done->($self) if $done;
2685 })->prio (1); 2762 })->prio (1);
2686} 2763}
2687 2764
2688=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2689 2766
2777 $self->contr->savebed ($map, $x, $y) 2854 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED); 2855 if $exit->flag (cf::FLAG_DAMNED);
2779 2856
2780 1 2857 1
2781 }) { 2858 }) {
2782 $self->message ("Something went wrong deep within the crossfire server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2783 . "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. "
2784 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2785 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2786 2863
2787 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2788 $self->leave_link; 2865 $self->leave_link;
2789 } 2866 }
2790 })->prio (1); 2867 })->prio (1);
2791} 2868}
2792 2869
2804sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2805 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2806 2883
2807 utf8::encode $text; 2884 utf8::encode $text;
2808 $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);
2809} 2911}
2810 2912
2811=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2812 2914
2813Send 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
2817 2919
2818=cut 2920=cut
2819 2921
2820# non-persistent channels (usually the info channel) 2922# non-persistent channels (usually the info channel)
2821our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2822 "c/identify" => { 2930 "c/identify" => {
2823 id => "infobox", 2931 id => "infobox",
2824 title => "Identify", 2932 title => "Identify",
2825 reply => undef, 2933 reply => undef,
2826 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
2828 "c/examine" => { 2936 "c/examine" => {
2829 id => "infobox", 2937 id => "infobox",
2830 title => "Examine", 2938 title => "Examine",
2831 reply => undef, 2939 reply => undef,
2832 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",
2833 }, 2947 },
2834 "c/book" => { 2948 "c/book" => {
2835 id => "infobox", 2949 id => "infobox",
2836 title => "Book", 2950 title => "Book",
2837 reply => undef, 2951 reply => undef,
2853 id => "infobox", 2967 id => "infobox",
2854 title => "Body Parts", 2968 title => "Body Parts",
2855 reply => undef, 2969 reply => undef,
2856 tooltip => "Shows which body parts you posess and are available", 2970 tooltip => "Shows which body parts you posess and are available",
2857 }, 2971 },
2972 "c/statistics" => {
2973 id => "infobox",
2974 title => "Statistics",
2975 reply => undef,
2976 tooltip => "Shows your primary statistics",
2977 },
2978 "c/skills" => {
2979 id => "infobox",
2980 title => "Skills",
2981 reply => undef,
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",
3007 },
2858 "c/uptime" => { 3008 "c/uptime" => {
2859 id => "infobox", 3009 id => "infobox",
2860 title => "Uptime", 3010 title => "Uptime",
2861 reply => undef, 3011 reply => undef,
2862 tooltip => "How long the server has been running since last restart", 3012 tooltip => "How long the server has been running since last restart",
2871 id => "party", 3021 id => "party",
2872 title => "Party", 3022 title => "Party",
2873 reply => "gsay ", 3023 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party", 3024 tooltip => "Messages and chat related to your party",
2875 }, 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,
2876); 3034);
2877 3035
2878sub cf::client::send_msg { 3036sub cf::client::send_msg {
2879 my ($self, $channel, $msg, $color, @extra) = @_; 3037 my ($self, $channel, $msg, $color, @extra) = @_;
2880 3038
2881 $msg = $self->pl->expand_cfpod ($msg); 3039 $msg = $self->pl->expand_cfpod ($msg)
3040 unless $color & cf::NDI_VERBATIM;
2882 3041
2883 $color &= cf::NDI_CLIENT_MASK; # just in case... 3042 $color &= cf::NDI_CLIENT_MASK; # just in case...
2884 3043
2885 # check predefined channels, for the benefit of C 3044 # check predefined channels, for the benefit of C
2886 if ($CHANNEL{$channel}) { 3045 if ($CHANNEL{$channel}) {
2887 $channel = $CHANNEL{$channel}; 3046 $channel = $CHANNEL{$channel};
2888 3047
2889 $self->ext_msg (channel_info => $channel) 3048 $self->ext_msg (channel_info => $channel);
2890 if $self->can_msg;
2891
2892 $channel = $channel->{id}; 3049 $channel = $channel->{id};
2893 3050
2894 } elsif (ref $channel) { 3051 } elsif (ref $channel) {
2895 # send meta info to client, if not yet sent 3052 # send meta info to client, if not yet sent
2896 unless (exists $self->{channel}{$channel->{id}}) { 3053 unless (exists $self->{channel}{$channel->{id}}) {
2897 $self->{channel}{$channel->{id}} = $channel; 3054 $self->{channel}{$channel->{id}} = $channel;
2898 $self->ext_msg (channel_info => $channel) 3055 $self->ext_msg (channel_info => $channel);
2899 if $self->can_msg;
2900 } 3056 }
2901 3057
2902 $channel = $channel->{id}; 3058 $channel = $channel->{id};
2903 } 3059 }
2904 3060
2905 return unless @extra || length $msg; 3061 return unless @extra || length $msg;
2906 3062
2907 if ($self->can_msg) {
2908 # default colour, mask it out 3063 # default colour, mask it out
2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3064 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2910 if $color & cf::NDI_DEF; 3065 if $color & cf::NDI_DEF;
2911 3066
2912 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3067 my $pkt = "msg "
3068 . $self->{json_coder}->encode (
2913 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2914 } else { 3070 );
2915 if ($color >= 0) {
2916 # replace some tags by gcfclient-compatible ones
2917 for ($msg) {
2918 1 while
2919 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2920 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2921 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2922 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2923 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2924 }
2925 3071
2926 $color &= cf::NDI_COLOR_MASK; 3072 $self->send_big_packet ($pkt);
2927
2928 utf8::encode $msg;
2929
2930 if (0 && $msg =~ /\[/) {
2931 # COMMAND/INFO
2932 $self->send_packet ("drawextinfo $color 10 8 $msg")
2933 } else {
2934 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2935 $self->send_packet ("drawinfo $color $msg")
2936 }
2937 }
2938 }
2939} 3073}
2940 3074
2941=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2942 3076
2943Sends an ext event to the client. 3077Sends an ext event to the client.
2946 3080
2947sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2948 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2949 3083
2950 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2951 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2952 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2953 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2954 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2955 } 3089 }
2956} 3090}
2957 3091
2958=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2959 3093
2963 3097
2964sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2965 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2966 3100
2967 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2968 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2969 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2970 #TODO: version 1, remove 3104 #TODO: version 1, remove
2971 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2972 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2973 } 3107 }
2974} 3108}
2975 3109
2976=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2977 3111
3048 3182
3049 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
3050 if $reply; 3184 if $reply;
3051 3185
3052 } else { 3186 } else {
3053 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";
3054 } 3188 }
3055 3189
3056 cf::override; 3190 cf::override;
3057 }, 3191 },
3058); 3192);
3078 3212
3079 $coro 3213 $coro
3080} 3214}
3081 3215
3082cf::client->attach ( 3216cf::client->attach (
3083 on_destroy => sub { 3217 on_client_destroy => sub {
3084 my ($ns) = @_; 3218 my ($ns) = @_;
3085 3219
3086 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3087 }, 3221 },
3088); 3222);
3104our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
3105 3239
3106$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
3107 3241
3108$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
3109 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
3110 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
3111 sort time 3245 sort time
3112)); 3246));
3113 3247
3114# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
3118The following functions and methods are available within a safe environment: 3252The following functions and methods are available within a safe environment:
3119 3253
3120 cf::object 3254 cf::object
3121 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
3122 insert remove name archname title slaying race decrease split 3256 insert remove name archname title slaying race decrease split
3257 value
3123 3258
3124 cf::object::player 3259 cf::object::player
3125 player 3260 player
3126 3261
3127 cf::player 3262 cf::player
3133=cut 3268=cut
3134 3269
3135for ( 3270for (
3136 ["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
3137 insert remove inv nrof name archname title slaying race 3272 insert remove inv nrof name archname title slaying race
3138 decrease split destroy change_exp)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3139 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3140 ["cf::player" => qw(peaceful)], 3275 ["cf::player" => qw(peaceful send_msg)],
3141 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3142) { 3277) {
3143 no strict 'refs';
3144 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
3145 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3146 for @funs; 3280 for @funs;
3147} 3281}
3148 3282
3163 3297
3164 my $qcode = $code; 3298 my $qcode = $code;
3165 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3299 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3166 $qcode =~ s/\n/\\n/g; 3300 $qcode =~ s/\n/\\n/g;
3167 3301
3302 %vars = (_dummy => 0) unless %vars;
3303
3304 my @res;
3168 local $_; 3305 local $_;
3169 local @safe::cf::_safe_eval_args = values %vars;
3170 3306
3171 my $eval = 3307 my $eval =
3172 "do {\n" 3308 "do {\n"
3173 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3309 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3174 . "#line 0 \"{$qcode}\"\n" 3310 . "#line 0 \"{$qcode}\"\n"
3175 . $code 3311 . $code
3176 . "\n}" 3312 . "\n}"
3177 ; 3313 ;
3178 3314
3315 if ($CFG{safe_eval}) {
3179 sub_generation_inc; 3316 sub_generation_inc;
3317 local @safe::cf::_safe_eval_args = values %vars;
3180 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3318 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3181 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 }
3182 3324
3183 if ($@) { 3325 if ($@) {
3184 warn "$@"; 3326 warn "$@",
3185 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
3186 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
3187 } 3329 }
3188 3330
3189 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
3190} 3332}
3191 3333
3205=cut 3347=cut
3206 3348
3207sub register_script_function { 3349sub register_script_function {
3208 my ($fun, $cb) = @_; 3350 my ($fun, $cb) = @_;
3209 3351
3210 no strict 'refs'; 3352 $fun = "safe::$fun" if $CFG{safe_eval};
3211 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3353 *$fun = $safe_hole->wrap ($cb);
3212} 3354}
3213 3355
3214=back 3356=back
3215 3357
3216=cut 3358=cut
3217 3359
3218############################################################################# 3360#############################################################################
3219# 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 ref $dir and next;
3376 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3377 or next;
3378
3379 $data = "#line 1 $dir/$mod\n$data";
3380
3381 open my $fh, "<", \$data or die;
3382
3383 return $fh;
3384 }
3385
3386 ()
3387}
3388
3389sub init_inc {
3390 # save original @INC
3391 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3392
3393 # make sure we can do scalar-opens
3394 open my $dummy, "<", \my $dummy2;
3395
3396 # execute some stuff so perl load's some of the core modules
3397 /Ü/ =~ /ü/i;
3398 eval { &Storable::nstore_fd };
3399
3400 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3401
3402 debug "module loading will be asynchronous from this point on.";
3403}
3220 3404
3221sub load_facedata($) { 3405sub load_facedata($) {
3222 my ($path) = @_; 3406 my ($path) = @_;
3223 3407
3224 # HACK to clear player env face cache, we need some signal framework 3408 # HACK to clear player env face cache, we need some signal framework
3225 # for this (global event?) 3409 # for this (global event?)
3226 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
3227 3411
3228 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3412 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3229 3413
3230 warn "loading facedata from $path\n"; 3414 trace "loading facedata from $path\n";
3231 3415
3232 my $facedata; 3416 my $facedata;
3233 0 < aio_load $path, $facedata 3417 0 < aio_load $path, $facedata
3234 or die "$path: $!"; 3418 or die "$path: $!";
3235 3419
3237 3421
3238 $facedata->{version} == 2 3422 $facedata->{version} == 2
3239 or cf::cleanup "$path: version mismatch, cannot proceed."; 3423 or cf::cleanup "$path: version mismatch, cannot proceed.";
3240 3424
3241 # patch in the exptable 3425 # patch in the exptable
3426 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3242 $facedata->{resource}{"res/exp_table"} = { 3427 $facedata->{resource}{"res/exp_table"} = {
3243 type => FT_RSRC, 3428 type => FT_RSRC,
3244 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3429 data => $exp_table,
3430 hash => (Digest::MD5::md5 $exp_table),
3245 }; 3431 };
3246 cf::cede_to_tick; 3432 cf::cede_to_tick;
3247 3433
3248 { 3434 {
3249 my $faces = $facedata->{faceinfo}; 3435 my $faces = $facedata->{faceinfo};
3251 while (my ($face, $info) = each %$faces) { 3437 while (my ($face, $info) = each %$faces) {
3252 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3438 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3253 3439
3254 cf::face::set_visibility $idx, $info->{visibility}; 3440 cf::face::set_visibility $idx, $info->{visibility};
3255 cf::face::set_magicmap $idx, $info->{magicmap}; 3441 cf::face::set_magicmap $idx, $info->{magicmap};
3256 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3442 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3257 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3443 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3258 3444
3259 cf::cede_to_tick; 3445 cf::cede_to_tick;
3260 } 3446 }
3261 3447
3262 while (my ($face, $info) = each %$faces) { 3448 while (my ($face, $info) = each %$faces) {
3267 3453
3268 if (my $smooth = cf::face::find $info->{smooth}) { 3454 if (my $smooth = cf::face::find $info->{smooth}) {
3269 cf::face::set_smooth $idx, $smooth; 3455 cf::face::set_smooth $idx, $smooth;
3270 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3456 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3271 } else { 3457 } else {
3272 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3458 error "smooth face '$info->{smooth}' not found for face '$face'";
3273 } 3459 }
3274 3460
3275 cf::cede_to_tick; 3461 cf::cede_to_tick;
3276 } 3462 }
3277 } 3463 }
3286 3472
3287 cf::anim::invalidate_all; # d'oh 3473 cf::anim::invalidate_all; # d'oh
3288 } 3474 }
3289 3475
3290 { 3476 {
3291 # TODO: for gcfclient pleasure, we should give resources
3292 # that gcfclient doesn't grok a >10000 face index.
3293 my $res = $facedata->{resource}; 3477 my $res = $facedata->{resource};
3294 3478
3295 while (my ($name, $info) = each %$res) { 3479 while (my ($name, $info) = each %$res) {
3296 if (defined $info->{type}) { 3480 if (defined $info->{type}) {
3297 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3481 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3298 my $data;
3299 3482
3300 if ($info->{type} & 1) { 3483 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3301 # prepend meta info
3302
3303 my $meta = $enc->encode ({
3304 name => $name,
3305 %{ $info->{meta} || {} },
3306 });
3307
3308 $data = pack "(w/a*)*", $meta, $info->{data};
3309 } else {
3310 $data = $info->{data};
3311 }
3312
3313 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3314 cf::face::set_type $idx, $info->{type}; 3484 cf::face::set_type $idx, $info->{type};
3315 } else { 3485 } else {
3316 $RESOURCE{$name} = $info; 3486 $RESOURCE{$name} = $info; # unused
3317 } 3487 }
3318 3488
3319 cf::cede_to_tick; 3489 cf::cede_to_tick;
3320 } 3490 }
3321 } 3491 }
3322 3492
3323 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3493 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3324 3494
3325 1 3495 1
3326} 3496}
3327
3328cf::global->attach (on_resource_update => sub {
3329 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3330 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3331
3332 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3333 my $sound = $soundconf->{compat}[$_]
3334 or next;
3335
3336 my $face = cf::face::find "sound/$sound->[1]";
3337 cf::sound::set $sound->[0] => $face;
3338 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3339 }
3340
3341 while (my ($k, $v) = each %{$soundconf->{event}}) {
3342 my $face = cf::face::find "sound/$v";
3343 cf::sound::set $k => $face;
3344 }
3345 }
3346});
3347 3497
3348register_exticmd fx_want => sub { 3498register_exticmd fx_want => sub {
3349 my ($ns, $want) = @_; 3499 my ($ns, $want) = @_;
3350 3500
3351 while (my ($k, $v) = each %$want) { 3501 while (my ($k, $v) = each %$want) {
3390sub reload_treasures { 3540sub reload_treasures {
3391 load_resource_file "$DATADIR/treasures" 3541 load_resource_file "$DATADIR/treasures"
3392 or die "unable to load treasurelists\n"; 3542 or die "unable to load treasurelists\n";
3393} 3543}
3394 3544
3545sub reload_sound {
3546 trace "loading sound config from $DATADIR/sound\n";
3547
3548 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3549 or die "$DATADIR/sound $!";
3550
3551 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3552
3553 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3554 my $sound = $soundconf->{compat}[$_]
3555 or next;
3556
3557 my $face = cf::face::find "sound/$sound->[1]";
3558 cf::sound::set $sound->[0] => $face;
3559 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3560 }
3561
3562 while (my ($k, $v) = each %{$soundconf->{event}}) {
3563 my $face = cf::face::find "sound/$v";
3564 cf::sound::set $k => $face;
3565 }
3566}
3567
3395sub reload_resources { 3568sub reload_resources {
3396 warn "reloading resource files...\n"; 3569 trace "reloading resource files...\n";
3397 3570
3398 reload_facedata; 3571 reload_facedata;
3572 reload_sound;
3399 reload_archetypes; 3573 reload_archetypes;
3400 reload_regions; 3574 reload_regions;
3401 reload_treasures; 3575 reload_treasures;
3402 3576
3403 warn "finished reloading resource files\n"; 3577 trace "finished reloading resource files\n";
3404}
3405
3406sub init {
3407 my $guard = freeze_mainloop;
3408
3409 evthread_start IO::AIO::poll_fileno;
3410
3411 reload_resources;
3412} 3578}
3413 3579
3414sub reload_config { 3580sub reload_config {
3581 trace "reloading config file...\n";
3582
3415 open my $fh, "<:utf8", "$CONFDIR/config" 3583 open my $fh, "<:utf8", "$CONFDIR/config"
3416 or return; 3584 or return;
3417 3585
3418 local $/; 3586 local $/;
3419 *CFG = YAML::Load <$fh>; 3587 *CFG = YAML::XS::Load scalar <$fh>;
3420 3588
3421 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3422 3590
3423 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3591 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3424 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3592 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3425 3593
3426 if (exists $CFG{mlockall}) { 3594 if (exists $CFG{mlockall}) {
3428 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3596 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3429 and die "WARNING: m(un)lockall failed: $!\n"; 3597 and die "WARNING: m(un)lockall failed: $!\n";
3430 }; 3598 };
3431 warn $@ if $@; 3599 warn $@ if $@;
3432 } 3600 }
3601
3602 trace "finished reloading resource files\n";
3603}
3604
3605sub pidfile() {
3606 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3607 or die "$PIDFILE: $!";
3608 flock $fh, &Fcntl::LOCK_EX
3609 or die "$PIDFILE: flock: $!";
3610 $fh
3611}
3612
3613# make sure only one server instance is running at any one time
3614sub atomic {
3615 my $fh = pidfile;
3616
3617 my $pid = <$fh>;
3618 kill 9, $pid if $pid > 0;
3619
3620 seek $fh, 0, 0;
3621 print $fh $$;
3622}
3623
3624sub main_loop {
3625 trace "EV::loop starting\n";
3626 if (1) {
3627 EV::loop;
3628 }
3629 trace "EV::loop returned\n";
3630 goto &main_loop unless $REALLY_UNLOOP;
3433} 3631}
3434 3632
3435sub main { 3633sub main {
3634 cf::init_globals; # initialise logging
3635
3636 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3637 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3638 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3639 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3640
3641 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3642
3436 # we must not ever block the main coroutine 3643 # we must not ever block the main coroutine
3437 local $Coro::idle = sub { 3644 local $Coro::idle = sub {
3438 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3645 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3439 (async { 3646 (async {
3440 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3647 $Coro::current->{desc} = "IDLE BUG HANDLER";
3441 EV::loop EV::LOOP_ONESHOT; 3648 EV::loop EV::LOOP_ONESHOT;
3442 })->prio (Coro::PRIO_MAX); 3649 })->prio (Coro::PRIO_MAX);
3443 }; 3650 };
3444 3651
3445 { 3652 evthread_start IO::AIO::poll_fileno;
3446 my $guard = freeze_mainloop; 3653
3654 cf::sync_job {
3655 init_inc;
3656
3657 cf::init_experience;
3658 cf::init_anim;
3659 cf::init_attackmess;
3660 cf::init_dynamic;
3661
3662 cf::load_settings;
3663 cf::load_materials;
3664
3665 reload_resources;
3447 reload_config; 3666 reload_config;
3448 db_init; 3667 db_init;
3668
3669 cf::init_uuid;
3670 cf::init_signals;
3671 cf::init_skills;
3672
3673 cf::init_beforeplay;
3674
3675 atomic;
3676
3449 load_extensions; 3677 load_extensions;
3450 3678
3451 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3679 utime time, time, $RUNTIMEFILE;
3680
3681 # no (long-running) fork's whatsoever before this point(!)
3682 use POSIX ();
3683 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3684
3685 (pop @POST_INIT)->(0) while @POST_INIT;
3452 } 3686 };
3453 3687
3454 EV::loop; 3688 cf::object::thawer::errors_are_fatal 0;
3689 info "parse errors in files are no longer fatal from this point on.\n";
3690
3691 my $free_main; $free_main = EV::idle sub {
3692 undef $free_main;
3693 undef &main; # free gobs of memory :)
3694 };
3695
3696 goto &main_loop;
3455} 3697}
3456 3698
3457############################################################################# 3699#############################################################################
3458# initialisation and cleanup 3700# initialisation and cleanup
3459 3701
3460# install some emergency cleanup handlers 3702# install some emergency cleanup handlers
3461BEGIN { 3703BEGIN {
3462 our %SIGWATCHER = (); 3704 our %SIGWATCHER = ();
3463 for my $signal (qw(INT HUP TERM)) { 3705 for my $signal (qw(INT HUP TERM)) {
3464 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3706 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3465 cf::cleanup "SIG$signal"; 3707 cf::cleanup "SIG$signal";
3466 }; 3708 };
3467 } 3709 }
3468} 3710}
3469 3711
3470sub write_runtime_sync { 3712sub write_runtime_sync {
3471 my $runtime = "$LOCALDIR/runtime"; 3713 my $t0 = AE::time;
3472 3714
3473 # first touch the runtime file to show we are still running: 3715 # first touch the runtime file to show we are still running:
3474 # the fsync below can take a very very long time. 3716 # the fsync below can take a very very long time.
3475 3717
3476 IO::AIO::aio_utime $runtime, undef, undef; 3718 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3477 3719
3478 my $guard = cf::lock_acquire "write_runtime"; 3720 my $guard = cf::lock_acquire "write_runtime";
3479 3721
3480 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3722 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3481 or return; 3723 or return;
3482 3724
3483 my $value = $cf::RUNTIME + 90 + 10; 3725 my $value = $cf::RUNTIME + 90 + 10;
3484 # 10 is the runtime save interval, for a monotonic clock 3726 # 10 is the runtime save interval, for a monotonic clock
3485 # 60 allows for the watchdog to kill the server. 3727 # 60 allows for the watchdog to kill the server.
3495 aio_utime $fh, undef, undef; 3737 aio_utime $fh, undef, undef;
3496 3738
3497 close $fh 3739 close $fh
3498 or return; 3740 or return;
3499 3741
3500 aio_rename "$runtime~", $runtime 3742 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3501 and return; 3743 and return;
3502 3744
3503 warn "runtime file written.\n"; 3745 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3504 3746
3505 1 3747 1
3506} 3748}
3507 3749
3508our $uuid_lock; 3750our $uuid_lock;
3517 my $uuid = "$LOCALDIR/uuid"; 3759 my $uuid = "$LOCALDIR/uuid";
3518 3760
3519 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3761 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3520 or return; 3762 or return;
3521 3763
3522 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3764 my $value = uuid_seq uuid_cur;
3765
3766 unless ($value) {
3767 info "cowardly refusing to write zero uuid value!\n";
3768 return;
3769 }
3770
3771 my $value = uuid_str $value + $uuid_skip;
3523 $uuid_skip = 0; 3772 $uuid_skip = 0;
3524 3773
3525 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3774 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3526 and return; 3775 and return;
3527 3776
3533 or return; 3782 or return;
3534 3783
3535 aio_rename "$uuid~", $uuid 3784 aio_rename "$uuid~", $uuid
3536 and return; 3785 and return;
3537 3786
3538 warn "uuid file written ($value).\n"; 3787 trace "uuid file written ($value).\n";
3539 3788
3540 1 3789 1
3541 3790
3542} 3791}
3543 3792
3549} 3798}
3550 3799
3551sub emergency_save() { 3800sub emergency_save() {
3552 my $freeze_guard = cf::freeze_mainloop; 3801 my $freeze_guard = cf::freeze_mainloop;
3553 3802
3554 warn "enter emergency perl save\n"; 3803 info "emergency_perl_save: enter\n";
3804
3805 # this is a trade-off: we want to be very quick here, so
3806 # save all maps without fsync, and later call a global sync
3807 # (which in turn might be very very slow)
3808 local $USE_FSYNC = 0;
3555 3809
3556 cf::sync_job { 3810 cf::sync_job {
3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3557 # use a peculiar iteration method to avoid tripping on perl 3813 # use a peculiar iteration method to avoid tripping on perl
3558 # refcount bugs in for. also avoids problems with players 3814 # refcount bugs in for. also avoids problems with players
3559 # and maps saved/destroyed asynchronously. 3815 # and maps saved/destroyed asynchronously.
3560 warn "begin emergency player save\n"; 3816 info "emergency_perl_save: begin player save\n";
3561 for my $login (keys %cf::PLAYER) { 3817 for my $login (keys %cf::PLAYER) {
3562 my $pl = $cf::PLAYER{$login} or next; 3818 my $pl = $cf::PLAYER{$login} or next;
3563 $pl->valid or next; 3819 $pl->valid or next;
3564 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3820 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3565 $pl->save; 3821 $pl->save;
3566 } 3822 }
3567 warn "end emergency player save\n"; 3823 info "emergency_perl_save: end player save\n";
3568 3824
3569 warn "begin emergency map save\n"; 3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 info "emergency_perl_save: begin map save\n";
3570 for my $path (keys %cf::MAP) { 3828 for my $path (keys %cf::MAP) {
3571 my $map = $cf::MAP{$path} or next; 3829 my $map = $cf::MAP{$path} or next;
3572 $map->valid or next; 3830 $map->valid or next;
3573 $map->save; 3831 $map->save;
3574 } 3832 }
3575 warn "end emergency map save\n"; 3833 info "emergency_perl_save: end map save\n";
3576 3834
3577 warn "begin emergency database checkpoint\n"; 3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3837 info "emergency_perl_save: begin database checkpoint\n";
3578 BDB::db_env_txn_checkpoint $DB_ENV; 3838 BDB::db_env_txn_checkpoint $DB_ENV;
3579 warn "end emergency database checkpoint\n"; 3839 info "emergency_perl_save: end database checkpoint\n";
3580 3840
3581 warn "begin write uuid\n"; 3841 info "emergency_perl_save: begin write uuid\n";
3582 write_uuid_sync 1; 3842 write_uuid_sync 1;
3583 warn "end write uuid\n"; 3843 info "emergency_perl_save: end write uuid\n";
3844
3845 cf::write_runtime_sync; # external watchdog should not bark
3846
3847 trace "emergency_perl_save: syncing database to disk";
3848 BDB::db_env_txn_checkpoint $DB_ENV;
3849
3850 info "emergency_perl_save: starting sync\n";
3851 IO::AIO::aio_sync sub {
3852 info "emergency_perl_save: finished sync\n";
3853 };
3854
3855 cf::write_runtime_sync; # external watchdog should not bark
3856
3857 trace "emergency_perl_save: flushing outstanding aio requests";
3858 while (IO::AIO::nreqs || BDB::nreqs) {
3859 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3860 }
3861
3862 cf::write_runtime_sync; # external watchdog should not bark
3584 }; 3863 };
3585 3864
3586 warn "leave emergency perl save\n"; 3865 info "emergency_perl_save: leave\n";
3587} 3866}
3588 3867
3589sub post_cleanup { 3868sub post_cleanup {
3590 my ($make_core) = @_; 3869 my ($make_core) = @_;
3591 3870
3871 IO::AIO::flush;
3872
3592 warn Carp::longmess "post_cleanup backtrace" 3873 error Carp::longmess "post_cleanup backtrace"
3593 if $make_core; 3874 if $make_core;
3875
3876 my $fh = pidfile;
3877 unlink $PIDFILE if <$fh> == $$;
3594} 3878}
3595 3879
3596# a safer delete_package, copied from Symbol 3880# a safer delete_package, copied from Symbol
3597sub clear_package($) { 3881sub clear_package($) {
3598 my $pkg = shift; 3882 my $pkg = shift;
3614 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3898 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3615 for my $name (keys %$leaf_symtab) { 3899 for my $name (keys %$leaf_symtab) {
3616 _gv_clear *{"$pkg$name"}; 3900 _gv_clear *{"$pkg$name"};
3617# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3901# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3618 } 3902 }
3619 warn "cleared package #$pkg\n";#d#
3620} 3903}
3621
3622our $RELOAD; # how many times to reload
3623 3904
3624sub do_reload_perl() { 3905sub do_reload_perl() {
3625 # can/must only be called in main 3906 # can/must only be called in main
3626 if ($Coro::current != $Coro::main) { 3907 if (in_main) {
3627 warn "can only reload from main coroutine"; 3908 error "can only reload from main coroutine";
3628 return; 3909 return;
3629 } 3910 }
3630 3911
3631 return if $RELOAD++; 3912 return if $RELOAD++;
3632 3913
3914 my $t1 = AE::time;
3915
3633 while ($RELOAD) { 3916 while ($RELOAD) {
3634 warn "reloading..."; 3917 info "reloading...";
3635 3918
3636 warn "entering sync_job"; 3919 trace "entering sync_job";
3637 3920
3638 cf::sync_job { 3921 cf::sync_job {
3639 cf::write_runtime_sync; # external watchdog should not bark
3640 cf::emergency_save; 3922 cf::emergency_save;
3641 cf::write_runtime_sync; # external watchdog should not bark
3642 3923
3643 warn "syncing database to disk";
3644 BDB::db_env_txn_checkpoint $DB_ENV;
3645
3646 # if anything goes wrong in here, we should simply crash as we already saved
3647
3648 warn "flushing outstanding aio requests";
3649 while (IO::AIO::nreqs || BDB::nreqs) {
3650 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3651 }
3652
3653 warn "cancelling all extension coros"; 3924 trace "cancelling all extension coros";
3654 $_->cancel for values %EXT_CORO; 3925 $_->cancel for values %EXT_CORO;
3655 %EXT_CORO = (); 3926 %EXT_CORO = ();
3656 3927
3657 warn "removing commands"; 3928 trace "removing commands";
3658 %COMMAND = (); 3929 %COMMAND = ();
3659 3930
3660 warn "removing ext/exti commands"; 3931 trace "removing ext/exti commands";
3661 %EXTCMD = (); 3932 %EXTCMD = ();
3662 %EXTICMD = (); 3933 %EXTICMD = ();
3663 3934
3664 warn "unloading/nuking all extensions"; 3935 trace "unloading/nuking all extensions";
3665 for my $pkg (@EXTS) { 3936 for my $pkg (@EXTS) {
3666 warn "... unloading $pkg"; 3937 trace "... unloading $pkg";
3667 3938
3668 if (my $cb = $pkg->can ("unload")) { 3939 if (my $cb = $pkg->can ("unload")) {
3669 eval { 3940 eval {
3670 $cb->($pkg); 3941 $cb->($pkg);
3671 1 3942 1
3672 } or warn "$pkg unloaded, but with errors: $@"; 3943 } or error "$pkg unloaded, but with errors: $@";
3673 } 3944 }
3674 3945
3675 warn "... clearing $pkg"; 3946 trace "... clearing $pkg";
3676 clear_package $pkg; 3947 clear_package $pkg;
3677 } 3948 }
3678 3949
3679 warn "unloading all perl modules loaded from $LIBDIR"; 3950 trace "unloading all perl modules loaded from $LIBDIR";
3680 while (my ($k, $v) = each %INC) { 3951 while (my ($k, $v) = each %INC) {
3681 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3952 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3682 3953
3683 warn "... unloading $k"; 3954 trace "... unloading $k";
3684 delete $INC{$k}; 3955 delete $INC{$k};
3685 3956
3686 $k =~ s/\.pm$//; 3957 $k =~ s/\.pm$//;
3687 $k =~ s/\//::/g; 3958 $k =~ s/\//::/g;
3688 3959
3691 } 3962 }
3692 3963
3693 clear_package $k; 3964 clear_package $k;
3694 } 3965 }
3695 3966
3696 warn "getting rid of safe::, as good as possible"; 3967 trace "getting rid of safe::, as good as possible";
3697 clear_package "safe::$_" 3968 clear_package "safe::$_"
3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3969 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3699 3970
3700 warn "unloading cf.pm \"a bit\""; 3971 trace "unloading cf.pm \"a bit\"";
3701 delete $INC{"cf.pm"}; 3972 delete $INC{"cf.pm"};
3702 delete $INC{"cf/pod.pm"}; 3973 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3703 3974
3704 # don't, removes xs symbols, too, 3975 # don't, removes xs symbols, too,
3705 # and global variables created in xs 3976 # and global variables created in xs
3706 #clear_package __PACKAGE__; 3977 #clear_package __PACKAGE__;
3707 3978
3708 warn "unload completed, starting to reload now"; 3979 info "unload completed, starting to reload now";
3709 3980
3710 warn "reloading cf.pm"; 3981 trace "reloading cf.pm";
3711 require cf; 3982 require cf;
3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3983 cf::_connect_to_perl_1;
3713 3984
3714 warn "loading config and database again"; 3985 trace "loading config and database again";
3715 cf::reload_config; 3986 cf::reload_config;
3716 3987
3717 warn "loading extensions"; 3988 trace "loading extensions";
3718 cf::load_extensions; 3989 cf::load_extensions;
3719 3990
3991 if ($REATTACH_ON_RELOAD) {
3720 warn "reattaching attachments to objects/players"; 3992 trace "reattaching attachments to objects/players";
3721 _global_reattach; # objects, sockets 3993 _global_reattach; # objects, sockets
3722 warn "reattaching attachments to maps"; 3994 trace "reattaching attachments to maps";
3723 reattach $_ for values %MAP; 3995 reattach $_ for values %MAP;
3724 warn "reattaching attachments to players"; 3996 trace "reattaching attachments to players";
3725 reattach $_ for values %PLAYER; 3997 reattach $_ for values %PLAYER;
3998 }
3726 3999
4000 trace "running post_init jobs";
4001 (pop @POST_INIT)->(1) while @POST_INIT;
4002
3727 warn "leaving sync_job"; 4003 trace "leaving sync_job";
3728 4004
3729 1 4005 1
3730 } or do { 4006 } or do {
3731 warn $@; 4007 error $@;
3732 cf::cleanup "error while reloading, exiting."; 4008 cf::cleanup "error while reloading, exiting.";
3733 }; 4009 };
3734 4010
3735 warn "reloaded"; 4011 info "reloaded";
3736 --$RELOAD; 4012 --$RELOAD;
3737 } 4013 }
4014
4015 $t1 = AE::time - $t1;
4016 info "reload completed in ${t1}s\n";
3738}; 4017};
3739 4018
3740our $RELOAD_WATCHER; # used only during reload 4019our $RELOAD_WATCHER; # used only during reload
3741 4020
3742sub reload_perl() { 4021sub reload_perl() {
3743 # doing reload synchronously and two reloads happen back-to-back, 4022 # doing reload synchronously and two reloads happen back-to-back,
3744 # coro crashes during coro_state_free->destroy here. 4023 # coro crashes during coro_state_free->destroy here.
3745 4024
4025 $RELOAD_WATCHER ||= cf::async {
4026 Coro::AIO::aio_wait cache_extensions;
4027
3746 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4028 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3747 do_reload_perl; 4029 do_reload_perl;
3748 undef $RELOAD_WATCHER; 4030 undef $RELOAD_WATCHER;
4031 };
3749 }; 4032 };
3750} 4033}
3751 4034
3752register_command "reload" => sub { 4035register_command "reload" => sub {
3753 my ($who, $arg) = @_; 4036 my ($who, $arg) = @_;
3759 reload_perl; 4042 reload_perl;
3760 }; 4043 };
3761 } 4044 }
3762}; 4045};
3763 4046
3764unshift @INC, $LIBDIR; 4047#############################################################################
3765 4048
3766my $bug_warning = 0; 4049my $bug_warning = 0;
3767 4050
3768our @WAIT_FOR_TICK; 4051our @WAIT_FOR_TICK;
3769our @WAIT_FOR_TICK_BEGIN; 4052our @WAIT_FOR_TICK_BEGIN;
3770 4053
3771sub wait_for_tick { 4054sub wait_for_tick {
3772 return if tick_inhibit || $Coro::current == $Coro::main; 4055 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3773 4056
3774 my $signal = new Coro::Signal; 4057 my $signal = new Coro::Signal;
3775 push @WAIT_FOR_TICK, $signal; 4058 push @WAIT_FOR_TICK, $signal;
3776 $signal->wait; 4059 $signal->wait;
3777} 4060}
3778 4061
3779sub wait_for_tick_begin { 4062sub wait_for_tick_begin {
3780 return if tick_inhibit || $Coro::current == $Coro::main; 4063 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3781 4064
3782 my $signal = new Coro::Signal; 4065 my $signal = new Coro::Signal;
3783 push @WAIT_FOR_TICK_BEGIN, $signal; 4066 push @WAIT_FOR_TICK_BEGIN, $signal;
3784 $signal->wait; 4067 $signal->wait;
3785} 4068}
3791 return; 4074 return;
3792 } 4075 }
3793 4076
3794 cf::server_tick; # one server iteration 4077 cf::server_tick; # one server iteration
3795 4078
4079 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4080
3796 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4081 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3797 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4082 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3798 Coro::async_pool { 4083 Coro::async_pool {
3799 $Coro::current->{desc} = "runtime saver"; 4084 $Coro::current->{desc} = "runtime saver";
3800 write_runtime_sync 4085 write_runtime_sync
3801 or warn "ERROR: unable to write runtime file: $!"; 4086 or error "ERROR: unable to write runtime file: $!";
3802 }; 4087 };
3803 } 4088 }
3804 4089
3805 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4090 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3806 $sig->send; 4091 $sig->send;
3814 4099
3815 if (0) { 4100 if (0) {
3816 if ($NEXT_TICK) { 4101 if ($NEXT_TICK) {
3817 my $jitter = $TICK_START - $NEXT_TICK; 4102 my $jitter = $TICK_START - $NEXT_TICK;
3818 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4103 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3819 warn "jitter $JITTER\n";#d# 4104 debug "jitter $JITTER\n";#d#
3820 } 4105 }
3821 } 4106 }
3822} 4107}
3823 4108
3824{ 4109{
3825 # configure BDB 4110 # configure BDB
3826 4111
3827 BDB::min_parallel 8; 4112 BDB::min_parallel 16;
3828 BDB::max_poll_reqs $TICK * 0.1; 4113 BDB::max_poll_reqs $TICK * 0.1;
3829 $AnyEvent::BDB::WATCHER->priority (1); 4114 $AnyEvent::BDB::WATCHER->priority (1);
3830 4115
3831 unless ($DB_ENV) { 4116 unless ($DB_ENV) {
3832 $DB_ENV = BDB::db_env_create; 4117 $DB_ENV = BDB::db_env_create;
3879 $msg =~ s/\n//; 4164 $msg =~ s/\n//;
3880 4165
3881 # limit the # of concurrent backtraces 4166 # limit the # of concurrent backtraces
3882 if ($_log_backtrace < 2) { 4167 if ($_log_backtrace < 2) {
3883 ++$_log_backtrace; 4168 ++$_log_backtrace;
4169 my $perl_bt = Carp::longmess $msg;
3884 async { 4170 async {
3885 $Coro::current->{desc} = "abt $msg"; 4171 $Coro::current->{desc} = "abt $msg";
3886 4172
3887 my @bt = fork_call { 4173 my @bt = fork_call {
3888 @addr = map { sprintf "%x", $_ } @addr; 4174 @addr = map { sprintf "%x", $_ } @addr;
3899 } 4185 }
3900 4186
3901 @funcs 4187 @funcs
3902 }; 4188 };
3903 4189
3904 LOG llevInfo, "[ABT] $msg\n"; 4190 LOG llevInfo, "[ABT] $perl_bt\n";
4191 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3905 LOG llevInfo, "[ABT] $_\n" for @bt; 4192 LOG llevInfo, "[ABT] $_\n" for @bt;
3906 --$_log_backtrace; 4193 --$_log_backtrace;
3907 }; 4194 };
3908 } else { 4195 } else {
3909 LOG llevInfo, "[ABT] $msg\n"; 4196 LOG llevInfo, "[ABT] $msg\n";
3910 LOG llevInfo, "[ABT] [suppressed]\n"; 4197 LOG llevInfo, "[ABT] [suppressed]\n";
3911 } 4198 }
3912} 4199}
3913 4200
3914# load additional modules 4201# load additional modules
3915use cf::pod; 4202require "cf/$_.pm" for @EXTRA_MODULES;
4203cf::_connect_to_perl_2;
3916 4204
3917END { cf::emergency_save } 4205END { cf::emergency_save }
3918 4206
39191 42071
3920 4208

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines