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.540 by root, Tue May 4 23:32:29 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines