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.544 by root, Thu May 6 21:58:07 2010 UTC

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

Diff Legend

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