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.541 by root, Tue May 4 23:33:16 2010 UTC

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

Diff Legend

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