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.432 by root, Mon May 5 22:38:47 2008 UTC vs.
Revision 1.544 by root, Thu May 6 21:58:07 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV 3.2; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
35 36
37use Guard ();
36use Coro 4.50 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
39use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
43use Coro::AIO; 48use Coro::AIO;
44use Coro::BDB; 49use Coro::BDB 1.6;
45use Coro::Storable; 50use Coro::Storable;
46use Coro::Util (); 51use Coro::Util ();
47 52
48use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
49use BDB (); 54use BDB ();
50use Data::Dumper; 55use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 56use Fcntl;
53use YAML (); 57use YAML::XS ();
54use IO::AIO 2.51 (); 58use IO::AIO ();
55use Time::HiRes; 59use Time::HiRes;
56use Compress::LZF; 60use Compress::LZF;
57use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
58 64
59# configure various modules to our taste 65# configure various modules to our taste
60# 66#
61$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64 75
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 78
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
71 85
72our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
82our $DATADIR = datadir; 98our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
92our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
93 118
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 121our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
99 123
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 127our $DB_ENV;
105 128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
106our %CFG; 131our %CFG;
107 132
108our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 134our $RUNTIME;
110our $NOW; 135our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 146our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
123 148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
153
124binmode STDOUT; 154binmode STDOUT;
125binmode STDERR; 155binmode STDERR;
126 156
127# read virtual server time, if available 157# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
132} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
133 165
134mkdir $_ 166mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 168
137our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
138 170
139sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
140 187
141############################################################################# 188#############################################################################
142 189
143=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
144 191
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 || $Coro::current == $Coro::main; 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 aio_chmod $fh, SAVE_MODE; 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 aio_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 aio_chmod $fh, SAVE_MODE; 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 aio_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";
1359 1456
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1458 if exists $v->{meta}{mandatory};
1364 1459
1365 warn $msg; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1461 delete $todo{$k};
1462 } else {
1463 $done{$k} = delete $todo{$k};
1464 push @EXTS, $v->{pkg};
1465 $progress = 1;
1466
1467 info "$v->{base}: extension inactive.\n"
1468 unless $active;
1366 } 1469 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1470 }
1372 1471
1373 skip: 1472 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1473 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 unless $progress; 1474
1475 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory};
1478 }
1479 }
1376 } 1480 }
1377 }; 1481 };
1378} 1482}
1379 1483
1380############################################################################# 1484#############################################################################
1381 1485
1382=back 1486=back
1383 1487
1384=head2 CORE EXTENSIONS 1488=head2 CORE EXTENSIONS
1385 1489
1386Functions and methods that extend core crossfire objects. 1490Functions and methods that extend core deliantra objects.
1387 1491
1388=cut 1492=cut
1389 1493
1390package cf::player; 1494package cf::player;
1391 1495
1434 1538
1435sub exists($) { 1539sub exists($) {
1436 my ($login) = @_; 1540 my ($login) = @_;
1437 1541
1438 $cf::PLAYER{$login} 1542 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1543 or !aio_stat path $login
1440} 1544}
1441 1545
1442sub find($) { 1546sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1547 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1548 my $login = $_[0];
1464 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1465 } 1569 }
1466 } 1570 }
1467} 1571}
1468 1572
1573cf::player->attach (
1574 on_load => sub {
1575 my ($pl, $path) = @_;
1576
1577 # restore slots saved in save, below
1578 my $slots = delete $pl->{_slots};
1579
1580 $pl->ob->current_weapon ($slots->[0]);
1581 $pl->combat_ob ($slots->[1]);
1582 $pl->ranged_ob ($slots->[2]);
1583 },
1584);
1585
1469sub save($) { 1586sub save($) {
1470 my ($pl) = @_; 1587 my ($pl) = @_;
1471 1588
1472 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
1473 1590
1478 1595
1479 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1480 $pl->{last_save} = $cf::RUNTIME; 1597 $pl->{last_save} = $cf::RUNTIME;
1481 1598
1482 cf::get_slot 0.01; 1599 cf::get_slot 0.01;
1600
1601 # save slots, to be restored later
1602 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1483 1603
1484 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1485 cf::cede_to_tick; 1605 cf::cede_to_tick;
1486} 1606}
1487 1607
1519 my ($pl) = @_; 1639 my ($pl) = @_;
1520 1640
1521 my $name = $pl->ob->name; 1641 my $name = $pl->ob->name;
1522 1642
1523 $pl->{deny_save} = 1; 1643 $pl->{deny_save} = 1;
1524 $pl->password ("*"); # this should lock out the player until we nuked the dir 1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1525 1645
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1527 $pl->deactivate; 1647 $pl->deactivate;
1528 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1529 $pl->ob->check_score;
1530 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1531 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1532 1651
1533 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1534 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
1589 \@logins 1708 \@logins
1590} 1709}
1591 1710
1592=item $player->maps 1711=item $player->maps
1593 1712
1713=item cf::player::maps $login
1714
1594Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1595player. May block. 1716player. May block.
1596 1717
1597=cut 1718=cut
1598 1719
1615 } 1736 }
1616 1737
1617 \@paths 1738 \@paths
1618} 1739}
1619 1740
1620=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1741=item $protocol_xml = $player->expand_cfpod ($cfpod)
1621 1742
1622Expand crossfire pod fragments into protocol xml. 1743Expand deliantra pod fragments into protocol xml.
1623
1624=cut
1625
1626use re 'eval';
1627
1628my $group;
1629my $interior; $interior = qr{
1630 # match a pod interior sequence sans C<< >>
1631 (?:
1632 \ (.*?)\ (?{ $group = $^N })
1633 | < (??{$interior}) >
1634 )
1635}x;
1636
1637sub expand_cfpod {
1638 my ($self, $pod) = @_;
1639
1640 my $xml;
1641
1642 while () {
1643 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1644 $group = $1;
1645
1646 $group =~ s/&/&amp;/g;
1647 $group =~ s/</&lt;/g;
1648
1649 $xml .= $group;
1650 } elsif ($pod =~ m%\G
1651 ([BCGHITU])
1652 <
1653 (?:
1654 ([^<>]*) (?{ $group = $^N })
1655 | < $interior >
1656 )
1657 >
1658 %gcsx
1659 ) {
1660 my ($code, $data) = ($1, $group);
1661
1662 if ($code eq "B") {
1663 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1664 } elsif ($code eq "I") {
1665 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1666 } elsif ($code eq "U") {
1667 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1668 } elsif ($code eq "C") {
1669 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1670 } elsif ($code eq "T") {
1671 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1672 } elsif ($code eq "G") {
1673 my ($male, $female) = split /\|/, $data;
1674 $data = $self->gender ? $female : $male;
1675 $xml .= expand_cfpod ($self, $data);
1676 } elsif ($code eq "H") {
1677 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1678 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1679 "")
1680 [$self->{hintmode}];
1681 } else {
1682 $xml .= "error processing '$code($data)' directive";
1683 }
1684 } else {
1685 if ($pod =~ /\G(.+)/) {
1686 warn "parse error while expanding $pod (at $1)";
1687 }
1688 last;
1689 }
1690 }
1691
1692 for ($xml) {
1693 # create single paragraphs (very hackish)
1694 s/(?<=\S)\n(?=\w)/ /g;
1695
1696 # compress some whitespace
1697 s/\s+\n/\n/g; # ws line-ends
1698 s/\n\n+/\n/g; # double lines
1699 s/^\n+//; # beginning lines
1700 s/\n+$//; # ending lines
1701 }
1702
1703 $xml
1704}
1705
1706no re 'eval';
1707
1708sub hintmode {
1709 $_[0]{hintmode} = $_[1] if @_ > 1;
1710 $_[0]{hintmode}
1711}
1712 1744
1713=item $player->ext_reply ($msgid, @msg) 1745=item $player->ext_reply ($msgid, @msg)
1714 1746
1715Sends an ext reply to the player. 1747Sends an ext reply to the player.
1716 1748
1748 1780
1749=cut 1781=cut
1750 1782
1751sub find_by_path($) { 1783sub find_by_path($) {
1752 my ($path) = @_; 1784 my ($path) = @_;
1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1753 1787
1754 my ($match, $specificity); 1788 my ($match, $specificity);
1755 1789
1756 for my $region (list) { 1790 for my $region (list) {
1757 if ($region->{match} && $path =~ $region->{match}) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1789 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1790 1824
1791 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1792 $self->_create_random_map ( 1826 $self->_create_random_map (
1793 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1794 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1795 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1796 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1797 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1798 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1799 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1814 1848
1815sub register { 1849sub register {
1816 my (undef, $regex, $prio) = @_; 1850 my (undef, $regex, $prio) = @_;
1817 my $pkg = caller; 1851 my $pkg = caller;
1818 1852
1819 no strict;
1820 push @{"$pkg\::ISA"}, __PACKAGE__; 1853 push @{"$pkg\::ISA"}, __PACKAGE__;
1821 1854
1822 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1855 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1823} 1856}
1824 1857
1825# also paths starting with '/' 1858# also paths starting with '/'
1826$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1859$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1827 1860
1828sub thawer_merge { 1861sub thawer_merge {
1829 my ($self, $merge) = @_; 1862 my ($self, $merge) = @_;
1830 1863
1831 # we have to keep some variables in memory intact 1864 # we have to keep some variables in memory intact
1836} 1869}
1837 1870
1838sub normalise { 1871sub normalise {
1839 my ($path, $base) = @_; 1872 my ($path, $base) = @_;
1840 1873
1841 $path = "$path"; # make sure its a string 1874 $path = "$path"; # make sure it's a string
1842 1875
1843 $path =~ s/\.map$//; 1876 $path =~ s/\.map$//;
1844 1877
1845 # map plan: 1878 # map plan:
1846 # 1879 #
1885 $self->init; # pass $1 etc. 1918 $self->init; # pass $1 etc.
1886 return $self; 1919 return $self;
1887 } 1920 }
1888 } 1921 }
1889 1922
1890 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1923 Carp::cluck "unable to resolve path '$path' (base '$base')";
1891 () 1924 ()
1892} 1925}
1893 1926
1894sub init { 1927sub init {
1895 my ($self) = @_; 1928 my ($self) = @_;
1927sub uniq_path { 1960sub uniq_path {
1928 my ($self) = @_; 1961 my ($self) = @_;
1929 1962
1930 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1963 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1931 "$UNIQUEDIR/$path" 1964 "$UNIQUEDIR/$path"
1932}
1933
1934# and all this just because we cannot iterate over
1935# all maps in C++...
1936sub change_all_map_light {
1937 my ($change) = @_;
1938
1939 $_->change_map_light ($change)
1940 for grep $_->outdoor, values %cf::MAP;
1941} 1965}
1942 1966
1943sub decay_objects { 1967sub decay_objects {
1944 my ($self) = @_; 1968 my ($self) = @_;
1945 1969
2027 2051
2028sub find; 2052sub find;
2029sub find { 2053sub find {
2030 my ($path, $origin) = @_; 2054 my ($path, $origin) = @_;
2031 2055
2056 cf::cede_to_tick;
2057
2032 $path = normalise $path, $origin && $origin->path; 2058 $path = normalise $path, $origin && $origin->path;
2033 2059
2034 cf::lock_wait "map_data:$path";#d#remove 2060 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2035 cf::lock_wait "map_find:$path"; 2061 my $guard2 = cf::lock_acquire "map_find:$path";
2036 2062
2037 $cf::MAP{$path} || do { 2063 $cf::MAP{$path} || do {
2038 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2039 my $guard2 = cf::lock_acquire "map_find:$path";
2040
2041 my $map = new_from_path cf::map $path 2064 my $map = new_from_path cf::map $path
2042 or return; 2065 or return;
2043 2066
2044 $map->{last_save} = $cf::RUNTIME; 2067 $map->{last_save} = $cf::RUNTIME;
2045 2068
2057 2080
2058 $cf::MAP{$path} = $map 2081 $cf::MAP{$path} = $map
2059 } 2082 }
2060} 2083}
2061 2084
2062sub pre_load { } 2085sub pre_load { }
2063sub post_load { } 2086#sub post_load { } # XS
2064 2087
2065sub load { 2088sub load {
2066 my ($self) = @_; 2089 my ($self) = @_;
2067 2090
2068 local $self->{deny_reset} = 1; # loading can take a long time 2091 local $self->{deny_reset} = 1; # loading can take a long time
2085 my $f = new_from_file cf::object::thawer $self->{load_path}; 2108 my $f = new_from_file cf::object::thawer $self->{load_path};
2086 $f->skip_block; 2109 $f->skip_block;
2087 $self->_load_objects ($f) 2110 $self->_load_objects ($f)
2088 or return; 2111 or return;
2089 2112
2090 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2113 $self->post_load_original
2091 if delete $self->{load_original}; 2114 if delete $self->{load_original};
2092 2115
2093 if (my $uniq = $self->uniq_path) { 2116 if (my $uniq = $self->uniq_path) {
2094 utf8::encode $uniq; 2117 utf8::encode $uniq;
2095 unless (aio_stat $uniq) { 2118 unless (aio_stat $uniq) {
2113 unless ($self->{deny_activate}) { 2136 unless ($self->{deny_activate}) {
2114 $self->decay_objects; 2137 $self->decay_objects;
2115 $self->fix_auto_apply; 2138 $self->fix_auto_apply;
2116 $self->update_buttons; 2139 $self->update_buttons;
2117 cf::cede_to_tick; 2140 cf::cede_to_tick;
2118 $self->set_darkness_map;
2119 cf::cede_to_tick;
2120 $self->activate; 2141 $self->activate;
2121 } 2142 }
2122 2143
2123 $self->{last_save} = $cf::RUNTIME; 2144 $self->{last_save} = $cf::RUNTIME;
2124 $self->last_access ($cf::RUNTIME); 2145 $self->last_access ($cf::RUNTIME);
2127 } 2148 }
2128 2149
2129 $self->post_load; 2150 $self->post_load;
2130} 2151}
2131 2152
2153# customize the map for a given player, i.e.
2154# return the _real_ map. used by e.g. per-player
2155# maps to change the path to ~playername/mappath
2132sub customise_for { 2156sub customise_for {
2133 my ($self, $ob) = @_; 2157 my ($self, $ob) = @_;
2134 2158
2135 return find "~" . $ob->name . "/" . $self->{path} 2159 return find "~" . $ob->name . "/" . $self->{path}
2136 if $self->per_player; 2160 if $self->per_player;
2152 or next; 2176 or next;
2153 $neigh = find $neigh, $map 2177 $neigh = find $neigh, $map
2154 or next; 2178 or next;
2155 $neigh->load; 2179 $neigh->load;
2156 2180
2181 # now find the diagonal neighbours
2157 push @neigh, 2182 push @neigh,
2158 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2183 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2159 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2184 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2160 } 2185 }
2161 2186
2168} 2193}
2169 2194
2170sub find_sync { 2195sub find_sync {
2171 my ($path, $origin) = @_; 2196 my ($path, $origin) = @_;
2172 2197
2173 cf::sync_job { find $path, $origin } 2198 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2199 if $Coro::current == $Coro::main;
2200
2201 find $path, $origin
2174} 2202}
2175 2203
2176sub do_load_sync { 2204sub do_load_sync {
2177 my ($map) = @_; 2205 my ($map) = @_;
2178 2206
2179 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2207 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2180 if $Coro::current == $Coro::main; 2208 if $Coro::current == $Coro::main;
2181 2209
2182 cf::sync_job { $map->load }; 2210 $map->load;
2183} 2211}
2184 2212
2185our %MAP_PREFETCH; 2213our %MAP_PREFETCH;
2186our $MAP_PREFETCHER = undef; 2214our $MAP_PREFETCHER = undef;
2187 2215
2213 $MAP_PREFETCHER->prio (6); 2241 $MAP_PREFETCHER->prio (6);
2214 2242
2215 () 2243 ()
2216} 2244}
2217 2245
2246# common code, used by both ->save and ->swapout
2218sub save { 2247sub _save {
2219 my ($self) = @_; 2248 my ($self) = @_;
2220
2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222 2249
2223 $self->{last_save} = $cf::RUNTIME; 2250 $self->{last_save} = $cf::RUNTIME;
2224 2251
2225 return unless $self->dirty; 2252 return unless $self->dirty;
2226 2253
2246 } else { 2273 } else {
2247 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2274 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2248 } 2275 }
2249} 2276}
2250 2277
2278sub save {
2279 my ($self) = @_;
2280
2281 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282
2283 $self->_save;
2284}
2285
2251sub swap_out { 2286sub swap_out {
2252 my ($self) = @_; 2287 my ($self) = @_;
2253 2288
2254 # save first because save cedes
2255 $self->save;
2256
2257 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
2258 2290
2259 return if $self->players;
2260 return if $self->in_memory != cf::MAP_ACTIVE; 2291 return if $self->in_memory != cf::MAP_ACTIVE;
2261 return if $self->{deny_save}; 2292 return if $self->{deny_save};
2293 return if $self->players;
2262 2294
2295 # first deactivate the map and "unlink" it from the core
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2263 $self->in_memory (cf::MAP_SWAPPED); 2298 $self->in_memory (cf::MAP_SWAPPED);
2299
2300 # then atomically save
2301 $self->_save;
2302
2303 # then free the map
2304 $self->clear;
2305}
2306
2307sub reset_at {
2308 my ($self) = @_;
2309
2310 # TODO: safety, remove and allow resettable per-player maps
2311 return 1e99 if $self->{deny_reset};
2312
2313 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2314 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2315
2316 $time + $to
2317}
2318
2319sub should_reset {
2320 my ($self) = @_;
2321
2322 $self->reset_at <= $cf::RUNTIME
2323}
2324
2325sub reset {
2326 my ($self) = @_;
2327
2328 my $lock = cf::lock_acquire "map_data:$self->{path}";
2329
2330 return if $self->players;
2331
2332 cf::trace "resetting map ", $self->path, "\n";
2333
2334 $self->in_memory (cf::MAP_SWAPPED);
2335
2336 # need to save uniques path
2337 unless ($self->{deny_save}) {
2338 my $uniq = $self->uniq_path; utf8::encode $uniq;
2339
2340 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2341 if $uniq;
2342 }
2343
2344 delete $cf::MAP{$self->path};
2264 2345
2265 $self->deactivate; 2346 $self->deactivate;
2266 $_->clear_links_to ($self) for values %cf::MAP; 2347 $_->clear_links_to ($self) for values %cf::MAP;
2267 $self->clear; 2348 $self->clear;
2268}
2269
2270sub reset_at {
2271 my ($self) = @_;
2272
2273 # TODO: safety, remove and allow resettable per-player maps
2274 return 1e99 if $self->{deny_reset};
2275
2276 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2277 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2278
2279 $time + $to
2280}
2281
2282sub should_reset {
2283 my ($self) = @_;
2284
2285 $self->reset_at <= $cf::RUNTIME
2286}
2287
2288sub reset {
2289 my ($self) = @_;
2290
2291 my $lock = cf::lock_acquire "map_data:$self->{path}";
2292
2293 return if $self->players;
2294
2295 warn "resetting map ", $self->path;
2296
2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # need to save uniques path
2300 unless ($self->{deny_save}) {
2301 my $uniq = $self->uniq_path; utf8::encode $uniq;
2302
2303 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2304 if $uniq;
2305 }
2306
2307 delete $cf::MAP{$self->path};
2308
2309 $self->deactivate;
2310 $_->clear_links_to ($self) for values %cf::MAP;
2311 $self->clear;
2312 2349
2313 $self->unlink_save; 2350 $self->unlink_save;
2314 $self->destroy; 2351 $self->destroy;
2315} 2352}
2316 2353
2324 2361
2325 delete $cf::MAP{$self->path}; 2362 delete $cf::MAP{$self->path};
2326 2363
2327 $self->unlink_save; 2364 $self->unlink_save;
2328 2365
2329 bless $self, "cf::map"; 2366 bless $self, "cf::map::wrap";
2330 delete $self->{deny_reset}; 2367 delete $self->{deny_reset};
2331 $self->{deny_save} = 1; 2368 $self->{deny_save} = 1;
2332 $self->reset_timeout (1); 2369 $self->reset_timeout (1);
2333 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2370 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2334 2371
2391 : normalise $_ 2428 : normalise $_
2392 } @{ aio_readdir $UNIQUEDIR or [] } 2429 } @{ aio_readdir $UNIQUEDIR or [] }
2393 ] 2430 ]
2394} 2431}
2395 2432
2433=item cf::map::static_maps
2434
2435Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2436file in the shared directory excluding F</styles> and F</editor>). May
2437block.
2438
2439=cut
2440
2441sub static_maps() {
2442 my @dirs = "";
2443 my @maps;
2444
2445 while (@dirs) {
2446 my $dir = shift @dirs;
2447
2448 next if $dir eq "/styles" || $dir eq "/editor";
2449
2450 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2451 or return;
2452
2453 for (@$files) {
2454 s/\.map$// or next;
2455 utf8::decode $_;
2456 push @maps, "$dir/$_";
2457 }
2458
2459 push @dirs, map "$dir/$_", @$dirs;
2460 }
2461
2462 \@maps
2463}
2464
2396=back 2465=back
2397 2466
2398=head3 cf::object 2467=head3 cf::object
2399 2468
2400=cut 2469=cut
2465 2534
2466our $SAY_CHANNEL = { 2535our $SAY_CHANNEL = {
2467 id => "say", 2536 id => "say",
2468 title => "Map", 2537 title => "Map",
2469 reply => "say ", 2538 reply => "say ",
2470 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2539 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2471}; 2540};
2472 2541
2473our $CHAT_CHANNEL = { 2542our $CHAT_CHANNEL = {
2474 id => "chat", 2543 id => "chat",
2475 title => "Chat", 2544 title => "Chat",
2530 2599
2531=item $player_object->enter_link 2600=item $player_object->enter_link
2532 2601
2533Freezes the player and moves him/her to a special map (C<{link}>). 2602Freezes the player and moves him/her to a special map (C<{link}>).
2534 2603
2535The player should be reasonably safe there for short amounts of time. You 2604The player should be reasonably safe there for short amounts of time (e.g.
2536I<MUST> call C<leave_link> as soon as possible, though. 2605for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2606though, as the player cannot control the character while it is on the link
2607map.
2537 2608
2538Will never block. 2609Will never block.
2539 2610
2540=item $player_object->leave_link ($map, $x, $y) 2611=item $player_object->leave_link ($map, $x, $y)
2541 2612
2561sub cf::object::player::enter_link { 2632sub cf::object::player::enter_link {
2562 my ($self) = @_; 2633 my ($self) = @_;
2563 2634
2564 $self->deactivate_recursive; 2635 $self->deactivate_recursive;
2565 2636
2637 ++$self->{_link_recursion};
2638
2566 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2639 return if UNIVERSAL::isa $self->map, "ext::map_link";
2567 2640
2568 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2641 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2569 if $self->map && $self->map->{path} ne "{link}"; 2642 if $self->map && $self->map->{path} ne "{link}";
2570 2643
2571 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2644 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2572} 2645}
2573 2646
2574sub cf::object::player::leave_link { 2647sub cf::object::player::leave_link {
2575 my ($self, $map, $x, $y) = @_; 2648 my ($self, $map, $x, $y) = @_;
2576 2649
2593 ($x, $y) = (-1, -1) 2666 ($x, $y) = (-1, -1)
2594 unless (defined $x) && (defined $y); 2667 unless (defined $x) && (defined $y);
2595 2668
2596 # use -1 or undef as default coordinates, not 0, 0 2669 # use -1 or undef as default coordinates, not 0, 0
2597 ($x, $y) = ($map->enter_x, $map->enter_y) 2670 ($x, $y) = ($map->enter_x, $map->enter_y)
2598 if $x <=0 && $y <= 0; 2671 if $x <= 0 && $y <= 0;
2599 2672
2600 $map->load; 2673 $map->load;
2601 $map->load_neighbours; 2674 $map->load_neighbours;
2602 2675
2603 return unless $self->contr->active; 2676 return unless $self->contr->active;
2604 $self->activate_recursive;
2605 2677
2606 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2678 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2607 $self->enter_map ($map, $x, $y); 2679 if ($self->enter_map ($map, $x, $y)) {
2608} 2680 # entering was successful
2681 delete $self->{_link_recursion};
2682 # only activate afterwards, to support waiting in hooks
2683 $self->activate_recursive;
2684 }
2609 2685
2686}
2687
2610=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2688=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2611 2689
2612Moves the player to the given map-path and coordinates by first freezing 2690Moves the player to the given map-path and coordinates by first freezing
2613her, loading and preparing them map, calling the provided $check callback 2691her, loading and preparing them map, calling the provided $check callback
2614that has to return the map if sucecssful, and then unfreezes the player on 2692that has to return the map if sucecssful, and then unfreezes the player on
2615the new (success) or old (failed) map position. In either case, $done will 2693the new (success) or old (failed) map position. In either case, $done will
2616be called at the end of this process. 2694be called at the end of this process.
2617 2695
2696Note that $check will be called with a potentially non-loaded map, so if
2697it needs a loaded map it has to call C<< ->load >>.
2698
2618=cut 2699=cut
2619 2700
2620our $GOTOGEN; 2701our $GOTOGEN;
2621 2702
2622sub cf::object::player::goto { 2703sub cf::object::player::goto {
2623 my ($self, $path, $x, $y, $check, $done) = @_; 2704 my ($self, $path, $x, $y, $check, $done) = @_;
2705
2706 if ($self->{_link_recursion} >= $MAX_LINKS) {
2707 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2708 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2709 ($path, $x, $y) = @$EMERGENCY_POSITION;
2710 }
2624 2711
2625 # do generation counting so two concurrent goto's will be executed in-order 2712 # do generation counting so two concurrent goto's will be executed in-order
2626 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2713 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2627 2714
2628 $self->enter_link; 2715 $self->enter_link;
2652 my $map = eval { 2739 my $map = eval {
2653 my $map = defined $path ? cf::map::find $path : undef; 2740 my $map = defined $path ? cf::map::find $path : undef;
2654 2741
2655 if ($map) { 2742 if ($map) {
2656 $map = $map->customise_for ($self); 2743 $map = $map->customise_for ($self);
2657 $map = $check->($map) if $check && $map; 2744 $map = $check->($map, $x, $y, $self) if $check && $map;
2658 } else { 2745 } else {
2659 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2746 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2660 } 2747 }
2661 2748
2662 $map 2749 $map
2670 if ($gen == $self->{_goto_generation}) { 2757 if ($gen == $self->{_goto_generation}) {
2671 delete $self->{_goto_generation}; 2758 delete $self->{_goto_generation};
2672 $self->leave_link ($map, $x, $y); 2759 $self->leave_link ($map, $x, $y);
2673 } 2760 }
2674 2761
2675 $done->() if $done; 2762 $done->($self) if $done;
2676 })->prio (1); 2763 })->prio (1);
2677} 2764}
2678 2765
2679=item $player_object->enter_exit ($exit_object) 2766=item $player_object->enter_exit ($exit_object)
2680 2767
2768 $self->contr->savebed ($map, $x, $y) 2855 $self->contr->savebed ($map, $x, $y)
2769 if $exit->flag (cf::FLAG_DAMNED); 2856 if $exit->flag (cf::FLAG_DAMNED);
2770 2857
2771 1 2858 1
2772 }) { 2859 }) {
2773 $self->message ("Something went wrong deep within the crossfire server. " 2860 $self->message ("Something went wrong deep within the deliantra server. "
2774 . "I'll try to bring you back to the map you were before. " 2861 . "I'll try to bring you back to the map you were before. "
2775 . "Please report this to the dungeon master!", 2862 . "Please report this to the dungeon master!",
2776 cf::NDI_UNIQUE | cf::NDI_RED); 2863 cf::NDI_UNIQUE | cf::NDI_RED);
2777 2864
2778 warn "ERROR in enter_exit: $@"; 2865 error "ERROR in enter_exit: $@";
2779 $self->leave_link; 2866 $self->leave_link;
2780 } 2867 }
2781 })->prio (1); 2868 })->prio (1);
2782} 2869}
2783 2870
2795sub cf::client::send_drawinfo { 2882sub cf::client::send_drawinfo {
2796 my ($self, $text, $flags) = @_; 2883 my ($self, $text, $flags) = @_;
2797 2884
2798 utf8::encode $text; 2885 utf8::encode $text;
2799 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2886 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2887}
2888
2889=item $client->send_big_packet ($pkt)
2890
2891Like C<send_packet>, but tries to compress large packets, and fragments
2892them as required.
2893
2894=cut
2895
2896our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2897
2898sub cf::client::send_big_packet {
2899 my ($self, $pkt) = @_;
2900
2901 # try lzf for large packets
2902 $pkt = "lzf " . Compress::LZF::compress $pkt
2903 if 1024 <= length $pkt and $self->{can_lzf};
2904
2905 # split very large packets
2906 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2907 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2908 $pkt = "frag";
2909 }
2910
2911 $self->send_packet ($pkt);
2800} 2912}
2801 2913
2802=item $client->send_msg ($channel, $msg, $color, [extra...]) 2914=item $client->send_msg ($channel, $msg, $color, [extra...])
2803 2915
2804Send a drawinfo or msg packet to the client, formatting the msg for the 2916Send a drawinfo or msg packet to the client, formatting the msg for the
2808 2920
2809=cut 2921=cut
2810 2922
2811# non-persistent channels (usually the info channel) 2923# non-persistent channels (usually the info channel)
2812our %CHANNEL = ( 2924our %CHANNEL = (
2925 "c/motd" => {
2926 id => "infobox",
2927 title => "MOTD",
2928 reply => undef,
2929 tooltip => "The message of the day",
2930 },
2813 "c/identify" => { 2931 "c/identify" => {
2814 id => "infobox", 2932 id => "infobox",
2815 title => "Identify", 2933 title => "Identify",
2816 reply => undef, 2934 reply => undef,
2817 tooltip => "Items recently identified", 2935 tooltip => "Items recently identified",
2819 "c/examine" => { 2937 "c/examine" => {
2820 id => "infobox", 2938 id => "infobox",
2821 title => "Examine", 2939 title => "Examine",
2822 reply => undef, 2940 reply => undef,
2823 tooltip => "Signs and other items you examined", 2941 tooltip => "Signs and other items you examined",
2942 },
2943 "c/shopinfo" => {
2944 id => "infobox",
2945 title => "Shop Info",
2946 reply => undef,
2947 tooltip => "What your bargaining skill tells you about the shop",
2824 }, 2948 },
2825 "c/book" => { 2949 "c/book" => {
2826 id => "infobox", 2950 id => "infobox",
2827 title => "Book", 2951 title => "Book",
2828 reply => undef, 2952 reply => undef,
2844 id => "infobox", 2968 id => "infobox",
2845 title => "Body Parts", 2969 title => "Body Parts",
2846 reply => undef, 2970 reply => undef,
2847 tooltip => "Shows which body parts you posess and are available", 2971 tooltip => "Shows which body parts you posess and are available",
2848 }, 2972 },
2973 "c/statistics" => {
2974 id => "infobox",
2975 title => "Statistics",
2976 reply => undef,
2977 tooltip => "Shows your primary statistics",
2978 },
2979 "c/skills" => {
2980 id => "infobox",
2981 title => "Skills",
2982 reply => undef,
2983 tooltip => "Shows your experience per skill and item power",
2984 },
2985 "c/shopitems" => {
2986 id => "infobox",
2987 title => "Shop Items",
2988 reply => undef,
2989 tooltip => "Shows the items currently for sale in this shop",
2990 },
2991 "c/resistances" => {
2992 id => "infobox",
2993 title => "Resistances",
2994 reply => undef,
2995 tooltip => "Shows your resistances",
2996 },
2997 "c/pets" => {
2998 id => "infobox",
2999 title => "Pets",
3000 reply => undef,
3001 tooltip => "Shows information abotu your pets/a specific pet",
3002 },
3003 "c/perceiveself" => {
3004 id => "infobox",
3005 title => "Perceive Self",
3006 reply => undef,
3007 tooltip => "You gained detailed knowledge about yourself",
3008 },
2849 "c/uptime" => { 3009 "c/uptime" => {
2850 id => "infobox", 3010 id => "infobox",
2851 title => "Uptime", 3011 title => "Uptime",
2852 reply => undef, 3012 reply => undef,
2853 tooltip => "How long the server has been running since last restart", 3013 tooltip => "How long the server has been running since last restart",
2862 id => "party", 3022 id => "party",
2863 title => "Party", 3023 title => "Party",
2864 reply => "gsay ", 3024 reply => "gsay ",
2865 tooltip => "Messages and chat related to your party", 3025 tooltip => "Messages and chat related to your party",
2866 }, 3026 },
3027 "c/death" => {
3028 id => "death",
3029 title => "Death",
3030 reply => undef,
3031 tooltip => "Reason for and more info about your most recent death",
3032 },
3033 "c/say" => $SAY_CHANNEL,
3034 "c/chat" => $CHAT_CHANNEL,
2867); 3035);
2868 3036
2869sub cf::client::send_msg { 3037sub cf::client::send_msg {
2870 my ($self, $channel, $msg, $color, @extra) = @_; 3038 my ($self, $channel, $msg, $color, @extra) = @_;
2871 3039
2872 $msg = $self->pl->expand_cfpod ($msg); 3040 $msg = $self->pl->expand_cfpod ($msg)
3041 unless $color & cf::NDI_VERBATIM;
2873 3042
2874 $color &= cf::NDI_CLIENT_MASK; # just in case... 3043 $color &= cf::NDI_CLIENT_MASK; # just in case...
2875 3044
2876 # check predefined channels, for the benefit of C 3045 # check predefined channels, for the benefit of C
2877 if ($CHANNEL{$channel}) { 3046 if ($CHANNEL{$channel}) {
2878 $channel = $CHANNEL{$channel}; 3047 $channel = $CHANNEL{$channel};
2879 3048
2880 $self->ext_msg (channel_info => $channel) 3049 $self->ext_msg (channel_info => $channel);
2881 if $self->can_msg;
2882
2883 $channel = $channel->{id}; 3050 $channel = $channel->{id};
2884 3051
2885 } elsif (ref $channel) { 3052 } elsif (ref $channel) {
2886 # send meta info to client, if not yet sent 3053 # send meta info to client, if not yet sent
2887 unless (exists $self->{channel}{$channel->{id}}) { 3054 unless (exists $self->{channel}{$channel->{id}}) {
2888 $self->{channel}{$channel->{id}} = $channel; 3055 $self->{channel}{$channel->{id}} = $channel;
2889 $self->ext_msg (channel_info => $channel) 3056 $self->ext_msg (channel_info => $channel);
2890 if $self->can_msg;
2891 } 3057 }
2892 3058
2893 $channel = $channel->{id}; 3059 $channel = $channel->{id};
2894 } 3060 }
2895 3061
2896 return unless @extra || length $msg; 3062 return unless @extra || length $msg;
2897 3063
2898 if ($self->can_msg) {
2899 # default colour, mask it out 3064 # default colour, mask it out
2900 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3065 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2901 if $color & cf::NDI_DEF; 3066 if $color & cf::NDI_DEF;
2902 3067
2903 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3068 my $pkt = "msg "
3069 . $self->{json_coder}->encode (
2904 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3070 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2905 } else { 3071 );
2906 if ($color >= 0) {
2907 # replace some tags by gcfclient-compatible ones
2908 for ($msg) {
2909 1 while
2910 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2911 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2912 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2913 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2914 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2915 }
2916 3072
2917 $color &= cf::NDI_COLOR_MASK; 3073 $self->send_big_packet ($pkt);
2918
2919 utf8::encode $msg;
2920
2921 if (0 && $msg =~ /\[/) {
2922 # COMMAND/INFO
2923 $self->send_packet ("drawextinfo $color 10 8 $msg")
2924 } else {
2925 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2926 $self->send_packet ("drawinfo $color $msg")
2927 }
2928 }
2929 }
2930} 3074}
2931 3075
2932=item $client->ext_msg ($type, @msg) 3076=item $client->ext_msg ($type, @msg)
2933 3077
2934Sends an ext event to the client. 3078Sends an ext event to the client.
2937 3081
2938sub cf::client::ext_msg($$@) { 3082sub cf::client::ext_msg($$@) {
2939 my ($self, $type, @msg) = @_; 3083 my ($self, $type, @msg) = @_;
2940 3084
2941 if ($self->extcmd == 2) { 3085 if ($self->extcmd == 2) {
2942 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3086 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2943 } elsif ($self->extcmd == 1) { # TODO: remove 3087 } elsif ($self->extcmd == 1) { # TODO: remove
2944 push @msg, msgtype => "event_$type"; 3088 push @msg, msgtype => "event_$type";
2945 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3089 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2946 } 3090 }
2947} 3091}
2948 3092
2949=item $client->ext_reply ($msgid, @msg) 3093=item $client->ext_reply ($msgid, @msg)
2950 3094
2954 3098
2955sub cf::client::ext_reply($$@) { 3099sub cf::client::ext_reply($$@) {
2956 my ($self, $id, @msg) = @_; 3100 my ($self, $id, @msg) = @_;
2957 3101
2958 if ($self->extcmd == 2) { 3102 if ($self->extcmd == 2) {
2959 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3103 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2960 } elsif ($self->extcmd == 1) { 3104 } elsif ($self->extcmd == 1) {
2961 #TODO: version 1, remove 3105 #TODO: version 1, remove
2962 unshift @msg, msgtype => "reply", msgid => $id; 3106 unshift @msg, msgtype => "reply", msgid => $id;
2963 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3107 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2964 } 3108 }
2965} 3109}
2966 3110
2967=item $success = $client->query ($flags, "text", \&cb) 3111=item $success = $client->query ($flags, "text", \&cb)
2968 3112
3039 3183
3040 $ns->ext_reply ($reply, @reply) 3184 $ns->ext_reply ($reply, @reply)
3041 if $reply; 3185 if $reply;
3042 3186
3043 } else { 3187 } else {
3044 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3188 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3045 } 3189 }
3046 3190
3047 cf::override; 3191 cf::override;
3048 }, 3192 },
3049); 3193);
3069 3213
3070 $coro 3214 $coro
3071} 3215}
3072 3216
3073cf::client->attach ( 3217cf::client->attach (
3074 on_destroy => sub { 3218 on_client_destroy => sub {
3075 my ($ns) = @_; 3219 my ($ns) = @_;
3076 3220
3077 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3221 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3078 }, 3222 },
3079); 3223);
3095our $safe_hole = new Safe::Hole; 3239our $safe_hole = new Safe::Hole;
3096 3240
3097$SIG{FPE} = 'IGNORE'; 3241$SIG{FPE} = 'IGNORE';
3098 3242
3099$safe->permit_only (Opcode::opset qw( 3243$safe->permit_only (Opcode::opset qw(
3100 :base_core :base_mem :base_orig :base_math 3244 :base_core :base_mem :base_orig :base_math :base_loop
3101 grepstart grepwhile mapstart mapwhile 3245 grepstart grepwhile mapstart mapwhile
3102 sort time 3246 sort time
3103)); 3247));
3104 3248
3105# here we export the classes and methods available to script code 3249# here we export the classes and methods available to script code
3109The following functions and methods are available within a safe environment: 3253The following functions and methods are available within a safe environment:
3110 3254
3111 cf::object 3255 cf::object
3112 contr pay_amount pay_player map x y force_find force_add destroy 3256 contr pay_amount pay_player map x y force_find force_add destroy
3113 insert remove name archname title slaying race decrease split 3257 insert remove name archname title slaying race decrease split
3258 value
3114 3259
3115 cf::object::player 3260 cf::object::player
3116 player 3261 player
3117 3262
3118 cf::player 3263 cf::player
3124=cut 3269=cut
3125 3270
3126for ( 3271for (
3127 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3272 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3128 insert remove inv nrof name archname title slaying race 3273 insert remove inv nrof name archname title slaying race
3129 decrease split destroy)], 3274 decrease split destroy change_exp value msg lore send_msg)],
3130 ["cf::object::player" => qw(player)], 3275 ["cf::object::player" => qw(player)],
3131 ["cf::player" => qw(peaceful)], 3276 ["cf::player" => qw(peaceful send_msg)],
3132 ["cf::map" => qw(trigger)], 3277 ["cf::map" => qw(trigger)],
3133) { 3278) {
3134 no strict 'refs';
3135 my ($pkg, @funs) = @$_; 3279 my ($pkg, @funs) = @$_;
3136 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3137 for @funs; 3281 for @funs;
3138} 3282}
3139 3283
3154 3298
3155 my $qcode = $code; 3299 my $qcode = $code;
3156 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3300 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3157 $qcode =~ s/\n/\\n/g; 3301 $qcode =~ s/\n/\\n/g;
3158 3302
3303 %vars = (_dummy => 0) unless %vars;
3304
3305 my @res;
3159 local $_; 3306 local $_;
3160 local @safe::cf::_safe_eval_args = values %vars;
3161 3307
3162 my $eval = 3308 my $eval =
3163 "do {\n" 3309 "do {\n"
3164 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3310 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3165 . "#line 0 \"{$qcode}\"\n" 3311 . "#line 0 \"{$qcode}\"\n"
3166 . $code 3312 . $code
3167 . "\n}" 3313 . "\n}"
3168 ; 3314 ;
3169 3315
3316 if ($CFG{safe_eval}) {
3170 sub_generation_inc; 3317 sub_generation_inc;
3318 local @safe::cf::_safe_eval_args = values %vars;
3171 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3319 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3172 sub_generation_inc; 3320 sub_generation_inc;
3321 } else {
3322 local @cf::_safe_eval_args = values %vars;
3323 @res = wantarray ? eval eval : scalar eval $eval;
3324 }
3173 3325
3174 if ($@) { 3326 if ($@) {
3175 warn "$@"; 3327 warn "$@",
3176 warn "while executing safe code '$code'\n"; 3328 "while executing safe code '$code'\n",
3177 warn "with arguments " . (join " ", %vars) . "\n"; 3329 "with arguments " . (join " ", %vars) . "\n";
3178 } 3330 }
3179 3331
3180 wantarray ? @res : $res[0] 3332 wantarray ? @res : $res[0]
3181} 3333}
3182 3334
3196=cut 3348=cut
3197 3349
3198sub register_script_function { 3350sub register_script_function {
3199 my ($fun, $cb) = @_; 3351 my ($fun, $cb) = @_;
3200 3352
3201 no strict 'refs'; 3353 $fun = "safe::$fun" if $CFG{safe_eval};
3202 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3354 *$fun = $safe_hole->wrap ($cb);
3203} 3355}
3204 3356
3205=back 3357=back
3206 3358
3207=cut 3359=cut
3216 # for this (global event?) 3368 # for this (global event?)
3217 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3218 3370
3219 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3371 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3220 3372
3221 warn "loading facedata from $path\n"; 3373 trace "loading facedata from $path\n";
3222 3374
3223 my $facedata; 3375 my $facedata;
3224 0 < aio_load $path, $facedata 3376 0 < aio_load $path, $facedata
3225 or die "$path: $!"; 3377 or die "$path: $!";
3226 3378
3228 3380
3229 $facedata->{version} == 2 3381 $facedata->{version} == 2
3230 or cf::cleanup "$path: version mismatch, cannot proceed."; 3382 or cf::cleanup "$path: version mismatch, cannot proceed.";
3231 3383
3232 # patch in the exptable 3384 # patch in the exptable
3385 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3233 $facedata->{resource}{"res/exp_table"} = { 3386 $facedata->{resource}{"res/exp_table"} = {
3234 type => FT_RSRC, 3387 type => FT_RSRC,
3235 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3388 data => $exp_table,
3389 hash => (Digest::MD5::md5 $exp_table),
3236 }; 3390 };
3237 cf::cede_to_tick; 3391 cf::cede_to_tick;
3238 3392
3239 { 3393 {
3240 my $faces = $facedata->{faceinfo}; 3394 my $faces = $facedata->{faceinfo};
3242 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
3243 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3397 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3244 3398
3245 cf::face::set_visibility $idx, $info->{visibility}; 3399 cf::face::set_visibility $idx, $info->{visibility};
3246 cf::face::set_magicmap $idx, $info->{magicmap}; 3400 cf::face::set_magicmap $idx, $info->{magicmap};
3247 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3248 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3249 3403
3250 cf::cede_to_tick; 3404 cf::cede_to_tick;
3251 } 3405 }
3252 3406
3253 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3258 3412
3259 if (my $smooth = cf::face::find $info->{smooth}) { 3413 if (my $smooth = cf::face::find $info->{smooth}) {
3260 cf::face::set_smooth $idx, $smooth; 3414 cf::face::set_smooth $idx, $smooth;
3261 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3262 } else { 3416 } else {
3263 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3417 error "smooth face '$info->{smooth}' not found for face '$face'";
3264 } 3418 }
3265 3419
3266 cf::cede_to_tick; 3420 cf::cede_to_tick;
3267 } 3421 }
3268 } 3422 }
3277 3431
3278 cf::anim::invalidate_all; # d'oh 3432 cf::anim::invalidate_all; # d'oh
3279 } 3433 }
3280 3434
3281 { 3435 {
3282 # TODO: for gcfclient pleasure, we should give resources
3283 # that gcfclient doesn't grok a >10000 face index.
3284 my $res = $facedata->{resource}; 3436 my $res = $facedata->{resource};
3285 3437
3286 while (my ($name, $info) = each %$res) { 3438 while (my ($name, $info) = each %$res) {
3287 if (defined $info->{type}) { 3439 if (defined $info->{type}) {
3288 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3440 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3289 my $data;
3290 3441
3291 if ($info->{type} & 1) { 3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3292 # prepend meta info
3293
3294 my $meta = $enc->encode ({
3295 name => $name,
3296 %{ $info->{meta} || {} },
3297 });
3298
3299 $data = pack "(w/a*)*", $meta, $info->{data};
3300 } else {
3301 $data = $info->{data};
3302 }
3303
3304 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3305 cf::face::set_type $idx, $info->{type}; 3443 cf::face::set_type $idx, $info->{type};
3306 } else { 3444 } else {
3307 $RESOURCE{$name} = $info; 3445 $RESOURCE{$name} = $info; # unused
3308 } 3446 }
3309 3447
3310 cf::cede_to_tick; 3448 cf::cede_to_tick;
3311 } 3449 }
3312 } 3450 }
3313 3451
3314 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3452 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3315 3453
3316 1 3454 1
3317} 3455}
3318
3319cf::global->attach (on_resource_update => sub {
3320 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3321 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3322
3323 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3324 my $sound = $soundconf->{compat}[$_]
3325 or next;
3326
3327 my $face = cf::face::find "sound/$sound->[1]";
3328 cf::sound::set $sound->[0] => $face;
3329 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3330 }
3331
3332 while (my ($k, $v) = each %{$soundconf->{event}}) {
3333 my $face = cf::face::find "sound/$v";
3334 cf::sound::set $k => $face;
3335 }
3336 }
3337});
3338 3456
3339register_exticmd fx_want => sub { 3457register_exticmd fx_want => sub {
3340 my ($ns, $want) = @_; 3458 my ($ns, $want) = @_;
3341 3459
3342 while (my ($k, $v) = each %$want) { 3460 while (my ($k, $v) = each %$want) {
3381sub reload_treasures { 3499sub reload_treasures {
3382 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
3383 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
3384} 3502}
3385 3503
3504sub reload_exp {
3505 cf::init_experience;
3506}
3507
3508sub reload_sound {
3509 trace "loading sound config from $DATADIR/sound\n";
3510
3511 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3512 or die "$DATADIR/sound $!";
3513
3514 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3515
3516 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3517 my $sound = $soundconf->{compat}[$_]
3518 or next;
3519
3520 my $face = cf::face::find "sound/$sound->[1]";
3521 cf::sound::set $sound->[0] => $face;
3522 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3523 }
3524
3525 while (my ($k, $v) = each %{$soundconf->{event}}) {
3526 my $face = cf::face::find "sound/$v";
3527 cf::sound::set $k => $face;
3528 }
3529}
3530
3386sub reload_resources { 3531sub reload_resources {
3387 warn "reloading resource files...\n"; 3532 trace "reloading resource files...\n";
3388 3533
3534 reload_exp;
3389 reload_facedata; 3535 reload_facedata;
3536 reload_sound;
3390 reload_archetypes; 3537 reload_archetypes;
3391 reload_regions; 3538 reload_regions;
3392 reload_treasures; 3539 reload_treasures;
3393 3540
3394 warn "finished reloading resource files\n"; 3541 trace "finished reloading resource files\n";
3395}
3396
3397sub init {
3398 my $guard = freeze_mainloop;
3399
3400 reload_resources;
3401} 3542}
3402 3543
3403sub reload_config { 3544sub reload_config {
3545 trace "reloading config file...\n";
3546
3404 open my $fh, "<:utf8", "$CONFDIR/config" 3547 open my $fh, "<:utf8", "$CONFDIR/config"
3405 or return; 3548 or return;
3406 3549
3407 local $/; 3550 local $/;
3408 *CFG = YAML::Load <$fh>; 3551 *CFG = YAML::XS::Load scalar <$fh>;
3409 3552
3410 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3553 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3411 3554
3412 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3555 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3413 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3556 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3414 3557
3415 if (exists $CFG{mlockall}) { 3558 if (exists $CFG{mlockall}) {
3417 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3560 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3418 and die "WARNING: m(un)lockall failed: $!\n"; 3561 and die "WARNING: m(un)lockall failed: $!\n";
3419 }; 3562 };
3420 warn $@ if $@; 3563 warn $@ if $@;
3421 } 3564 }
3565
3566 trace "finished reloading resource files\n";
3567}
3568
3569sub pidfile() {
3570 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3571 or die "$PIDFILE: $!";
3572 flock $fh, &Fcntl::LOCK_EX
3573 or die "$PIDFILE: flock: $!";
3574 $fh
3575}
3576
3577# make sure only one server instance is running at any one time
3578sub atomic {
3579 my $fh = pidfile;
3580
3581 my $pid = <$fh>;
3582 kill 9, $pid if $pid > 0;
3583
3584 seek $fh, 0, 0;
3585 print $fh $$;
3586}
3587
3588sub main_loop {
3589 trace "EV::loop starting\n";
3590 if (1) {
3591 EV::loop;
3592 }
3593 trace "EV::loop returned\n";
3594 goto &main_loop unless $REALLY_UNLOOP;
3422} 3595}
3423 3596
3424sub main { 3597sub main {
3598 cf::init_globals; # initialise logging
3599
3600 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3601 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3602 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3603 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3604
3605 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3606
3425 # we must not ever block the main coroutine 3607 # we must not ever block the main coroutine
3426 local $Coro::idle = sub { 3608 local $Coro::idle = sub {
3427 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3609 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3428 (async { 3610 (async {
3429 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3611 $Coro::current->{desc} = "IDLE BUG HANDLER";
3430 EV::loop EV::LOOP_ONESHOT; 3612 EV::loop EV::LOOP_ONESHOT;
3431 })->prio (Coro::PRIO_MAX); 3613 })->prio (Coro::PRIO_MAX);
3432 }; 3614 };
3433 3615
3434 { 3616 evthread_start IO::AIO::poll_fileno;
3435 my $guard = freeze_mainloop; 3617
3618 cf::sync_job {
3619 cf::incloader::init ();
3620
3621 cf::init_anim;
3622 cf::init_attackmess;
3623 cf::init_dynamic;
3624
3625 cf::load_settings;
3626 cf::load_materials;
3627
3628 reload_resources;
3436 reload_config; 3629 reload_config;
3437 db_init; 3630 db_init;
3631
3632 cf::init_uuid;
3633 cf::init_signals;
3634 cf::init_skills;
3635
3636 cf::init_beforeplay;
3637
3638 atomic;
3639
3438 load_extensions; 3640 load_extensions;
3439 3641
3440 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3642 utime time, time, $RUNTIMEFILE;
3441 evthread_start IO::AIO::poll_fileno; 3643
3644 # no (long-running) fork's whatsoever before this point(!)
3645 use POSIX ();
3646 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3647
3648 (pop @POST_INIT)->(0) while @POST_INIT;
3442 } 3649 };
3443 3650
3444 EV::loop; 3651 cf::object::thawer::errors_are_fatal 0;
3652 info "parse errors in files are no longer fatal from this point on.\n";
3653
3654 my $free_main; $free_main = EV::idle sub {
3655 undef $free_main;
3656 undef &main; # free gobs of memory :)
3657 };
3658
3659 goto &main_loop;
3445} 3660}
3446 3661
3447############################################################################# 3662#############################################################################
3448# initialisation and cleanup 3663# initialisation and cleanup
3449 3664
3450# install some emergency cleanup handlers 3665# install some emergency cleanup handlers
3451BEGIN { 3666BEGIN {
3452 our %SIGWATCHER = (); 3667 our %SIGWATCHER = ();
3453 for my $signal (qw(INT HUP TERM)) { 3668 for my $signal (qw(INT HUP TERM)) {
3454 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3669 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3455 cf::cleanup "SIG$signal"; 3670 cf::cleanup "SIG$signal";
3456 }; 3671 };
3457 } 3672 }
3458} 3673}
3459 3674
3460sub write_runtime_sync { 3675sub write_runtime_sync {
3461 my $runtime = "$LOCALDIR/runtime"; 3676 my $t0 = AE::time;
3462 3677
3463 # first touch the runtime file to show we are still running: 3678 # first touch the runtime file to show we are still running:
3464 # the fsync below can take a very very long time. 3679 # the fsync below can take a very very long time.
3465 3680
3466 IO::AIO::aio_utime $runtime, undef, undef; 3681 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3467 3682
3468 my $guard = cf::lock_acquire "write_runtime"; 3683 my $guard = cf::lock_acquire "write_runtime";
3469 3684
3470 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3685 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3471 or return; 3686 or return;
3472 3687
3473 my $value = $cf::RUNTIME + 90 + 10; 3688 my $value = $cf::RUNTIME + 90 + 10;
3474 # 10 is the runtime save interval, for a monotonic clock 3689 # 10 is the runtime save interval, for a monotonic clock
3475 # 60 allows for the watchdog to kill the server. 3690 # 60 allows for the watchdog to kill the server.
3485 aio_utime $fh, undef, undef; 3700 aio_utime $fh, undef, undef;
3486 3701
3487 close $fh 3702 close $fh
3488 or return; 3703 or return;
3489 3704
3490 aio_rename "$runtime~", $runtime 3705 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3491 and return; 3706 and return;
3492 3707
3493 warn "runtime file written.\n"; 3708 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3494 3709
3495 1 3710 1
3496} 3711}
3497 3712
3498our $uuid_lock; 3713our $uuid_lock;
3507 my $uuid = "$LOCALDIR/uuid"; 3722 my $uuid = "$LOCALDIR/uuid";
3508 3723
3509 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3724 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3510 or return; 3725 or return;
3511 3726
3512 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3727 my $value = uuid_seq uuid_cur;
3728
3729 unless ($value) {
3730 info "cowardly refusing to write zero uuid value!\n";
3731 return;
3732 }
3733
3734 my $value = uuid_str $value + $uuid_skip;
3513 $uuid_skip = 0; 3735 $uuid_skip = 0;
3514 3736
3515 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3737 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3516 and return; 3738 and return;
3517 3739
3523 or return; 3745 or return;
3524 3746
3525 aio_rename "$uuid~", $uuid 3747 aio_rename "$uuid~", $uuid
3526 and return; 3748 and return;
3527 3749
3528 warn "uuid file written ($value).\n"; 3750 trace "uuid file written ($value).\n";
3529 3751
3530 1 3752 1
3531 3753
3532} 3754}
3533 3755
3539} 3761}
3540 3762
3541sub emergency_save() { 3763sub emergency_save() {
3542 my $freeze_guard = cf::freeze_mainloop; 3764 my $freeze_guard = cf::freeze_mainloop;
3543 3765
3544 warn "enter emergency perl save\n"; 3766 info "emergency_perl_save: enter\n";
3767
3768 # this is a trade-off: we want to be very quick here, so
3769 # save all maps without fsync, and later call a global sync
3770 # (which in turn might be very very slow)
3771 local $USE_FSYNC = 0;
3545 3772
3546 cf::sync_job { 3773 cf::sync_job {
3774 cf::write_runtime_sync; # external watchdog should not bark
3775
3547 # use a peculiar iteration method to avoid tripping on perl 3776 # use a peculiar iteration method to avoid tripping on perl
3548 # refcount bugs in for. also avoids problems with players 3777 # refcount bugs in for. also avoids problems with players
3549 # and maps saved/destroyed asynchronously. 3778 # and maps saved/destroyed asynchronously.
3550 warn "begin emergency player save\n"; 3779 info "emergency_perl_save: begin player save\n";
3551 for my $login (keys %cf::PLAYER) { 3780 for my $login (keys %cf::PLAYER) {
3552 my $pl = $cf::PLAYER{$login} or next; 3781 my $pl = $cf::PLAYER{$login} or next;
3553 $pl->valid or next; 3782 $pl->valid or next;
3554 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3783 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3555 $pl->save; 3784 $pl->save;
3556 } 3785 }
3557 warn "end emergency player save\n"; 3786 info "emergency_perl_save: end player save\n";
3558 3787
3559 warn "begin emergency map save\n"; 3788 cf::write_runtime_sync; # external watchdog should not bark
3789
3790 info "emergency_perl_save: begin map save\n";
3560 for my $path (keys %cf::MAP) { 3791 for my $path (keys %cf::MAP) {
3561 my $map = $cf::MAP{$path} or next; 3792 my $map = $cf::MAP{$path} or next;
3562 $map->valid or next; 3793 $map->valid or next;
3563 $map->save; 3794 $map->save;
3564 } 3795 }
3565 warn "end emergency map save\n"; 3796 info "emergency_perl_save: end map save\n";
3566 3797
3567 warn "begin emergency database checkpoint\n"; 3798 cf::write_runtime_sync; # external watchdog should not bark
3799
3800 info "emergency_perl_save: begin database checkpoint\n";
3568 BDB::db_env_txn_checkpoint $DB_ENV; 3801 BDB::db_env_txn_checkpoint $DB_ENV;
3569 warn "end emergency database checkpoint\n"; 3802 info "emergency_perl_save: end database checkpoint\n";
3570 3803
3571 warn "begin write uuid\n"; 3804 info "emergency_perl_save: begin write uuid\n";
3572 write_uuid_sync 1; 3805 write_uuid_sync 1;
3573 warn "end write uuid\n"; 3806 info "emergency_perl_save: end write uuid\n";
3807
3808 cf::write_runtime_sync; # external watchdog should not bark
3809
3810 trace "emergency_perl_save: syncing database to disk";
3811 BDB::db_env_txn_checkpoint $DB_ENV;
3812
3813 info "emergency_perl_save: starting sync\n";
3814 IO::AIO::aio_sync sub {
3815 info "emergency_perl_save: finished sync\n";
3816 };
3817
3818 cf::write_runtime_sync; # external watchdog should not bark
3819
3820 trace "emergency_perl_save: flushing outstanding aio requests";
3821 while (IO::AIO::nreqs || BDB::nreqs) {
3822 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3823 }
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3574 }; 3826 };
3575 3827
3576 warn "leave emergency perl save\n"; 3828 info "emergency_perl_save: leave\n";
3577} 3829}
3578 3830
3579sub post_cleanup { 3831sub post_cleanup {
3580 my ($make_core) = @_; 3832 my ($make_core) = @_;
3581 3833
3834 IO::AIO::flush;
3835
3582 warn Carp::longmess "post_cleanup backtrace" 3836 error Carp::longmess "post_cleanup backtrace"
3583 if $make_core; 3837 if $make_core;
3838
3839 my $fh = pidfile;
3840 unlink $PIDFILE if <$fh> == $$;
3841}
3842
3843# a safer delete_package, copied from Symbol
3844sub clear_package($) {
3845 my $pkg = shift;
3846
3847 # expand to full symbol table name if needed
3848 unless ($pkg =~ /^main::.*::$/) {
3849 $pkg = "main$pkg" if $pkg =~ /^::/;
3850 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3851 $pkg .= '::' unless $pkg =~ /::$/;
3852 }
3853
3854 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3855 my $stem_symtab = *{$stem}{HASH};
3856
3857 defined $stem_symtab and exists $stem_symtab->{$leaf}
3858 or return;
3859
3860 # clear all symbols
3861 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3862 for my $name (keys %$leaf_symtab) {
3863 _gv_clear *{"$pkg$name"};
3864# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3865 }
3584} 3866}
3585 3867
3586sub do_reload_perl() { 3868sub do_reload_perl() {
3587 # can/must only be called in main 3869 # can/must only be called in main
3588 if ($Coro::current != $Coro::main) { 3870 unless (in_main) {
3589 warn "can only reload from main coroutine"; 3871 error "can only reload from main coroutine";
3590 return; 3872 return;
3591 } 3873 }
3592 3874
3875 return if $RELOAD++;
3876
3877 my $t1 = AE::time;
3878
3879 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl";
3593 warn "reloading..."; 3881 info "reloading...";
3594 3882
3595 warn "entering sync_job"; 3883 trace "entering sync_job";
3596 3884
3597 cf::sync_job { 3885 cf::sync_job {
3598 cf::write_runtime_sync; # external watchdog should not bark
3599 cf::emergency_save; 3886 #cf::emergency_save;
3600 cf::write_runtime_sync; # external watchdog should not bark
3601 3887
3602 warn "syncing database to disk";
3603 BDB::db_env_txn_checkpoint $DB_ENV;
3604
3605 # if anything goes wrong in here, we should simply crash as we already saved
3606
3607 warn "flushing outstanding aio requests";
3608 for (;;) {
3609 BDB::flush;
3610 IO::AIO::flush;
3611 Coro::cede_notself;
3612 last unless IO::AIO::nreqs || BDB::nreqs;
3613 warn "iterate...";
3614 }
3615
3616 ++$RELOAD;
3617
3618 warn "cancelling all extension coros"; 3888 trace "cancelling all extension coros";
3619 $_->cancel for values %EXT_CORO; 3889 $_->cancel for values %EXT_CORO;
3620 %EXT_CORO = (); 3890 %EXT_CORO = ();
3621 3891
3622 warn "removing commands"; 3892 trace "removing commands";
3623 %COMMAND = (); 3893 %COMMAND = ();
3624 3894
3625 warn "removing ext/exti commands"; 3895 trace "removing ext/exti commands";
3626 %EXTCMD = (); 3896 %EXTCMD = ();
3627 %EXTICMD = (); 3897 %EXTICMD = ();
3628 3898
3629 warn "unloading/nuking all extensions"; 3899 trace "unloading/nuking all extensions";
3630 for my $pkg (@EXTS) { 3900 for my $pkg (@EXTS) {
3631 warn "... unloading $pkg"; 3901 trace "... unloading $pkg";
3632 3902
3633 if (my $cb = $pkg->can ("unload")) { 3903 if (my $cb = $pkg->can ("unload")) {
3634 eval { 3904 eval {
3635 $cb->($pkg); 3905 $cb->($pkg);
3636 1 3906 1
3637 } or warn "$pkg unloaded, but with errors: $@"; 3907 } or error "$pkg unloaded, but with errors: $@";
3908 }
3909
3910 trace "... clearing $pkg";
3911 clear_package $pkg;
3638 } 3912 }
3639 3913
3640 warn "... nuking $pkg";
3641 Symbol::delete_package $pkg;
3642 }
3643
3644 warn "unloading all perl modules loaded from $LIBDIR"; 3914 trace "unloading all perl modules loaded from $LIBDIR";
3645 while (my ($k, $v) = each %INC) { 3915 while (my ($k, $v) = each %INC) {
3646 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3647 3917
3648 warn "... unloading $k"; 3918 trace "... unloading $k";
3649 delete $INC{$k}; 3919 delete $INC{$k};
3650 3920
3651 $k =~ s/\.pm$//; 3921 $k =~ s/\.pm$//;
3652 $k =~ s/\//::/g; 3922 $k =~ s/\//::/g;
3653 3923
3654 if (my $cb = $k->can ("unload_module")) { 3924 if (my $cb = $k->can ("unload_module")) {
3655 $cb->(); 3925 $cb->();
3926 }
3927
3928 clear_package $k;
3656 } 3929 }
3657 3930
3658 Symbol::delete_package $k;
3659 }
3660
3661 warn "getting rid of safe::, as good as possible"; 3931 trace "getting rid of safe::, as good as possible";
3662 Symbol::delete_package "safe::$_" 3932 clear_package "safe::$_"
3663 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3933 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3664 3934
3665 warn "unloading cf.pm \"a bit\""; 3935 trace "unloading cf.pm \"a bit\"";
3666 delete $INC{"cf.pm"}; 3936 delete $INC{"cf.pm"};
3667 delete $INC{"cf/pod.pm"}; 3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3668 3938
3669 # don't, removes xs symbols, too, 3939 # don't, removes xs symbols, too,
3670 # and global variables created in xs 3940 # and global variables created in xs
3671 #Symbol::delete_package __PACKAGE__; 3941 #clear_package __PACKAGE__;
3672 3942
3673 warn "unload completed, starting to reload now"; 3943 info "unload completed, starting to reload now";
3674 3944
3675 warn "reloading cf.pm"; 3945 trace "reloading cf.pm";
3676 require cf; 3946 require cf;
3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3947 cf::_connect_to_perl_1;
3678 3948
3679 warn "loading config and database again"; 3949 trace "loading config and database again";
3680 cf::reload_config; 3950 cf::reload_config;
3681 3951
3682 warn "loading extensions"; 3952 trace "loading extensions";
3683 cf::load_extensions; 3953 cf::load_extensions;
3684 3954
3955 if ($REATTACH_ON_RELOAD) {
3685 warn "reattaching attachments to objects/players"; 3956 trace "reattaching attachments to objects/players";
3686 _global_reattach; # objects, sockets 3957 _global_reattach; # objects, sockets
3687 warn "reattaching attachments to maps"; 3958 trace "reattaching attachments to maps";
3688 reattach $_ for values %MAP; 3959 reattach $_ for values %MAP;
3689 warn "reattaching attachments to players"; 3960 trace "reattaching attachments to players";
3690 reattach $_ for values %PLAYER; 3961 reattach $_ for values %PLAYER;
3962 }
3691 3963
3964 trace "running post_init jobs";
3965 (pop @POST_INIT)->(1) while @POST_INIT;
3966
3692 warn "leaving sync_job"; 3967 trace "leaving sync_job";
3693 3968
3694 1 3969 1
3695 } or do { 3970 } or do {
3696 warn $@; 3971 error $@;
3697 cf::cleanup "error while reloading, exiting."; 3972 cf::cleanup "error while reloading, exiting.";
3973 };
3974
3975 info "reloaded";
3976 --$RELOAD;
3698 }; 3977 }
3699 3978
3700 warn "reloaded"; 3979 $t1 = AE::time - $t1;
3980 info "reload completed in ${t1}s\n";
3701}; 3981};
3702 3982
3703our $RELOAD_WATCHER; # used only during reload 3983our $RELOAD_WATCHER; # used only during reload
3704 3984
3705sub reload_perl() { 3985sub reload_perl() {
3706 # doing reload synchronously and two reloads happen back-to-back, 3986 # doing reload synchronously and two reloads happen back-to-back,
3707 # coro crashes during coro_state_free->destroy here. 3987 # coro crashes during coro_state_free->destroy here.
3708 3988
3989 $RELOAD_WATCHER ||= cf::async {
3990 Coro::AIO::aio_wait cache_extensions;
3991
3709 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3992 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3710 do_reload_perl; 3993 do_reload_perl;
3711 undef $RELOAD_WATCHER; 3994 undef $RELOAD_WATCHER;
3995 };
3712 }; 3996 };
3713} 3997}
3714 3998
3715register_command "reload" => sub { 3999register_command "reload" => sub {
3716 my ($who, $arg) = @_; 4000 my ($who, $arg) = @_;
3722 reload_perl; 4006 reload_perl;
3723 }; 4007 };
3724 } 4008 }
3725}; 4009};
3726 4010
3727unshift @INC, $LIBDIR; 4011#############################################################################
3728 4012
3729my $bug_warning = 0; 4013my $bug_warning = 0;
3730 4014
3731our @WAIT_FOR_TICK; 4015our @WAIT_FOR_TICK;
3732our @WAIT_FOR_TICK_BEGIN; 4016our @WAIT_FOR_TICK_BEGIN;
3733 4017
3734sub wait_for_tick { 4018sub wait_for_tick {
3735 return if tick_inhibit || $Coro::current == $Coro::main; 4019 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3736 4020
3737 my $signal = new Coro::Signal; 4021 my $signal = new Coro::Signal;
3738 push @WAIT_FOR_TICK, $signal; 4022 push @WAIT_FOR_TICK, $signal;
3739 $signal->wait; 4023 $signal->wait;
3740} 4024}
3741 4025
3742sub wait_for_tick_begin { 4026sub wait_for_tick_begin {
3743 return if tick_inhibit || $Coro::current == $Coro::main; 4027 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3744 4028
3745 my $signal = new Coro::Signal; 4029 my $signal = new Coro::Signal;
3746 push @WAIT_FOR_TICK_BEGIN, $signal; 4030 push @WAIT_FOR_TICK_BEGIN, $signal;
3747 $signal->wait; 4031 $signal->wait;
3748} 4032}
3754 return; 4038 return;
3755 } 4039 }
3756 4040
3757 cf::server_tick; # one server iteration 4041 cf::server_tick; # one server iteration
3758 4042
4043 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4044
3759 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4045 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3760 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4046 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3761 Coro::async_pool { 4047 Coro::async_pool {
3762 $Coro::current->{desc} = "runtime saver"; 4048 $Coro::current->{desc} = "runtime saver";
3763 write_runtime_sync 4049 write_runtime_sync
3764 or warn "ERROR: unable to write runtime file: $!"; 4050 or error "ERROR: unable to write runtime file: $!";
3765 }; 4051 };
3766 } 4052 }
3767 4053
3768 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3769 $sig->send; 4055 $sig->send;
3777 4063
3778 if (0) { 4064 if (0) {
3779 if ($NEXT_TICK) { 4065 if ($NEXT_TICK) {
3780 my $jitter = $TICK_START - $NEXT_TICK; 4066 my $jitter = $TICK_START - $NEXT_TICK;
3781 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4067 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3782 warn "jitter $JITTER\n";#d# 4068 debug "jitter $JITTER\n";#d#
3783 } 4069 }
3784 } 4070 }
3785} 4071}
3786 4072
3787{ 4073{
3788 # configure BDB 4074 # configure BDB
3789 4075
3790 BDB::min_parallel 8; 4076 BDB::min_parallel 16;
3791 BDB::max_poll_reqs $TICK * 0.1; 4077 BDB::max_poll_reqs $TICK * 0.1;
3792 $Coro::BDB::WATCHER->priority (1); 4078 $AnyEvent::BDB::WATCHER->priority (1);
3793 4079
3794 unless ($DB_ENV) { 4080 unless ($DB_ENV) {
3795 $DB_ENV = BDB::db_env_create; 4081 $DB_ENV = BDB::db_env_create;
3796 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4082 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3797 | BDB::LOG_AUTOREMOVE, 1); 4083 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4084 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3798 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4085 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3799 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4086 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3800 4087
3801 cf::sync_job { 4088 cf::sync_job {
3802 eval { 4089 eval {
3828{ 4115{
3829 # configure IO::AIO 4116 # configure IO::AIO
3830 4117
3831 IO::AIO::min_parallel 8; 4118 IO::AIO::min_parallel 8;
3832 IO::AIO::max_poll_time $TICK * 0.1; 4119 IO::AIO::max_poll_time $TICK * 0.1;
3833 $Coro::AIO::WATCHER->priority (1); 4120 undef $AnyEvent::AIO::WATCHER;
3834} 4121}
3835 4122
3836my $_log_backtrace; 4123my $_log_backtrace;
3837 4124
3838sub _log_backtrace { 4125sub _log_backtrace {
3841 $msg =~ s/\n//; 4128 $msg =~ s/\n//;
3842 4129
3843 # limit the # of concurrent backtraces 4130 # limit the # of concurrent backtraces
3844 if ($_log_backtrace < 2) { 4131 if ($_log_backtrace < 2) {
3845 ++$_log_backtrace; 4132 ++$_log_backtrace;
4133 my $perl_bt = Carp::longmess $msg;
3846 async { 4134 async {
3847 $Coro::current->{desc} = "abt $msg"; 4135 $Coro::current->{desc} = "abt $msg";
3848 4136
3849 my @bt = fork_call { 4137 my @bt = fork_call {
3850 @addr = map { sprintf "%x", $_ } @addr; 4138 @addr = map { sprintf "%x", $_ } @addr;
3861 } 4149 }
3862 4150
3863 @funcs 4151 @funcs
3864 }; 4152 };
3865 4153
3866 LOG llevInfo, "[ABT] $msg\n"; 4154 LOG llevInfo, "[ABT] $perl_bt\n";
4155 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3867 LOG llevInfo, "[ABT] $_\n" for @bt; 4156 LOG llevInfo, "[ABT] $_\n" for @bt;
3868 --$_log_backtrace; 4157 --$_log_backtrace;
3869 }; 4158 };
3870 } else { 4159 } else {
3871 LOG llevInfo, "[ABT] $msg\n"; 4160 LOG llevInfo, "[ABT] $msg\n";
3872 LOG llevInfo, "[ABT] [suppressed]\n"; 4161 LOG llevInfo, "[ABT] [suppressed]\n";
3873 } 4162 }
3874} 4163}
3875 4164
3876# load additional modules 4165# load additional modules
3877use cf::pod; 4166require "cf/$_.pm" for @EXTRA_MODULES;
4167cf::_connect_to_perl_2;
3878 4168
3879END { cf::emergency_save } 4169END { cf::emergency_save }
3880 4170
38811 41711
3882 4172

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines