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.420 by root, Tue Apr 15 14:21:04 2008 UTC vs.
Revision 1.546 by root, Thu May 6 22:57:49 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 utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV 3.2; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
35 36
37use Guard ();
36use Coro 4.50 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
39use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
43use Coro::AIO; 48use Coro::AIO;
44use Coro::BDB; 49use Coro::BDB 1.6;
45use Coro::Storable; 50use Coro::Storable;
46use Coro::Util (); 51use Coro::Util ();
47 52
48use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
49use BDB (); 54use BDB ();
50use Data::Dumper; 55use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 56use Fcntl;
53use YAML (); 57use YAML::XS ();
54use IO::AIO 2.51 (); 58use IO::AIO ();
55use Time::HiRes; 59use Time::HiRes;
56use Compress::LZF; 60use Compress::LZF;
57use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
58 64
59# configure various modules to our taste 65# configure various modules to our taste
60# 66#
61$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
62Coro::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";
63Compress::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
64 75
65$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" };
66 78
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
71 85
72our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
82our $DATADIR = datadir; 98our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
92our %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;
93 118
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 121our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
99 123
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 127our $DB_ENV;
105 128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
106our %CFG; 131our %CFG;
107 132
108our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 134our $RUNTIME;
110our $NOW; 135our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 146our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
123 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
124binmode STDOUT; 154binmode STDOUT;
125binmode STDERR; 155binmode STDERR;
126 156
127# read virtual server time, if available 157# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
132} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
133 165
134mkdir $_ 166mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 168
137our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
138 170
139sub 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::"} };
140 187
141############################################################################# 188#############################################################################
142 189
143=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
144 191
186from wherever your confdir points to. 233from wherever your confdir points to.
187 234
188=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
189 236
190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
191returns 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 thread
192per 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.
193 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
194=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
195 247
196This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 250that call.
199 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
200=back 258=back
201 259
202=cut 260=cut
203 261
204BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
205 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
206 my $msg = join "", @_; 269 my $msg = join "", @_;
207 270
208 $msg .= "\n" 271 $msg .= "\n"
209 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
210 273
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 275
213 LOG llevError, $msg; 276 LOG llevWarn, $msg;
214 }; 277};
215}
216 278
217$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
219 281
220 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 286 return;#d#
223 }#d# 287 }#d#
224 288
225 # kill coroutine otherwise 289 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 290 Coro::terminate
228}; 291};
229
230$SIG{__DIE__} = sub { }; #d#?
231 292
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 303for my $pkg (qw(
243 cf::global cf::attachable 304 cf::global cf::attachable
244 cf::object cf::object::player 305 cf::object cf::object::player
245 cf::client cf::player 306 cf::client cf::player
246 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
247 cf::map cf::party cf::region 309 cf::party cf::region
248)) { 310)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 312}
252 313
253$EV::DIED = sub { 314$EV::DIED = sub {
254 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
255}; 316};
256 317
257############################################################################# 318#############################################################################
258 319
259=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 358
298sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
300 361
362=item cf::post_init { BLOCK }
363
364Execute the given codeblock, I<after> all extensions have been (re-)loaded,
365but I<before> the server starts ticking again.
366
367The cdoeblock will have a single boolean argument to indicate whether this
368is a reload or not.
369
370=cut
371
372sub post_init(&) {
373 push @POST_INIT, shift;
374}
375
301=item cf::lock_wait $string 376=item cf::lock_wait $string
302 377
303Wait until the given lock is available. See cf::lock_acquire. 378Wait until the given lock is available. See cf::lock_acquire.
304 379
305=item my $lock = cf::lock_acquire $string 380=item my $lock = cf::lock_acquire $string
306 381
307Wait until the given lock is available and then acquires it and returns 382Wait until the given lock is available and then acquires it and returns
308a Coro::guard object. If the guard object gets destroyed (goes out of scope, 383a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 384for example when the coroutine gets canceled), the lock is automatically
310returned. 385returned.
311 386
312Locks are *not* recursive, locking from the same coro twice results in a 387Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 388deadlocked coro.
319 394
320Return true if the lock is currently active, i.e. somebody has locked it. 395Return true if the lock is currently active, i.e. somebody has locked it.
321 396
322=cut 397=cut
323 398
324our %LOCK; 399our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 400
327sub lock_wait($) { 401sub lock_wait($) {
328 my ($key) = @_; 402 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 403}
341 404
342sub lock_acquire($) { 405sub lock_acquire($) {
343 my ($key) = @_; 406 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 407}
357 408
358sub lock_active($) { 409sub lock_active($) {
359 my ($key) = @_; 410 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 411}
363 412
364sub freeze_mainloop { 413sub freeze_mainloop {
365 tick_inhibit_inc; 414 tick_inhibit_inc;
366 415
367 Coro::guard \&tick_inhibit_dec; 416 &Guard::guard (\&tick_inhibit_dec);
368} 417}
369 418
370=item cf::periodic $interval, $cb 419=item cf::periodic $interval, $cb
371 420
372Like EV::periodic, but randomly selects a starting point so that the actions 421Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 422get spread over time.
374 423
375=cut 424=cut
376 425
377sub periodic($$) { 426sub periodic($$) {
378 my ($interval, $cb) = @_; 427 my ($interval, $cb) = @_;
395 444
396=cut 445=cut
397 446
398our @SLOT_QUEUE; 447our @SLOT_QUEUE;
399our $SLOT_QUEUE; 448our $SLOT_QUEUE;
449our $SLOT_DECAY = 0.9;
400 450
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 451$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 452$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 453 $Coro::current->desc ("timeslot manager");
404 454
405 my $signal = new Coro::Signal; 455 my $signal = new Coro::Signal;
456 my $busy;
406 457
407 while () { 458 while () {
408 next_job: 459 next_job:
460
409 my $avail = cf::till_tick; 461 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 462
411 for (0 .. $#SLOT_QUEUE) { 463 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 464 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 466 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 467 $job->[2]->send;
415 Coro::cede; 468 Coro::cede;
416 goto next_job; 469 goto next_job;
417 } 470 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 472 }
419 } 473 }
420 474
421 if (@SLOT_QUEUE) { 475 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 476 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 477 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 478 $signal->wait;
425 } else { 479 } else {
480 $busy = 0;
426 Coro::schedule; 481 Coro::schedule;
427 } 482 }
428 } 483 }
429}; 484};
430 485
431sub get_slot($;$$) { 486sub get_slot($;$$) {
432 return if tick_inhibit; 487 return if tick_inhibit || $Coro::current == $Coro::main;
433 488
434 my ($time, $pri, $name) = @_; 489 my ($time, $pri, $name) = @_;
435 490
436 $time = $TICK * .6 if $time > $TICK * .6; 491 $time = clamp $time, 0.01, $TICK * .6;
492
437 my $sig = new Coro::Signal; 493 my $sig = new Coro::Signal;
438 494
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 495 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 496 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready; 497 $SLOT_QUEUE->ready;
467=cut 523=cut
468 524
469sub sync_job(&) { 525sub sync_job(&) {
470 my ($job) = @_; 526 my ($job) = @_;
471 527
472 if ($Coro::current == $Coro::main) { 528 if (in_main) {
473 my $time = EV::time; 529 my $time = AE::time;
474 530
475 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
476 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
477 533
478 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
479 535
480 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
481 537
482 my $busy = 1; 538 my $busy = 1;
483 my @res; 539 my @res;
484 540
485 (async { 541 (async {
486 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
487 @res = eval { $job->() }; 543 @res = eval { $job->() };
488 warn $@ if $@; 544 error $@ if $@;
489 undef $busy; 545 undef $busy;
490 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
491 547
492 while ($busy) { 548 while ($busy) {
493 if (Coro::nready) { 549 if (Coro::nready) {
495 } else { 551 } else {
496 EV::loop EV::LOOP_ONESHOT; 552 EV::loop EV::LOOP_ONESHOT;
497 } 553 }
498 } 554 }
499 555
500 my $time = EV::time - $time; 556 my $time = AE::time - $time;
501 557
502 $TICK_START += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
503 559
504 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
505 } else { 561 } else {
549 reset_signals; 605 reset_signals;
550 &$cb 606 &$cb
551 }, @args; 607 }, @args;
552 608
553 wantarray ? @res : $res[-1] 609 wantarray ? @res : $res[-1]
610}
611
612sub objinfo {
613 (
614 "counter value" => cf::object::object_count,
615 "objects created" => cf::object::create_count,
616 "objects destroyed" => cf::object::destroy_count,
617 "freelist size" => cf::object::free_count,
618 "allocated objects" => cf::object::objects_size,
619 "active objects" => cf::object::actives_size,
620 )
554} 621}
555 622
556=item $coin = coin_from_name $name 623=item $coin = coin_from_name $name
557 624
558=cut 625=cut
595within each server. 662within each server.
596 663
597=cut 664=cut
598 665
599sub db_table($) { 666sub db_table($) {
667 cf::error "db_get called from main context"
668 if $Coro::current == $Coro::main;
669
600 my ($name) = @_; 670 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV; 671 my $db = BDB::db_create $DB_ENV;
602 672
603 eval { 673 eval {
604 $db->set_flags (BDB::CHKSUM); 674 $db->set_flags (BDB::CHKSUM);
614} 684}
615 685
616our $DB; 686our $DB;
617 687
618sub db_init { 688sub db_init {
619 cf::sync_job {
620 $DB ||= db_table "db"; 689 $DB ||= db_table "db";
621 };
622} 690}
623 691
624sub db_get($$) { 692sub db_get($$) {
625 my $key = "$_[0]/$_[1]"; 693 my $key = "$_[0]/$_[1]";
626 694
627 cf::sync_job { 695 cf::error "db_get called from main context"
696 if $Coro::current == $Coro::main;
697
628 BDB::db_get $DB, undef, $key, my $data; 698 BDB::db_get $DB, undef, $key, my $data;
629 699
630 $! ? () 700 $! ? ()
631 : $data 701 : $data
632 }
633} 702}
634 703
635sub db_put($$$) { 704sub db_put($$$) {
636 BDB::dbreq_pri 4; 705 BDB::dbreq_pri 4;
637 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 706 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
693 762
694 my $t1 = Time::HiRes::time; 763 my $t1 = Time::HiRes::time;
695 my $data = $process->(\@data); 764 my $data = $process->(\@data);
696 my $t2 = Time::HiRes::time; 765 my $t2 = Time::HiRes::time;
697 766
698 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 767 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
699 768
700 db_put cache => "$id/data", $data; 769 db_put cache => "$id/data", $data;
701 db_put cache => "$id/md5" , $md5; 770 db_put cache => "$id/md5" , $md5;
702 db_put cache => "$id/meta", $meta; 771 db_put cache => "$id/meta", $meta;
703 772
713 782
714=cut 783=cut
715 784
716sub datalog($@) { 785sub datalog($@) {
717 my ($type, %kv) = @_; 786 my ($type, %kv) = @_;
718 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 787 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
719} 788}
720 789
721=back 790=back
722 791
723=cut 792=cut
724 793
725############################################################################# 794#############################################################################
726 795
727=head2 ATTACHABLE OBJECTS 796=head2 ATTACHABLE OBJECTS
728 797
729Many objects in crossfire are so-called attachable objects. That means you can 798Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 799attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 800to it. All such attachable objects support the following methods.
732 801
733In the following description, CLASS can be any of C<global>, C<object> 802In the following description, CLASS can be any of C<global>, C<object>
734C<player>, C<client> or C<map> (i.e. the attachable objects in 803C<player>, C<client> or C<map> (i.e. the attachable objects in
784=item cf::CLASS::attachment $name, ... 853=item cf::CLASS::attachment $name, ...
785 854
786Register an attachment by C<$name> through which attachable objects of the 855Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 856given CLASS can refer to this attachment.
788 857
789Some classes such as crossfire maps and objects can specify attachments 858Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 859that are attached at load/instantiate time, thus the need for a name.
791 860
792These calls expect any number of the following handler/hook descriptions: 861These calls expect any number of the following handler/hook descriptions:
793 862
794=over 4 863=over 4
918 987
919 } elsif (exists $cb_id{$type}) { 988 } elsif (exists $cb_id{$type}) {
920 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 989 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
921 990
922 } elsif (ref $type) { 991 } elsif (ref $type) {
923 warn "attaching objects not supported, ignoring.\n"; 992 error "attaching objects not supported, ignoring.\n";
924 993
925 } else { 994 } else {
926 shift @arg; 995 shift @arg;
927 warn "attach argument '$type' not supported, ignoring.\n"; 996 error "attach argument '$type' not supported, ignoring.\n";
928 } 997 }
929 } 998 }
930} 999}
931 1000
932sub _object_attach { 1001sub _object_attach {
942 _attach $registry, $klass, @attach; 1011 _attach $registry, $klass, @attach;
943 } 1012 }
944 1013
945 $obj->{$name} = \%arg; 1014 $obj->{$name} = \%arg;
946 } else { 1015 } else {
947 warn "object uses attachment '$name' which is not available, postponing.\n"; 1016 info "object uses attachment '$name' which is not available, postponing.\n";
948 } 1017 }
949 1018
950 $obj->{_attachment}{$name} = undef; 1019 $obj->{_attachment}{$name} = undef;
951} 1020}
952 1021
1011 1080
1012 for (@$callbacks) { 1081 for (@$callbacks) {
1013 eval { &{$_->[1]} }; 1082 eval { &{$_->[1]} };
1014 1083
1015 if ($@) { 1084 if ($@) {
1016 warn "$@";
1017 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1085 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1018 override; 1086 override;
1019 } 1087 }
1020 1088
1021 return 1 if $override; 1089 return 1 if $override;
1022 } 1090 }
1085 1153
1086sub reattach { 1154sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1155 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1156 my ($obj) = @_;
1089 1157
1158 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1159 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1160
1092 my $registry = $obj->registry; 1161 my $registry = $obj->registry;
1093 1162
1094 @$registry = (); 1163 @$registry = ();
1095 1164
1100 for (@$attach) { 1169 for (@$attach) {
1101 my ($klass, @attach) = @$_; 1170 my ($klass, @attach) = @$_;
1102 _attach $registry, $klass, @attach; 1171 _attach $registry, $klass, @attach;
1103 } 1172 }
1104 } else { 1173 } else {
1105 warn "object uses attachment '$name' that is not available, postponing.\n"; 1174 info "object uses attachment '$name' that is not available, postponing.\n";
1106 } 1175 }
1107 } 1176 }
1108} 1177}
1109 1178
1110cf::attachable->attach ( 1179cf::attachable->attach (
1137 my ($filename, $rdata, $objs) = @_; 1206 my ($filename, $rdata, $objs) = @_;
1138 1207
1139 sync_job { 1208 sync_job {
1140 if (length $$rdata) { 1209 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename); 1210 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1211 trace sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1212 $decname, length $$rdata, scalar @$objs
1213 if $VERBOSE_IO;
1144 1214
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1215 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1216 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1217 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1218 if ($cf::USE_FSYNC) {
1219 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;
1220 aio_fsync $fh;
1221 }
1149 close $fh; 1222 aio_close $fh;
1150 1223
1151 if (@$objs) { 1224 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1225 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 chmod SAVE_MODE, $fh; 1226 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1227 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1228 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1229 if ($cf::USE_FSYNC) {
1230 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;
1231 aio_fsync $fh;
1232 }
1157 close $fh; 1233 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1234 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1235 }
1160 } else { 1236 } else {
1161 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1162 } 1238 }
1163 1239
1164 aio_rename "$filename~", $filename; 1240 aio_rename "$filename~", $filename;
1241
1242 $filename =~ s%/[^/]+$%%;
1243 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1244 } else {
1166 warn "FATAL: $filename~: $!\n"; 1245 error "unable to save objects: $filename~: $!\n";
1167 } 1246 }
1168 } else { 1247 } else {
1169 aio_unlink $filename; 1248 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1249 aio_unlink "$filename.pst";
1171 } 1250 }
1195 my $st = eval { Coro::Storable::thaw $av }; 1274 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs}; 1275 $av = $st->{objs};
1197 } 1276 }
1198 1277
1199 utf8::decode (my $decname = $filename); 1278 utf8::decode (my $decname = $filename);
1200 warn sprintf "loading %s (%d,%d)\n", 1279 trace sprintf "loading %s (%d,%d)\n",
1201 $decname, length $data, scalar @{$av || []}; 1280 $decname, length $data, scalar @{$av || []}
1281 if $VERBOSE_IO;
1202 1282
1203 ($data, $av) 1283 ($data, $av)
1204} 1284}
1205 1285
1206=head2 COMMAND CALLBACKS 1286=head2 COMMAND CALLBACKS
1262 my ($name, $cb) = @_; 1342 my ($name, $cb) = @_;
1263 1343
1264 $EXTICMD{$name} = $cb; 1344 $EXTICMD{$name} = $cb;
1265} 1345}
1266 1346
1347use File::Glob ();
1348
1267cf::player->attach ( 1349cf::player->attach (
1268 on_command => sub { 1350 on_unknown_command => sub {
1269 my ($pl, $name, $params) = @_; 1351 my ($pl, $name, $params) = @_;
1270 1352
1271 my $cb = $COMMAND{$name} 1353 my $cb = $COMMAND{$name}
1272 or return; 1354 or return;
1273 1355
1296 1378
1297 $pl->ext_reply ($reply, @reply) 1379 $pl->ext_reply ($reply, @reply)
1298 if $reply; 1380 if $reply;
1299 1381
1300 } else { 1382 } else {
1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1383 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1302 } 1384 }
1303 1385
1304 cf::override; 1386 cf::override;
1305 }, 1387 },
1306); 1388);
1307 1389
1390# "readahead" all extensions
1391sub cache_extensions {
1392 my $grp = IO::AIO::aio_group;
1393
1394 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1395 for (grep /\.ext$/, @{$_[0]}) {
1396 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1397 }
1398 };
1399
1400 $grp
1401}
1402
1308sub load_extensions { 1403sub load_extensions {
1404 info "loading extensions...";
1405
1309 cf::sync_job { 1406 cf::sync_job {
1310 my %todo; 1407 my %todo;
1311 1408
1312 for my $path (<$LIBDIR/*.ext>) { 1409 for my $path (<$LIBDIR/*.ext>) {
1313 next unless -r $path; 1410 next unless -r $path;
1331 1428
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1429 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1430 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1431
1335 $ext{source} = 1432 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1433 "package $pkg; use common::sense;\n"
1337 . "#line 1 \"$path\"\n{\n" 1434 . "#line 1 \"$path\"\n{\n"
1338 . $source 1435 . $source
1339 . "\n};\n1"; 1436 . "\n};\n1";
1340 1437
1341 $todo{$base} = \%ext; 1438 $todo{$base} = \%ext;
1342 } 1439 }
1343 1440
1441 my $pass = 0;
1344 my %done; 1442 my %done;
1345 while (%todo) { 1443 while (%todo) {
1346 my $progress; 1444 my $progress;
1347 1445
1446 ++$pass;
1447
1448 ext:
1348 while (my ($k, $v) = each %todo) { 1449 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) { 1450 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip 1451 next ext
1351 unless exists $done{$_}; 1452 unless exists $done{$_};
1352 } 1453 }
1353 1454
1354 warn "... loading '$k' into '$v->{pkg}'\n"; 1455 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355 1456
1356 unless (eval $v->{source}) { 1457 my $active = eval $v->{source};
1458
1459 if (length $@) {
1357 my $msg = $@ ? "$v->{path}: $@\n" 1460 error "$v->{path}: $@\n";
1358 : "$v->{base}: extension inactive.\n";
1359 1461
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1462 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1463 if exists $v->{meta}{mandatory};
1364 1464
1365 warn $msg; 1465 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1466 delete $todo{$k};
1467 } else {
1468 $done{$k} = delete $todo{$k};
1469 push @EXTS, $v->{pkg};
1470 $progress = 1;
1471
1472 info "$v->{base}: extension inactive.\n"
1473 unless $active;
1366 } 1474 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1475 }
1372 1476
1373 skip: 1477 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1478 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 unless $progress; 1479
1480 while (my ($k, $v) = each %todo) {
1481 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1482 if exists $v->{meta}{mandatory};
1483 }
1484 }
1376 } 1485 }
1377 }; 1486 };
1378} 1487}
1379 1488
1380############################################################################# 1489#############################################################################
1381 1490
1382=back 1491=back
1383 1492
1384=head2 CORE EXTENSIONS 1493=head2 CORE EXTENSIONS
1385 1494
1386Functions and methods that extend core crossfire objects. 1495Functions and methods that extend core deliantra objects.
1387 1496
1388=cut 1497=cut
1389 1498
1390package cf::player; 1499package cf::player;
1391 1500
1434 1543
1435sub exists($) { 1544sub exists($) {
1436 my ($login) = @_; 1545 my ($login) = @_;
1437 1546
1438 $cf::PLAYER{$login} 1547 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1548 or !aio_stat path $login
1440} 1549}
1441 1550
1442sub find($) { 1551sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1552 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1553 my $login = $_[0];
1456 my $f = new_from_file cf::object::thawer path $login 1565 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1566 or return;
1458 1567
1459 my $pl = cf::player::load_pl $f 1568 my $pl = cf::player::load_pl $f
1460 or return; 1569 or return;
1570
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1571 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1572 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1573 $cf::PLAYER{$login} = $pl
1464 } 1574 }
1465 } 1575 }
1466} 1576}
1467 1577
1578cf::player->attach (
1579 on_load => sub {
1580 my ($pl, $path) = @_;
1581
1582 # restore slots saved in save, below
1583 my $slots = delete $pl->{_slots};
1584
1585 $pl->ob->current_weapon ($slots->[0]);
1586 $pl->combat_ob ($slots->[1]);
1587 $pl->ranged_ob ($slots->[2]);
1588 },
1589);
1590
1468sub save($) { 1591sub save($) {
1469 my ($pl) = @_; 1592 my ($pl) = @_;
1470 1593
1471 return if $pl->{deny_save}; 1594 return if $pl->{deny_save};
1472 1595
1477 1600
1478 aio_mkdir playerdir $pl, 0770; 1601 aio_mkdir playerdir $pl, 0770;
1479 $pl->{last_save} = $cf::RUNTIME; 1602 $pl->{last_save} = $cf::RUNTIME;
1480 1603
1481 cf::get_slot 0.01; 1604 cf::get_slot 0.01;
1605
1606 # save slots, to be restored later
1607 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1482 1608
1483 $pl->save_pl ($path); 1609 $pl->save_pl ($path);
1484 cf::cede_to_tick; 1610 cf::cede_to_tick;
1485} 1611}
1486 1612
1518 my ($pl) = @_; 1644 my ($pl) = @_;
1519 1645
1520 my $name = $pl->ob->name; 1646 my $name = $pl->ob->name;
1521 1647
1522 $pl->{deny_save} = 1; 1648 $pl->{deny_save} = 1;
1523 $pl->password ("*"); # this should lock out the player until we nuked the dir 1649 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1524 1650
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1651 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1652 $pl->deactivate;
1653 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1654 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1655 $pl->ns->destroy if $pl->ns;
1529 1656
1530 my $path = playerdir $pl; 1657 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1658 my $temp = "$path~$cf::RUNTIME~deleting~";
1570 1697
1571 for my $login (@$dirs) { 1698 for my $login (@$dirs) {
1572 my $path = path $login; 1699 my $path = path $login;
1573 1700
1574 # a .pst is a dead give-away for a valid player 1701 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1702 # if no pst file found, open and chekc for blocked users
1703 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1704 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1705 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1706 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1707 }
1580 1708
1584 1712
1585 \@logins 1713 \@logins
1586} 1714}
1587 1715
1588=item $player->maps 1716=item $player->maps
1717
1718=item cf::player::maps $login
1589 1719
1590Returns an arrayref of map paths that are private for this 1720Returns an arrayref of map paths that are private for this
1591player. May block. 1721player. May block.
1592 1722
1593=cut 1723=cut
1611 } 1741 }
1612 1742
1613 \@paths 1743 \@paths
1614} 1744}
1615 1745
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1746=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1747
1618Expand crossfire pod fragments into protocol xml. 1748Expand deliantra pod fragments into protocol xml.
1619
1620=cut
1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1633sub expand_cfpod {
1634 my ($self, $pod) = @_;
1635
1636 my $xml;
1637
1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1641
1642 $group =~ s/&/&amp;/g;
1643 $group =~ s/</&lt;/g;
1644
1645 $xml .= $group;
1646 } elsif ($pod =~ m%\G
1647 ([BCGHITU])
1648 <
1649 (?:
1650 ([^<>]*) (?{ $group = $^N })
1651 | < $interior >
1652 )
1653 >
1654 %gcsx
1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675 "")
1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1687
1688 for ($xml) {
1689 # create single paragraphs (very hackish)
1690 s/(?<=\S)\n(?=\w)/ /g;
1691
1692 # compress some whitespace
1693 s/\s+\n/\n/g; # ws line-ends
1694 s/\n\n+/\n/g; # double lines
1695 s/^\n+//; # beginning lines
1696 s/\n+$//; # ending lines
1697 }
1698
1699 $xml
1700}
1701
1702no re 'eval';
1703
1704sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode}
1707}
1708 1749
1709=item $player->ext_reply ($msgid, @msg) 1750=item $player->ext_reply ($msgid, @msg)
1710 1751
1711Sends an ext reply to the player. 1752Sends an ext reply to the player.
1712 1753
1744 1785
1745=cut 1786=cut
1746 1787
1747sub find_by_path($) { 1788sub find_by_path($) {
1748 my ($path) = @_; 1789 my ($path) = @_;
1790
1791 $path =~ s/^~[^\/]*//; # skip ~login
1749 1792
1750 my ($match, $specificity); 1793 my ($match, $specificity);
1751 1794
1752 for my $region (list) { 1795 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1796 if ($region->{match} && $path =~ $region->{match}) {
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1828 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786 1829
1787 # mit "rum" bekleckern, nicht 1830 # mit "rum" bekleckern, nicht
1788 $self->_create_random_map ( 1831 $self->_create_random_map (
1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1832 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1833 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1834 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1792 $rmp->{exit_on_final_map}, 1835 $rmp->{exit_on_final_map},
1793 $rmp->{xsize}, $rmp->{ysize}, 1836 $rmp->{xsize}, $rmp->{ysize},
1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1837 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1838 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1810 1853
1811sub register { 1854sub register {
1812 my (undef, $regex, $prio) = @_; 1855 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 1856 my $pkg = caller;
1814 1857
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 1858 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 1859
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1860 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1861}
1820 1862
1821# also paths starting with '/' 1863# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1864$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1865
1824sub thawer_merge { 1866sub thawer_merge {
1825 my ($self, $merge) = @_; 1867 my ($self, $merge) = @_;
1826 1868
1827 # we have to keep some variables in memory intact 1869 # we have to keep some variables in memory intact
1832} 1874}
1833 1875
1834sub normalise { 1876sub normalise {
1835 my ($path, $base) = @_; 1877 my ($path, $base) = @_;
1836 1878
1837 $path = "$path"; # make sure its a string 1879 $path = "$path"; # make sure it's a string
1838 1880
1839 $path =~ s/\.map$//; 1881 $path =~ s/\.map$//;
1840 1882
1841 # map plan: 1883 # map plan:
1842 # 1884 #
1881 $self->init; # pass $1 etc. 1923 $self->init; # pass $1 etc.
1882 return $self; 1924 return $self;
1883 } 1925 }
1884 } 1926 }
1885 1927
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1928 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 1929 ()
1888} 1930}
1889 1931
1890sub init { 1932sub init {
1891 my ($self) = @_; 1933 my ($self) = @_;
1923sub uniq_path { 1965sub uniq_path {
1924 my ($self) = @_; 1966 my ($self) = @_;
1925 1967
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1968 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 1969 "$UNIQUEDIR/$path"
1928}
1929
1930# and all this just because we cannot iterate over
1931# all maps in C++...
1932sub change_all_map_light {
1933 my ($change) = @_;
1934
1935 $_->change_map_light ($change)
1936 for grep $_->outdoor, values %cf::MAP;
1937} 1970}
1938 1971
1939sub decay_objects { 1972sub decay_objects {
1940 my ($self) = @_; 1973 my ($self) = @_;
1941 1974
2023 2056
2024sub find; 2057sub find;
2025sub find { 2058sub find {
2026 my ($path, $origin) = @_; 2059 my ($path, $origin) = @_;
2027 2060
2061 cf::cede_to_tick;
2062
2028 $path = normalise $path, $origin && $origin->path; 2063 $path = normalise $path, $origin && $origin->path;
2029 2064
2030 cf::lock_wait "map_data:$path";#d#remove 2065 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 2066 my $guard2 = cf::lock_acquire "map_find:$path";
2032 2067
2033 $cf::MAP{$path} || do { 2068 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
2037 my $map = new_from_path cf::map $path 2069 my $map = new_from_path cf::map $path
2038 or return; 2070 or return;
2039 2071
2040 $map->{last_save} = $cf::RUNTIME; 2072 $map->{last_save} = $cf::RUNTIME;
2041 2073
2043 or return; 2075 or return;
2044 2076
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2077 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 2078 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 2079 #$cf::WAIT_FOR_TICK->wait;
2080 undef $guard2;
2048 undef $guard1; 2081 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 2082 $map->reset;
2051 return find $path; 2083 return find $path;
2052 } 2084 }
2053 2085
2054 $cf::MAP{$path} = $map 2086 $cf::MAP{$path} = $map
2055 } 2087 }
2056} 2088}
2057 2089
2058sub pre_load { } 2090sub pre_load { }
2059sub post_load { } 2091#sub post_load { } # XS
2060 2092
2061sub load { 2093sub load {
2062 my ($self) = @_; 2094 my ($self) = @_;
2063 2095
2064 local $self->{deny_reset} = 1; # loading can take a long time 2096 local $self->{deny_reset} = 1; # loading can take a long time
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2113 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2114 $f->skip_block;
2083 $self->_load_objects ($f) 2115 $self->_load_objects ($f)
2084 or return; 2116 or return;
2085 2117
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2118 $self->post_load_original
2087 if delete $self->{load_original}; 2119 if delete $self->{load_original};
2088 2120
2089 if (my $uniq = $self->uniq_path) { 2121 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2122 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2123 unless (aio_stat $uniq) {
2109 unless ($self->{deny_activate}) { 2141 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2142 $self->decay_objects;
2111 $self->fix_auto_apply; 2143 $self->fix_auto_apply;
2112 $self->update_buttons; 2144 $self->update_buttons;
2113 cf::cede_to_tick; 2145 cf::cede_to_tick;
2114 $self->set_darkness_map;
2115 cf::cede_to_tick;
2116 $self->activate; 2146 $self->activate;
2117 } 2147 }
2118 2148
2119 $self->{last_save} = $cf::RUNTIME; 2149 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2150 $self->last_access ($cf::RUNTIME);
2123 } 2153 }
2124 2154
2125 $self->post_load; 2155 $self->post_load;
2126} 2156}
2127 2157
2158# customize the map for a given player, i.e.
2159# return the _real_ map. used by e.g. per-player
2160# maps to change the path to ~playername/mappath
2128sub customise_for { 2161sub customise_for {
2129 my ($self, $ob) = @_; 2162 my ($self, $ob) = @_;
2130 2163
2131 return find "~" . $ob->name . "/" . $self->{path} 2164 return find "~" . $ob->name . "/" . $self->{path}
2132 if $self->per_player; 2165 if $self->per_player;
2148 or next; 2181 or next;
2149 $neigh = find $neigh, $map 2182 $neigh = find $neigh, $map
2150 or next; 2183 or next;
2151 $neigh->load; 2184 $neigh->load;
2152 2185
2186 # now find the diagonal neighbours
2153 push @neigh, 2187 push @neigh,
2154 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2188 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2155 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2189 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2156 } 2190 }
2157 2191
2164} 2198}
2165 2199
2166sub find_sync { 2200sub find_sync {
2167 my ($path, $origin) = @_; 2201 my ($path, $origin) = @_;
2168 2202
2169 cf::sync_job { find $path, $origin } 2203 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2204 if $Coro::current == $Coro::main;
2205
2206 find $path, $origin
2170} 2207}
2171 2208
2172sub do_load_sync { 2209sub do_load_sync {
2173 my ($map) = @_; 2210 my ($map) = @_;
2174 2211
2175 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2212 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2176 if $Coro::current == $Coro::main; 2213 if $Coro::current == $Coro::main;
2177 2214
2178 cf::sync_job { $map->load }; 2215 $map->load;
2179} 2216}
2180 2217
2181our %MAP_PREFETCH; 2218our %MAP_PREFETCH;
2182our $MAP_PREFETCHER = undef; 2219our $MAP_PREFETCHER = undef;
2183 2220
2209 $MAP_PREFETCHER->prio (6); 2246 $MAP_PREFETCHER->prio (6);
2210 2247
2211 () 2248 ()
2212} 2249}
2213 2250
2251# common code, used by both ->save and ->swapout
2214sub save { 2252sub _save {
2215 my ($self) = @_; 2253 my ($self) = @_;
2216
2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2254
2219 $self->{last_save} = $cf::RUNTIME; 2255 $self->{last_save} = $cf::RUNTIME;
2220 2256
2221 return unless $self->dirty; 2257 return unless $self->dirty;
2222 2258
2242 } else { 2278 } else {
2243 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2279 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2244 } 2280 }
2245} 2281}
2246 2282
2283sub save {
2284 my ($self) = @_;
2285
2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
2287
2288 $self->_save;
2289}
2290
2247sub swap_out { 2291sub swap_out {
2248 my ($self) = @_; 2292 my ($self) = @_;
2249 2293
2250 # save first because save cedes
2251 $self->save;
2252
2253 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2294 my $lock = cf::lock_acquire "map_data:$self->{path}";
2254 2295
2255 return if $self->players;
2256 return if $self->in_memory != cf::MAP_ACTIVE; 2296 return if $self->in_memory != cf::MAP_ACTIVE;
2257 return if $self->{deny_save}; 2297 return if $self->{deny_save};
2298 return if $self->players;
2258 2299
2300 # first deactivate the map and "unlink" it from the core
2301 $self->deactivate;
2302 $_->clear_links_to ($self) for values %cf::MAP;
2259 $self->in_memory (cf::MAP_SWAPPED); 2303 $self->in_memory (cf::MAP_SWAPPED);
2304
2305 # then atomically save
2306 $self->_save;
2307
2308 # then free the map
2309 $self->clear;
2310}
2311
2312sub reset_at {
2313 my ($self) = @_;
2314
2315 # TODO: safety, remove and allow resettable per-player maps
2316 return 1e99 if $self->{deny_reset};
2317
2318 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2319 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2320
2321 $time + $to
2322}
2323
2324sub should_reset {
2325 my ($self) = @_;
2326
2327 $self->reset_at <= $cf::RUNTIME
2328}
2329
2330sub reset {
2331 my ($self) = @_;
2332
2333 my $lock = cf::lock_acquire "map_data:$self->{path}";
2334
2335 return if $self->players;
2336
2337 cf::trace "resetting map ", $self->path, "\n";
2338
2339 $self->in_memory (cf::MAP_SWAPPED);
2340
2341 # need to save uniques path
2342 unless ($self->{deny_save}) {
2343 my $uniq = $self->uniq_path; utf8::encode $uniq;
2344
2345 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2346 if $uniq;
2347 }
2348
2349 delete $cf::MAP{$self->path};
2260 2350
2261 $self->deactivate; 2351 $self->deactivate;
2262 $_->clear_links_to ($self) for values %cf::MAP; 2352 $_->clear_links_to ($self) for values %cf::MAP;
2263 $self->clear; 2353 $self->clear;
2264}
2265
2266sub reset_at {
2267 my ($self) = @_;
2268
2269 # TODO: safety, remove and allow resettable per-player maps
2270 return 1e99 if $self->{deny_reset};
2271
2272 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2273 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2274
2275 $time + $to
2276}
2277
2278sub should_reset {
2279 my ($self) = @_;
2280
2281 $self->reset_at <= $cf::RUNTIME
2282}
2283
2284sub reset {
2285 my ($self) = @_;
2286
2287 my $lock = cf::lock_acquire "map_data:$self->{path}";
2288
2289 return if $self->players;
2290
2291 warn "resetting map ", $self->path;
2292
2293 $self->in_memory (cf::MAP_SWAPPED);
2294
2295 # need to save uniques path
2296 unless ($self->{deny_save}) {
2297 my $uniq = $self->uniq_path; utf8::encode $uniq;
2298
2299 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2300 if $uniq;
2301 }
2302
2303 delete $cf::MAP{$self->path};
2304
2305 $self->deactivate;
2306 $_->clear_links_to ($self) for values %cf::MAP;
2307 $self->clear;
2308 2354
2309 $self->unlink_save; 2355 $self->unlink_save;
2310 $self->destroy; 2356 $self->destroy;
2311} 2357}
2312 2358
2320 2366
2321 delete $cf::MAP{$self->path}; 2367 delete $cf::MAP{$self->path};
2322 2368
2323 $self->unlink_save; 2369 $self->unlink_save;
2324 2370
2325 bless $self, "cf::map"; 2371 bless $self, "cf::map::wrap";
2326 delete $self->{deny_reset}; 2372 delete $self->{deny_reset};
2327 $self->{deny_save} = 1; 2373 $self->{deny_save} = 1;
2328 $self->reset_timeout (1); 2374 $self->reset_timeout (1);
2329 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2375 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2330 2376
2387 : normalise $_ 2433 : normalise $_
2388 } @{ aio_readdir $UNIQUEDIR or [] } 2434 } @{ aio_readdir $UNIQUEDIR or [] }
2389 ] 2435 ]
2390} 2436}
2391 2437
2438=item cf::map::static_maps
2439
2440Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2441file in the shared directory excluding F</styles> and F</editor>). May
2442block.
2443
2444=cut
2445
2446sub static_maps() {
2447 my @dirs = "";
2448 my @maps;
2449
2450 while (@dirs) {
2451 my $dir = shift @dirs;
2452
2453 next if $dir eq "/styles" || $dir eq "/editor";
2454
2455 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2456 or return;
2457
2458 for (@$files) {
2459 s/\.map$// or next;
2460 utf8::decode $_;
2461 push @maps, "$dir/$_";
2462 }
2463
2464 push @dirs, map "$dir/$_", @$dirs;
2465 }
2466
2467 \@maps
2468}
2469
2392=back 2470=back
2393 2471
2394=head3 cf::object 2472=head3 cf::object
2395 2473
2396=cut 2474=cut
2457can be C<undef>. Does the right thing when the player is currently in a 2535can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2536dialogue with the given NPC character.
2459 2537
2460=cut 2538=cut
2461 2539
2540our $SAY_CHANNEL = {
2541 id => "say",
2542 title => "Map",
2543 reply => "say ",
2544 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2545};
2546
2547our $CHAT_CHANNEL = {
2548 id => "chat",
2549 title => "Chat",
2550 reply => "chat ",
2551 tooltip => "Player chat and shouts, global to the server.",
2552};
2553
2462# rough implementation of a future "reply" method that works 2554# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2555# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2556#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2557sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2558 my ($self, $npc, $msg, $flags) = @_;
2477 my $dialog = $pl->{npc_dialog}; 2569 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2570 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2571
2480 } else { 2572 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2573 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2574 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2575 }
2484 } 2576 }
2485} 2577}
2486 2578
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2579=item $object->send_msg ($channel, $msg, $color, [extra...])
2512 2604
2513=item $player_object->enter_link 2605=item $player_object->enter_link
2514 2606
2515Freezes the player and moves him/her to a special map (C<{link}>). 2607Freezes the player and moves him/her to a special map (C<{link}>).
2516 2608
2517The player should be reasonably safe there for short amounts of time. You 2609The player should be reasonably safe there for short amounts of time (e.g.
2518I<MUST> call C<leave_link> as soon as possible, though. 2610for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2611though, as the player cannot control the character while it is on the link
2612map.
2519 2613
2520Will never block. 2614Will never block.
2521 2615
2522=item $player_object->leave_link ($map, $x, $y) 2616=item $player_object->leave_link ($map, $x, $y)
2523 2617
2543sub cf::object::player::enter_link { 2637sub cf::object::player::enter_link {
2544 my ($self) = @_; 2638 my ($self) = @_;
2545 2639
2546 $self->deactivate_recursive; 2640 $self->deactivate_recursive;
2547 2641
2642 ++$self->{_link_recursion};
2643
2548 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2644 return if UNIVERSAL::isa $self->map, "ext::map_link";
2549 2645
2550 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2646 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2551 if $self->map && $self->map->{path} ne "{link}"; 2647 if $self->map && $self->map->{path} ne "{link}";
2552 2648
2553 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2649 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2554} 2650}
2555 2651
2556sub cf::object::player::leave_link { 2652sub cf::object::player::leave_link {
2557 my ($self, $map, $x, $y) = @_; 2653 my ($self, $map, $x, $y) = @_;
2558 2654
2575 ($x, $y) = (-1, -1) 2671 ($x, $y) = (-1, -1)
2576 unless (defined $x) && (defined $y); 2672 unless (defined $x) && (defined $y);
2577 2673
2578 # use -1 or undef as default coordinates, not 0, 0 2674 # use -1 or undef as default coordinates, not 0, 0
2579 ($x, $y) = ($map->enter_x, $map->enter_y) 2675 ($x, $y) = ($map->enter_x, $map->enter_y)
2580 if $x <=0 && $y <= 0; 2676 if $x <= 0 && $y <= 0;
2581 2677
2582 $map->load; 2678 $map->load;
2583 $map->load_neighbours; 2679 $map->load_neighbours;
2584 2680
2585 return unless $self->contr->active; 2681 return unless $self->contr->active;
2586 $self->activate_recursive;
2587 2682
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2683 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2684 if ($self->enter_map ($map, $x, $y)) {
2590} 2685 # entering was successful
2686 delete $self->{_link_recursion};
2687 # only activate afterwards, to support waiting in hooks
2688 $self->activate_recursive;
2689 }
2591 2690
2691}
2692
2592=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2693=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2593 2694
2594Moves the player to the given map-path and coordinates by first freezing 2695Moves the player to the given map-path and coordinates by first freezing
2595her, loading and preparing them map, calling the provided $check callback 2696her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2697that has to return the map if sucecssful, and then unfreezes the player on
2597the new (success) or old (failed) map position. In either case, $done will 2698the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2699be called at the end of this process.
2599 2700
2701Note that $check will be called with a potentially non-loaded map, so if
2702it needs a loaded map it has to call C<< ->load >>.
2703
2600=cut 2704=cut
2601 2705
2602our $GOTOGEN; 2706our $GOTOGEN;
2603 2707
2604sub cf::object::player::goto { 2708sub cf::object::player::goto {
2605 my ($self, $path, $x, $y, $check, $done) = @_; 2709 my ($self, $path, $x, $y, $check, $done) = @_;
2710
2711 if ($self->{_link_recursion} >= $MAX_LINKS) {
2712 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2713 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2714 ($path, $x, $y) = @$EMERGENCY_POSITION;
2715 }
2606 2716
2607 # do generation counting so two concurrent goto's will be executed in-order 2717 # do generation counting so two concurrent goto's will be executed in-order
2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2718 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2609 2719
2610 $self->enter_link; 2720 $self->enter_link;
2634 my $map = eval { 2744 my $map = eval {
2635 my $map = defined $path ? cf::map::find $path : undef; 2745 my $map = defined $path ? cf::map::find $path : undef;
2636 2746
2637 if ($map) { 2747 if ($map) {
2638 $map = $map->customise_for ($self); 2748 $map = $map->customise_for ($self);
2639 $map = $check->($map) if $check && $map; 2749 $map = $check->($map, $x, $y, $self) if $check && $map;
2640 } else { 2750 } else {
2641 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2751 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2642 } 2752 }
2643 2753
2644 $map 2754 $map
2652 if ($gen == $self->{_goto_generation}) { 2762 if ($gen == $self->{_goto_generation}) {
2653 delete $self->{_goto_generation}; 2763 delete $self->{_goto_generation};
2654 $self->leave_link ($map, $x, $y); 2764 $self->leave_link ($map, $x, $y);
2655 } 2765 }
2656 2766
2657 $done->() if $done; 2767 $done->($self) if $done;
2658 })->prio (1); 2768 })->prio (1);
2659} 2769}
2660 2770
2661=item $player_object->enter_exit ($exit_object) 2771=item $player_object->enter_exit ($exit_object)
2662 2772
2682} 2792}
2683 2793
2684sub prepare_random_map { 2794sub prepare_random_map {
2685 my ($exit) = @_; 2795 my ($exit) = @_;
2686 2796
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2797 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2798 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2799 # that depends on the exit object
2692 2800
2693 my $rmp = parse_random_map_params $exit->msg; 2801 my $rmp = parse_random_map_params $exit->msg;
2695 if ($exit->map) { 2803 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2804 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2805 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2806 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2807 $rmp->{origin_y} = $exit->y;
2808
2809 $exit->map->touch;
2700 } 2810 }
2701 2811
2702 $rmp->{random_seed} ||= $exit->random_seed; 2812 $rmp->{random_seed} ||= $exit->random_seed;
2703 2813
2704 my $data = cf::encode_json $rmp; 2814 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2705 my $md5 = Digest::MD5::md5_hex $data; 2815 my $md5 = Digest::MD5::md5_hex $data;
2706 my $meta = "$RANDOMDIR/$md5.meta"; 2816 my $meta = "$RANDOMDIR/$md5.meta";
2707 2817
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2818 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2819 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2820 undef $fh;
2711 aio_rename "$meta~", $meta; 2821 aio_rename "$meta~", $meta;
2712 2822
2823 my $slaying = "?random/$md5";
2824
2825 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2826 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2827 $exit->msg (undef);
2828 }
2715 } 2829 }
2716} 2830}
2717 2831
2718sub cf::object::player::enter_exit { 2832sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2833 my ($self, $exit) = @_;
2720 2834
2721 return unless $self->type == cf::PLAYER; 2835 return unless $self->type == cf::PLAYER;
2722 2836
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 2837 $self->enter_link;
2735 2838
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 2839 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2840 $Coro::current->{desc} = "enter_exit";
2742 2841
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2842 unless (eval {
2843 $self->deactivate_recursive; # just to be sure
2844
2845 # random map handling
2846 {
2847 my $guard = cf::lock_acquire "exit_prepare:$exit";
2848
2849 prepare_random_map $exit
2850 if $exit->slaying eq "/!";
2851 }
2852
2853 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2854 my $x = $exit->stats->hp;
2855 my $y = $exit->stats->sp;
2856
2745 $self->goto ($slaying, $hp, $sp); 2857 $self->goto ($map, $x, $y);
2746 2858
2859 # if exit is damned, update players death & WoR home-position
2860 $self->contr->savebed ($map, $x, $y)
2861 if $exit->flag (cf::FLAG_DAMNED);
2862
2747 1; 2863 1
2748 }) { 2864 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2865 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "I'll try to bring you back to the map you were before. " 2866 . "I'll try to bring you back to the map you were before. "
2751 . "Please report this to the dungeon master!", 2867 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2868 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2869
2754 warn "ERROR in enter_exit: $@"; 2870 error "ERROR in enter_exit: $@";
2755 $self->leave_link; 2871 $self->leave_link;
2756 } 2872 }
2757 })->prio (1); 2873 })->prio (1);
2758} 2874}
2759 2875
2771sub cf::client::send_drawinfo { 2887sub cf::client::send_drawinfo {
2772 my ($self, $text, $flags) = @_; 2888 my ($self, $text, $flags) = @_;
2773 2889
2774 utf8::encode $text; 2890 utf8::encode $text;
2775 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2891 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2892}
2893
2894=item $client->send_big_packet ($pkt)
2895
2896Like C<send_packet>, but tries to compress large packets, and fragments
2897them as required.
2898
2899=cut
2900
2901our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2902
2903sub cf::client::send_big_packet {
2904 my ($self, $pkt) = @_;
2905
2906 # try lzf for large packets
2907 $pkt = "lzf " . Compress::LZF::compress $pkt
2908 if 1024 <= length $pkt and $self->{can_lzf};
2909
2910 # split very large packets
2911 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2912 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2913 $pkt = "frag";
2914 }
2915
2916 $self->send_packet ($pkt);
2776} 2917}
2777 2918
2778=item $client->send_msg ($channel, $msg, $color, [extra...]) 2919=item $client->send_msg ($channel, $msg, $color, [extra...])
2779 2920
2780Send a drawinfo or msg packet to the client, formatting the msg for the 2921Send a drawinfo or msg packet to the client, formatting the msg for the
2784 2925
2785=cut 2926=cut
2786 2927
2787# non-persistent channels (usually the info channel) 2928# non-persistent channels (usually the info channel)
2788our %CHANNEL = ( 2929our %CHANNEL = (
2930 "c/motd" => {
2931 id => "infobox",
2932 title => "MOTD",
2933 reply => undef,
2934 tooltip => "The message of the day",
2935 },
2789 "c/identify" => { 2936 "c/identify" => {
2790 id => "infobox", 2937 id => "infobox",
2791 title => "Identify", 2938 title => "Identify",
2792 reply => undef, 2939 reply => undef,
2793 tooltip => "Items recently identified", 2940 tooltip => "Items recently identified",
2795 "c/examine" => { 2942 "c/examine" => {
2796 id => "infobox", 2943 id => "infobox",
2797 title => "Examine", 2944 title => "Examine",
2798 reply => undef, 2945 reply => undef,
2799 tooltip => "Signs and other items you examined", 2946 tooltip => "Signs and other items you examined",
2947 },
2948 "c/shopinfo" => {
2949 id => "infobox",
2950 title => "Shop Info",
2951 reply => undef,
2952 tooltip => "What your bargaining skill tells you about the shop",
2800 }, 2953 },
2801 "c/book" => { 2954 "c/book" => {
2802 id => "infobox", 2955 id => "infobox",
2803 title => "Book", 2956 title => "Book",
2804 reply => undef, 2957 reply => undef,
2820 id => "infobox", 2973 id => "infobox",
2821 title => "Body Parts", 2974 title => "Body Parts",
2822 reply => undef, 2975 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 2976 tooltip => "Shows which body parts you posess and are available",
2824 }, 2977 },
2978 "c/statistics" => {
2979 id => "infobox",
2980 title => "Statistics",
2981 reply => undef,
2982 tooltip => "Shows your primary statistics",
2983 },
2984 "c/skills" => {
2985 id => "infobox",
2986 title => "Skills",
2987 reply => undef,
2988 tooltip => "Shows your experience per skill and item power",
2989 },
2990 "c/shopitems" => {
2991 id => "infobox",
2992 title => "Shop Items",
2993 reply => undef,
2994 tooltip => "Shows the items currently for sale in this shop",
2995 },
2996 "c/resistances" => {
2997 id => "infobox",
2998 title => "Resistances",
2999 reply => undef,
3000 tooltip => "Shows your resistances",
3001 },
3002 "c/pets" => {
3003 id => "infobox",
3004 title => "Pets",
3005 reply => undef,
3006 tooltip => "Shows information abotu your pets/a specific pet",
3007 },
3008 "c/perceiveself" => {
3009 id => "infobox",
3010 title => "Perceive Self",
3011 reply => undef,
3012 tooltip => "You gained detailed knowledge about yourself",
3013 },
2825 "c/uptime" => { 3014 "c/uptime" => {
2826 id => "infobox", 3015 id => "infobox",
2827 title => "Uptime", 3016 title => "Uptime",
2828 reply => undef, 3017 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 3018 tooltip => "How long the server has been running since last restart",
2832 id => "infobox", 3021 id => "infobox",
2833 title => "Map Info", 3022 title => "Map Info",
2834 reply => undef, 3023 reply => undef,
2835 tooltip => "Information related to the maps", 3024 tooltip => "Information related to the maps",
2836 }, 3025 },
3026 "c/party" => {
3027 id => "party",
3028 title => "Party",
3029 reply => "gsay ",
3030 tooltip => "Messages and chat related to your party",
3031 },
3032 "c/death" => {
3033 id => "death",
3034 title => "Death",
3035 reply => undef,
3036 tooltip => "Reason for and more info about your most recent death",
3037 },
3038 "c/say" => $SAY_CHANNEL,
3039 "c/chat" => $CHAT_CHANNEL,
2837); 3040);
2838 3041
2839sub cf::client::send_msg { 3042sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 3043 my ($self, $channel, $msg, $color, @extra) = @_;
2841 3044
2842 $msg = $self->pl->expand_cfpod ($msg); 3045 $msg = $self->pl->expand_cfpod ($msg)
3046 unless $color & cf::NDI_VERBATIM;
2843 3047
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 3048 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 3049
2846 # check predefined channels, for the benefit of C 3050 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 3051 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel}; 3052 $channel = $CHANNEL{$channel};
2849 3053
2850 $self->ext_msg (channel_info => $channel) 3054 $self->ext_msg (channel_info => $channel);
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id}; 3055 $channel = $channel->{id};
2854 3056
2855 } elsif (ref $channel) { 3057 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent 3058 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) { 3059 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel; 3060 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel) 3061 $self->ext_msg (channel_info => $channel);
2860 if $self->can_msg;
2861 } 3062 }
2862 3063
2863 $channel = $channel->{id}; 3064 $channel = $channel->{id};
2864 } 3065 }
2865 3066
2866 return unless @extra || length $msg; 3067 return unless @extra || length $msg;
2867 3068
2868 if ($self->can_msg) {
2869 # default colour, mask it out 3069 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3070 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 3071 if $color & cf::NDI_DEF;
2872 3072
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3073 my $pkt = "msg "
3074 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3075 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2875 } else { 3076 );
2876 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones
2878 for ($msg) {
2879 1 while
2880 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2881 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2882 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2883 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2884 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2885 }
2886 3077
2887 $color &= cf::NDI_COLOR_MASK; 3078 $self->send_big_packet ($pkt);
2888
2889 utf8::encode $msg;
2890
2891 if (0 && $msg =~ /\[/) {
2892 # COMMAND/INFO
2893 $self->send_packet ("drawextinfo $color 10 8 $msg")
2894 } else {
2895 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2896 $self->send_packet ("drawinfo $color $msg")
2897 }
2898 }
2899 }
2900} 3079}
2901 3080
2902=item $client->ext_msg ($type, @msg) 3081=item $client->ext_msg ($type, @msg)
2903 3082
2904Sends an ext event to the client. 3083Sends an ext event to the client.
2907 3086
2908sub cf::client::ext_msg($$@) { 3087sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 3088 my ($self, $type, @msg) = @_;
2910 3089
2911 if ($self->extcmd == 2) { 3090 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3091 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove 3092 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type"; 3093 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 } 3095 }
2917} 3096}
2918 3097
2919=item $client->ext_reply ($msgid, @msg) 3098=item $client->ext_reply ($msgid, @msg)
2920 3099
2924 3103
2925sub cf::client::ext_reply($$@) { 3104sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_; 3105 my ($self, $id, @msg) = @_;
2927 3106
2928 if ($self->extcmd == 2) { 3107 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3108 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) { 3109 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove 3110 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id; 3111 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3112 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 } 3113 }
2935} 3114}
2936 3115
2937=item $success = $client->query ($flags, "text", \&cb) 3116=item $success = $client->query ($flags, "text", \&cb)
2938 3117
3009 3188
3010 $ns->ext_reply ($reply, @reply) 3189 $ns->ext_reply ($reply, @reply)
3011 if $reply; 3190 if $reply;
3012 3191
3013 } else { 3192 } else {
3014 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3193 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3015 } 3194 }
3016 3195
3017 cf::override; 3196 cf::override;
3018 }, 3197 },
3019); 3198);
3039 3218
3040 $coro 3219 $coro
3041} 3220}
3042 3221
3043cf::client->attach ( 3222cf::client->attach (
3044 on_destroy => sub { 3223 on_client_destroy => sub {
3045 my ($ns) = @_; 3224 my ($ns) = @_;
3046 3225
3047 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3226 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3048 }, 3227 },
3049); 3228);
3065our $safe_hole = new Safe::Hole; 3244our $safe_hole = new Safe::Hole;
3066 3245
3067$SIG{FPE} = 'IGNORE'; 3246$SIG{FPE} = 'IGNORE';
3068 3247
3069$safe->permit_only (Opcode::opset qw( 3248$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3249 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3250 grepstart grepwhile mapstart mapwhile
3072 sort time 3251 sort time
3073)); 3252));
3074 3253
3075# here we export the classes and methods available to script code 3254# here we export the classes and methods available to script code
3078 3257
3079The following functions and methods are available within a safe environment: 3258The following functions and methods are available within a safe environment:
3080 3259
3081 cf::object 3260 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3261 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3262 insert remove name archname title slaying race decrease split
3263 value
3084 3264
3085 cf::object::player 3265 cf::object::player
3086 player 3266 player
3087 3267
3088 cf::player 3268 cf::player
3093 3273
3094=cut 3274=cut
3095 3275
3096for ( 3276for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3277 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3278 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3279 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3280 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3281 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3282 ["cf::map" => qw(trigger)],
3103) { 3283) {
3104 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3284 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3285 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3107 for @funs; 3286 for @funs;
3108} 3287}
3109 3288
3124 3303
3125 my $qcode = $code; 3304 my $qcode = $code;
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3305 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3306 $qcode =~ s/\n/\\n/g;
3128 3307
3308 %vars = (_dummy => 0) unless %vars;
3309
3310 my @res;
3129 local $_; 3311 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3312
3132 my $eval = 3313 my $eval =
3133 "do {\n" 3314 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3315 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3316 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3317 . $code
3137 . "\n}" 3318 . "\n}"
3138 ; 3319 ;
3139 3320
3321 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3322 sub_generation_inc;
3323 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3324 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 sub_generation_inc; 3325 sub_generation_inc;
3326 } else {
3327 local @cf::_safe_eval_args = values %vars;
3328 @res = wantarray ? eval eval : scalar eval $eval;
3329 }
3143 3330
3144 if ($@) { 3331 if ($@) {
3145 warn "$@"; 3332 warn "$@",
3146 warn "while executing safe code '$code'\n"; 3333 "while executing safe code '$code'\n",
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3334 "with arguments " . (join " ", %vars) . "\n";
3148 } 3335 }
3149 3336
3150 wantarray ? @res : $res[0] 3337 wantarray ? @res : $res[0]
3151} 3338}
3152 3339
3166=cut 3353=cut
3167 3354
3168sub register_script_function { 3355sub register_script_function {
3169 my ($fun, $cb) = @_; 3356 my ($fun, $cb) = @_;
3170 3357
3171 no strict 'refs'; 3358 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3359 *$fun = $safe_hole->wrap ($cb);
3173} 3360}
3174 3361
3175=back 3362=back
3176 3363
3177=cut 3364=cut
3186 # for this (global event?) 3373 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = (); 3374 %ext::player_env::MUSIC_FACE_CACHE = ();
3188 3375
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3376 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190 3377
3191 warn "loading facedata from $path\n"; 3378 trace "loading facedata from $path\n";
3192 3379
3193 my $facedata;
3194 0 < aio_load $path, $facedata 3380 0 < aio_load $path, my $facedata
3195 or die "$path: $!"; 3381 or die "$path: $!";
3196 3382
3197 $facedata = Coro::Storable::thaw $facedata; 3383 $facedata = Coro::Storable::thaw $facedata;
3198 3384
3199 $facedata->{version} == 2 3385 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3386 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3387
3202 # patch in the exptable 3388 # patch in the exptable
3389 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3203 $facedata->{resource}{"res/exp_table"} = { 3390 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3391 type => FT_RSRC,
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3392 data => $exp_table,
3393 hash => (Digest::MD5::md5 $exp_table),
3206 }; 3394 };
3207 cf::cede_to_tick; 3395 cf::cede_to_tick;
3208 3396
3209 { 3397 {
3210 my $faces = $facedata->{faceinfo}; 3398 my $faces = $facedata->{faceinfo};
3212 while (my ($face, $info) = each %$faces) { 3400 while (my ($face, $info) = each %$faces) {
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3401 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3402
3215 cf::face::set_visibility $idx, $info->{visibility}; 3403 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3404 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3405 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3406 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3219 3407
3220 cf::cede_to_tick; 3408 cf::cede_to_tick;
3221 } 3409 }
3222 3410
3223 while (my ($face, $info) = each %$faces) { 3411 while (my ($face, $info) = each %$faces) {
3228 3416
3229 if (my $smooth = cf::face::find $info->{smooth}) { 3417 if (my $smooth = cf::face::find $info->{smooth}) {
3230 cf::face::set_smooth $idx, $smooth; 3418 cf::face::set_smooth $idx, $smooth;
3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3419 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232 } else { 3420 } else {
3233 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3421 error "smooth face '$info->{smooth}' not found for face '$face'";
3234 } 3422 }
3235 3423
3236 cf::cede_to_tick; 3424 cf::cede_to_tick;
3237 } 3425 }
3238 } 3426 }
3247 3435
3248 cf::anim::invalidate_all; # d'oh 3436 cf::anim::invalidate_all; # d'oh
3249 } 3437 }
3250 3438
3251 { 3439 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3440 my $res = $facedata->{resource};
3255 3441
3256 while (my ($name, $info) = each %$res) { 3442 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3443 if (defined $info->{type}) {
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3444 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3445
3261 if ($info->{type} & 1) { 3446 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type}; 3447 cf::face::set_type $idx, $info->{type};
3276 } else { 3448 } else {
3277 $RESOURCE{$name} = $info; 3449 $RESOURCE{$name} = $info; # unused
3278 } 3450 }
3279 3451
3280 cf::cede_to_tick; 3452 cf::cede_to_tick;
3281 } 3453 }
3282 } 3454 }
3283 3455
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3456 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285 3457
3286 1 3458 1
3287} 3459}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3308 3460
3309register_exticmd fx_want => sub { 3461register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_; 3462 my ($ns, $want) = @_;
3311 3463
3312 while (my ($k, $v) = each %$want) { 3464 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v); 3465 $ns->fx_want ($k, $v);
3314 } 3466 }
3315}; 3467};
3468
3469sub load_resource_file($) {
3470 my $guard = lock_acquire "load_resource_file";
3471
3472 my $status = load_resource_file_ $_[0];
3473 get_slot 0.1, 100;
3474 cf::arch::commit_load;
3475
3476 $status
3477}
3316 3478
3317sub reload_regions { 3479sub reload_regions {
3318 # HACK to clear player env face cache, we need some signal framework 3480 # HACK to clear player env face cache, we need some signal framework
3319 # for this (global event?) 3481 # for this (global event?)
3320 %ext::player_env::MUSIC_FACE_CACHE = (); 3482 %ext::player_env::MUSIC_FACE_CACHE = ();
3334} 3496}
3335 3497
3336sub reload_archetypes { 3498sub reload_archetypes {
3337 load_resource_file "$DATADIR/archetypes" 3499 load_resource_file "$DATADIR/archetypes"
3338 or die "unable to load archetypes\n"; 3500 or die "unable to load archetypes\n";
3339 #d# NEED to laod twice to resolve forward references
3340 # this really needs to be done in an extra post-pass
3341 # (which needs to be synchronous, so solve it differently)
3342 load_resource_file "$DATADIR/archetypes"
3343 or die "unable to load archetypes\n";
3344} 3501}
3345 3502
3346sub reload_treasures { 3503sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3504 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3505 or die "unable to load treasurelists\n";
3349} 3506}
3350 3507
3508sub reload_sound {
3509 trace "loading sound config from $DATADIR/sound\n";
3510
3511 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3512 or die "$DATADIR/sound $!";
3513
3514 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3515
3516 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3517 my $sound = $soundconf->{compat}[$_]
3518 or next;
3519
3520 my $face = cf::face::find "sound/$sound->[1]";
3521 cf::sound::set $sound->[0] => $face;
3522 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3523 }
3524
3525 while (my ($k, $v) = each %{$soundconf->{event}}) {
3526 my $face = cf::face::find "sound/$v";
3527 cf::sound::set $k => $face;
3528 }
3529}
3530
3351sub reload_resources { 3531sub reload_resources {
3352 warn "reloading resource files...\n"; 3532 trace "reloading resource files...\n";
3353 3533
3534 reload_exp_table;
3535 reload_materials;
3536 reload_facedata;
3537 reload_sound;
3538 reload_archetypes;
3354 reload_regions; 3539 reload_regions;
3355 reload_facedata;
3356 #reload_archetypes;#d#
3357 reload_archetypes;
3358 reload_treasures; 3540 reload_treasures;
3359 3541
3360 warn "finished reloading resource files\n"; 3542 trace "finished reloading resource files\n";
3361}
3362
3363sub init {
3364 reload_resources;
3365} 3543}
3366 3544
3367sub reload_config { 3545sub reload_config {
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3546 trace "reloading config file...\n";
3369 or return;
3370 3547
3371 local $/; 3548 0 < aio_load "$CONFDIR/config", my $config
3549 or die "$CONFDIR/config: $!";
3550
3551 utf8::decode $config;
3552
3553 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3372 *CFG = YAML::Load <$fh>; 3554 *CFG = YAML::XS::Load $config;
3373 3555
3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3556 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3375 3557
3376 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3558 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3377 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3559 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3378 3560
3379 if (exists $CFG{mlockall}) { 3561 if (exists $CFG{mlockall}) {
3383 }; 3565 };
3384 warn $@ if $@; 3566 warn $@ if $@;
3385 } 3567 }
3386} 3568}
3387 3569
3570sub pidfile() {
3571 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3572 or die "$PIDFILE: $!";
3573 flock $fh, &Fcntl::LOCK_EX
3574 or die "$PIDFILE: flock: $!";
3575 $fh
3576}
3577
3578# make sure only one server instance is running at any one time
3579sub atomic {
3580 my $fh = pidfile;
3581
3582 my $pid = <$fh>;
3583 kill 9, $pid if $pid > 0;
3584
3585 seek $fh, 0, 0;
3586 print $fh $$;
3587}
3588
3589sub main_loop {
3590 trace "EV::loop starting\n";
3591 if (1) {
3592 EV::loop;
3593 }
3594 trace "EV::loop returned\n";
3595 goto &main_loop unless $REALLY_UNLOOP;
3596}
3597
3388sub main { 3598sub main {
3599 cf::init_globals; # initialise logging
3600
3601 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3602 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3603 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3604 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3605
3606 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3607
3389 # we must not ever block the main coroutine 3608 # we must not ever block the main coroutine
3390 local $Coro::idle = sub { 3609 local $Coro::idle = sub {
3391 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3610 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3392 (async { 3611 (async {
3393 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3612 $Coro::current->{desc} = "IDLE BUG HANDLER";
3394 EV::loop EV::LOOP_ONESHOT; 3613 EV::loop EV::LOOP_ONESHOT;
3395 })->prio (Coro::PRIO_MAX); 3614 })->prio (Coro::PRIO_MAX);
3396 }; 3615 };
3397 3616
3398 reload_config;
3399 db_init;
3400 load_extensions;
3401
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 evthread_start IO::AIO::poll_fileno; 3617 evthread_start IO::AIO::poll_fileno;
3404 EV::loop; 3618
3619 cf::sync_job {
3620 cf::incloader::init ();
3621
3622 cf::init_anim;
3623 cf::init_attackmess;
3624 cf::init_dynamic;
3625
3626 cf::load_settings;
3627
3628 reload_resources;
3629 reload_config;
3630 db_init;
3631
3632 cf::init_uuid;
3633 cf::init_signals;
3634 cf::init_skills;
3635
3636 cf::init_beforeplay;
3637
3638 atomic;
3639
3640 load_extensions;
3641
3642 utime time, time, $RUNTIMEFILE;
3643
3644 # no (long-running) fork's whatsoever before this point(!)
3645 use POSIX ();
3646 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3647
3648 (pop @POST_INIT)->(0) while @POST_INIT;
3649 };
3650
3651 cf::object::thawer::errors_are_fatal 0;
3652 info "parse errors in files are no longer fatal from this point on.\n";
3653
3654 my $free_main; $free_main = EV::idle sub {
3655 undef $free_main;
3656 undef &main; # free gobs of memory :)
3657 };
3658
3659 goto &main_loop;
3405} 3660}
3406 3661
3407############################################################################# 3662#############################################################################
3408# initialisation and cleanup 3663# initialisation and cleanup
3409 3664
3410# install some emergency cleanup handlers 3665# install some emergency cleanup handlers
3411BEGIN { 3666BEGIN {
3412 our %SIGWATCHER = (); 3667 our %SIGWATCHER = ();
3413 for my $signal (qw(INT HUP TERM)) { 3668 for my $signal (qw(INT HUP TERM)) {
3414 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3669 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3415 cf::cleanup "SIG$signal"; 3670 cf::cleanup "SIG$signal";
3416 }; 3671 };
3417 } 3672 }
3418} 3673}
3419 3674
3420sub write_runtime_sync { 3675sub write_runtime_sync {
3421 my $runtime = "$LOCALDIR/runtime"; 3676 my $t0 = AE::time;
3422 3677
3423 # first touch the runtime file to show we are still running: 3678 # first touch the runtime file to show we are still running:
3424 # the fsync below can take a very very long time. 3679 # the fsync below can take a very very long time.
3425 3680
3426 IO::AIO::aio_utime $runtime, undef, undef; 3681 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427 3682
3428 my $guard = cf::lock_acquire "write_runtime"; 3683 my $guard = cf::lock_acquire "write_runtime";
3429 3684
3430 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3685 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3431 or return; 3686 or return;
3432 3687
3433 my $value = $cf::RUNTIME + 90 + 10; 3688 my $value = $cf::RUNTIME + 90 + 10;
3434 # 10 is the runtime save interval, for a monotonic clock 3689 # 10 is the runtime save interval, for a monotonic clock
3435 # 60 allows for the watchdog to kill the server. 3690 # 60 allows for the watchdog to kill the server.
3445 aio_utime $fh, undef, undef; 3700 aio_utime $fh, undef, undef;
3446 3701
3447 close $fh 3702 close $fh
3448 or return; 3703 or return;
3449 3704
3450 aio_rename "$runtime~", $runtime 3705 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451 and return; 3706 and return;
3452 3707
3453 warn "runtime file written.\n"; 3708 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3454 3709
3455 1 3710 1
3456} 3711}
3457 3712
3458our $uuid_lock; 3713our $uuid_lock;
3467 my $uuid = "$LOCALDIR/uuid"; 3722 my $uuid = "$LOCALDIR/uuid";
3468 3723
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3724 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3725 or return;
3471 3726
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3727 my $value = uuid_seq uuid_cur;
3728
3729 unless ($value) {
3730 info "cowardly refusing to write zero uuid value!\n";
3731 return;
3732 }
3733
3734 my $value = uuid_str $value + $uuid_skip;
3473 $uuid_skip = 0; 3735 $uuid_skip = 0;
3474 3736
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3737 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3738 and return;
3477 3739
3483 or return; 3745 or return;
3484 3746
3485 aio_rename "$uuid~", $uuid 3747 aio_rename "$uuid~", $uuid
3486 and return; 3748 and return;
3487 3749
3488 warn "uuid file written ($value).\n"; 3750 trace "uuid file written ($value).\n";
3489 3751
3490 1 3752 1
3491 3753
3492} 3754}
3493 3755
3499} 3761}
3500 3762
3501sub emergency_save() { 3763sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3764 my $freeze_guard = cf::freeze_mainloop;
3503 3765
3504 warn "enter emergency perl save\n"; 3766 info "emergency_perl_save: enter\n";
3767
3768 # this is a trade-off: we want to be very quick here, so
3769 # save all maps without fsync, and later call a global sync
3770 # (which in turn might be very very slow)
3771 local $USE_FSYNC = 0;
3505 3772
3506 cf::sync_job { 3773 cf::sync_job {
3774 cf::write_runtime_sync; # external watchdog should not bark
3775
3507 # use a peculiar iteration method to avoid tripping on perl 3776 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3777 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3778 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3779 info "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3780 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3781 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3782 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3783 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3784 $pl->save;
3516 } 3785 }
3517 warn "end emergency player save\n"; 3786 info "emergency_perl_save: end player save\n";
3518 3787
3519 warn "begin emergency map save\n"; 3788 cf::write_runtime_sync; # external watchdog should not bark
3789
3790 info "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3791 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3792 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3793 $map->valid or next;
3523 $map->save; 3794 $map->save;
3524 } 3795 }
3525 warn "end emergency map save\n"; 3796 info "emergency_perl_save: end map save\n";
3526 3797
3527 warn "begin emergency database checkpoint\n"; 3798 cf::write_runtime_sync; # external watchdog should not bark
3799
3800 info "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3801 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3802 info "emergency_perl_save: end database checkpoint\n";
3530 3803
3531 warn "begin write uuid\n"; 3804 info "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3805 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3806 info "emergency_perl_save: end write uuid\n";
3807
3808 cf::write_runtime_sync; # external watchdog should not bark
3809
3810 trace "emergency_perl_save: syncing database to disk";
3811 BDB::db_env_txn_checkpoint $DB_ENV;
3812
3813 info "emergency_perl_save: starting sync\n";
3814 IO::AIO::aio_sync sub {
3815 info "emergency_perl_save: finished sync\n";
3816 };
3817
3818 cf::write_runtime_sync; # external watchdog should not bark
3819
3820 trace "emergency_perl_save: flushing outstanding aio requests";
3821 while (IO::AIO::nreqs || BDB::nreqs) {
3822 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3823 }
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3534 }; 3826 };
3535 3827
3536 warn "leave emergency perl save\n"; 3828 info "emergency_perl_save: leave\n";
3537} 3829}
3538 3830
3539sub post_cleanup { 3831sub post_cleanup {
3540 my ($make_core) = @_; 3832 my ($make_core) = @_;
3541 3833
3834 IO::AIO::flush;
3835
3542 warn Carp::longmess "post_cleanup backtrace" 3836 error Carp::longmess "post_cleanup backtrace"
3543 if $make_core; 3837 if $make_core;
3838
3839 my $fh = pidfile;
3840 unlink $PIDFILE if <$fh> == $$;
3841}
3842
3843# a safer delete_package, copied from Symbol
3844sub clear_package($) {
3845 my $pkg = shift;
3846
3847 # expand to full symbol table name if needed
3848 unless ($pkg =~ /^main::.*::$/) {
3849 $pkg = "main$pkg" if $pkg =~ /^::/;
3850 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3851 $pkg .= '::' unless $pkg =~ /::$/;
3852 }
3853
3854 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3855 my $stem_symtab = *{$stem}{HASH};
3856
3857 defined $stem_symtab and exists $stem_symtab->{$leaf}
3858 or return;
3859
3860 # clear all symbols
3861 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3862 for my $name (keys %$leaf_symtab) {
3863 _gv_clear *{"$pkg$name"};
3864# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3865 }
3544} 3866}
3545 3867
3546sub do_reload_perl() { 3868sub do_reload_perl() {
3547 # can/must only be called in main 3869 # can/must only be called in main
3548 if ($Coro::current != $Coro::main) { 3870 unless (in_main) {
3549 warn "can only reload from main coroutine"; 3871 error "can only reload from main coroutine";
3550 return; 3872 return;
3551 } 3873 }
3552 3874
3875 return if $RELOAD++;
3876
3877 my $t1 = AE::time;
3878
3879 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl";
3553 warn "reloading..."; 3881 info "reloading...";
3554 3882
3555 warn "entering sync_job"; 3883 trace "entering sync_job";
3556 3884
3557 cf::sync_job { 3885 cf::sync_job {
3558 cf::write_runtime_sync; # external watchdog should not bark
3559 cf::emergency_save; 3886 #cf::emergency_save;
3560 cf::write_runtime_sync; # external watchdog should not bark
3561 3887
3562 warn "syncing database to disk";
3563 BDB::db_env_txn_checkpoint $DB_ENV;
3564
3565 # if anything goes wrong in here, we should simply crash as we already saved
3566
3567 warn "flushing outstanding aio requests";
3568 for (;;) {
3569 BDB::flush;
3570 IO::AIO::flush;
3571 Coro::cede_notself;
3572 last unless IO::AIO::nreqs || BDB::nreqs;
3573 warn "iterate...";
3574 }
3575
3576 ++$RELOAD;
3577
3578 warn "cancelling all extension coros"; 3888 trace "cancelling all extension coros";
3579 $_->cancel for values %EXT_CORO; 3889 $_->cancel for values %EXT_CORO;
3580 %EXT_CORO = (); 3890 %EXT_CORO = ();
3581 3891
3582 warn "removing commands"; 3892 trace "removing commands";
3583 %COMMAND = (); 3893 %COMMAND = ();
3584 3894
3585 warn "removing ext/exti commands"; 3895 trace "removing ext/exti commands";
3586 %EXTCMD = (); 3896 %EXTCMD = ();
3587 %EXTICMD = (); 3897 %EXTICMD = ();
3588 3898
3589 warn "unloading/nuking all extensions"; 3899 trace "unloading/nuking all extensions";
3590 for my $pkg (@EXTS) { 3900 for my $pkg (@EXTS) {
3591 warn "... unloading $pkg"; 3901 trace "... unloading $pkg";
3592 3902
3593 if (my $cb = $pkg->can ("unload")) { 3903 if (my $cb = $pkg->can ("unload")) {
3594 eval { 3904 eval {
3595 $cb->($pkg); 3905 $cb->($pkg);
3596 1 3906 1
3597 } or warn "$pkg unloaded, but with errors: $@"; 3907 } or error "$pkg unloaded, but with errors: $@";
3908 }
3909
3910 trace "... clearing $pkg";
3911 clear_package $pkg;
3598 } 3912 }
3599 3913
3600 warn "... nuking $pkg";
3601 Symbol::delete_package $pkg;
3602 }
3603
3604 warn "unloading all perl modules loaded from $LIBDIR"; 3914 trace "unloading all perl modules loaded from $LIBDIR";
3605 while (my ($k, $v) = each %INC) { 3915 while (my ($k, $v) = each %INC) {
3606 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3607 3917
3608 warn "... unloading $k"; 3918 trace "... unloading $k";
3609 delete $INC{$k}; 3919 delete $INC{$k};
3610 3920
3611 $k =~ s/\.pm$//; 3921 $k =~ s/\.pm$//;
3612 $k =~ s/\//::/g; 3922 $k =~ s/\//::/g;
3613 3923
3614 if (my $cb = $k->can ("unload_module")) { 3924 if (my $cb = $k->can ("unload_module")) {
3615 $cb->(); 3925 $cb->();
3926 }
3927
3928 clear_package $k;
3616 } 3929 }
3617 3930
3618 Symbol::delete_package $k;
3619 }
3620
3621 warn "getting rid of safe::, as good as possible"; 3931 trace "getting rid of safe::, as good as possible";
3622 Symbol::delete_package "safe::$_" 3932 clear_package "safe::$_"
3623 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3933 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3624 3934
3625 warn "unloading cf.pm \"a bit\""; 3935 trace "unloading cf.pm \"a bit\"";
3626 delete $INC{"cf.pm"}; 3936 delete $INC{"cf.pm"};
3627 delete $INC{"cf/pod.pm"}; 3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3628 3938
3629 # don't, removes xs symbols, too, 3939 # don't, removes xs symbols, too,
3630 # and global variables created in xs 3940 # and global variables created in xs
3631 #Symbol::delete_package __PACKAGE__; 3941 #clear_package __PACKAGE__;
3632 3942
3633 warn "unload completed, starting to reload now"; 3943 info "unload completed, starting to reload now";
3634 3944
3635 warn "reloading cf.pm"; 3945 trace "reloading cf.pm";
3636 require cf; 3946 require cf;
3637 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3947 cf::_connect_to_perl_1;
3638 3948
3639 warn "loading config and database again"; 3949 trace "loading config and database again";
3640 cf::reload_config; 3950 cf::reload_config;
3641 3951
3642 warn "loading extensions"; 3952 trace "loading extensions";
3643 cf::load_extensions; 3953 cf::load_extensions;
3644 3954
3955 if ($REATTACH_ON_RELOAD) {
3645 warn "reattaching attachments to objects/players"; 3956 trace "reattaching attachments to objects/players";
3646 _global_reattach; # objects, sockets 3957 _global_reattach; # objects, sockets
3647 warn "reattaching attachments to maps"; 3958 trace "reattaching attachments to maps";
3648 reattach $_ for values %MAP; 3959 reattach $_ for values %MAP;
3649 warn "reattaching attachments to players"; 3960 trace "reattaching attachments to players";
3650 reattach $_ for values %PLAYER; 3961 reattach $_ for values %PLAYER;
3962 }
3651 3963
3964 trace "running post_init jobs";
3965 (pop @POST_INIT)->(1) while @POST_INIT;
3966
3652 warn "leaving sync_job"; 3967 trace "leaving sync_job";
3653 3968
3654 1 3969 1
3655 } or do { 3970 } or do {
3656 warn $@; 3971 error $@;
3657 cf::cleanup "error while reloading, exiting."; 3972 cf::cleanup "error while reloading, exiting.";
3973 };
3974
3975 info "reloaded";
3976 --$RELOAD;
3658 }; 3977 }
3659 3978
3660 warn "reloaded"; 3979 $t1 = AE::time - $t1;
3980 info "reload completed in ${t1}s\n";
3661}; 3981};
3662 3982
3663our $RELOAD_WATCHER; # used only during reload 3983our $RELOAD_WATCHER; # used only during reload
3664 3984
3665sub reload_perl() { 3985sub reload_perl() {
3666 # doing reload synchronously and two reloads happen back-to-back, 3986 # doing reload synchronously and two reloads happen back-to-back,
3667 # coro crashes during coro_state_free->destroy here. 3987 # coro crashes during coro_state_free->destroy here.
3668 3988
3989 $RELOAD_WATCHER ||= cf::async {
3990 Coro::AIO::aio_wait cache_extensions;
3991
3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3992 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3670 do_reload_perl; 3993 do_reload_perl;
3671 undef $RELOAD_WATCHER; 3994 undef $RELOAD_WATCHER;
3995 };
3672 }; 3996 };
3673} 3997}
3674 3998
3675register_command "reload" => sub { 3999register_command "reload" => sub {
3676 my ($who, $arg) = @_; 4000 my ($who, $arg) = @_;
3682 reload_perl; 4006 reload_perl;
3683 }; 4007 };
3684 } 4008 }
3685}; 4009};
3686 4010
3687unshift @INC, $LIBDIR; 4011#############################################################################
3688 4012
3689my $bug_warning = 0; 4013my $bug_warning = 0;
3690 4014
3691our @WAIT_FOR_TICK; 4015our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN; 4016our @WAIT_FOR_TICK_BEGIN;
3693 4017
3694sub wait_for_tick { 4018sub wait_for_tick() {
3695 return if tick_inhibit;
3696 return if $Coro::current == $Coro::main; 4019 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3697 4020
3698 my $signal = new Coro::Signal; 4021 my $signal = new Coro::Signal;
3699 push @WAIT_FOR_TICK, $signal; 4022 push @WAIT_FOR_TICK, $signal;
3700 $signal->wait; 4023 $signal->wait;
3701} 4024}
3702 4025
3703sub wait_for_tick_begin { 4026sub wait_for_tick_begin() {
3704 return if tick_inhibit;
3705 return if $Coro::current == $Coro::main; 4027 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3706 4028
3707 my $signal = new Coro::Signal; 4029 my $signal = new Coro::Signal;
3708 push @WAIT_FOR_TICK_BEGIN, $signal; 4030 push @WAIT_FOR_TICK_BEGIN, $signal;
3709 $signal->wait; 4031 $signal->wait;
3710} 4032}
3716 return; 4038 return;
3717 } 4039 }
3718 4040
3719 cf::server_tick; # one server iteration 4041 cf::server_tick; # one server iteration
3720 4042
4043 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4044
3721 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4045 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3722 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4046 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3723 Coro::async_pool { 4047 Coro::async_pool {
3724 $Coro::current->{desc} = "runtime saver"; 4048 $Coro::current->{desc} = "runtime saver";
3725 write_runtime_sync 4049 write_runtime_sync
3726 or warn "ERROR: unable to write runtime file: $!"; 4050 or error "ERROR: unable to write runtime file: $!";
3727 }; 4051 };
3728 } 4052 }
3729 4053
3730 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3731 $sig->send; 4055 $sig->send;
3739 4063
3740 if (0) { 4064 if (0) {
3741 if ($NEXT_TICK) { 4065 if ($NEXT_TICK) {
3742 my $jitter = $TICK_START - $NEXT_TICK; 4066 my $jitter = $TICK_START - $NEXT_TICK;
3743 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4067 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3744 warn "jitter $JITTER\n";#d# 4068 debug "jitter $JITTER\n";#d#
3745 } 4069 }
3746 } 4070 }
3747} 4071}
3748 4072
3749{ 4073{
3750 # configure BDB 4074 # configure BDB
3751 4075
3752 BDB::min_parallel 8; 4076 BDB::min_parallel 16;
3753 BDB::max_poll_reqs $TICK * 0.1; 4077 BDB::max_poll_reqs $TICK * 0.1;
3754 $Coro::BDB::WATCHER->priority (1); 4078 $AnyEvent::BDB::WATCHER->priority (1);
3755 4079
3756 unless ($DB_ENV) { 4080 unless ($DB_ENV) {
3757 $DB_ENV = BDB::db_env_create; 4081 $DB_ENV = BDB::db_env_create;
3758 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4082 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3759 | BDB::LOG_AUTOREMOVE, 1); 4083 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4084 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3760 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4085 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3761 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4086 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3762 4087
3763 cf::sync_job { 4088 cf::sync_job {
3764 eval { 4089 eval {
3790{ 4115{
3791 # configure IO::AIO 4116 # configure IO::AIO
3792 4117
3793 IO::AIO::min_parallel 8; 4118 IO::AIO::min_parallel 8;
3794 IO::AIO::max_poll_time $TICK * 0.1; 4119 IO::AIO::max_poll_time $TICK * 0.1;
3795 $Coro::AIO::WATCHER->priority (1); 4120 undef $AnyEvent::AIO::WATCHER;
3796} 4121}
3797 4122
3798my $_log_backtrace; 4123my $_log_backtrace;
3799 4124
3800sub _log_backtrace { 4125sub _log_backtrace {
3803 $msg =~ s/\n//; 4128 $msg =~ s/\n//;
3804 4129
3805 # limit the # of concurrent backtraces 4130 # limit the # of concurrent backtraces
3806 if ($_log_backtrace < 2) { 4131 if ($_log_backtrace < 2) {
3807 ++$_log_backtrace; 4132 ++$_log_backtrace;
4133 my $perl_bt = Carp::longmess $msg;
3808 async { 4134 async {
3809 $Coro::current->{desc} = "abt $msg"; 4135 $Coro::current->{desc} = "abt $msg";
3810 4136
3811 my @bt = fork_call { 4137 my @bt = fork_call {
3812 @addr = map { sprintf "%x", $_ } @addr; 4138 @addr = map { sprintf "%x", $_ } @addr;
3823 } 4149 }
3824 4150
3825 @funcs 4151 @funcs
3826 }; 4152 };
3827 4153
3828 LOG llevInfo, "[ABT] $msg\n"; 4154 LOG llevInfo, "[ABT] $perl_bt\n";
4155 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3829 LOG llevInfo, "[ABT] $_\n" for @bt; 4156 LOG llevInfo, "[ABT] $_\n" for @bt;
3830 --$_log_backtrace; 4157 --$_log_backtrace;
3831 }; 4158 };
3832 } else { 4159 } else {
3833 LOG llevInfo, "[ABT] $msg\n"; 4160 LOG llevInfo, "[ABT] $msg\n";
3834 LOG llevInfo, "[ABT] [suppressed]\n"; 4161 LOG llevInfo, "[ABT] [suppressed]\n";
3835 } 4162 }
3836} 4163}
3837 4164
3838# load additional modules 4165# load additional modules
3839use cf::pod; 4166require "cf/$_.pm" for @EXTRA_MODULES;
4167cf::_connect_to_perl_2;
3840 4168
3841END { cf::emergency_save } 4169END { cf::emergency_save }
3842 4170
38431 41711
3844 4172

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines