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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines