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.548 by root, Mon May 10 21:40:22 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
189from wherever your confdir points to. 233from wherever your confdir points to.
190 234
191=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
192 236
193These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
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 thread
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
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
197=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
198 247
199This array contains the results of the last C<invoke ()> call. When 248This 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 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
201that call. 250that call.
202 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
203=back 258=back
204 259
205=cut 260=cut
206 261
207BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
208 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
209 my $msg = join "", @_; 269 my $msg = join "", @_;
210 270
211 $msg .= "\n" 271 $msg .= "\n"
212 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
213 273
214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
215 275
216 LOG llevError, $msg; 276 LOG llevWarn, $msg;
217 }; 277};
218}
219 278
220$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
222 281
223 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d# 286 return;#d#
226 }#d# 287 }#d#
227 288
228 # kill coroutine otherwise 289 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate 290 Coro::terminate
231}; 291};
232
233$SIG{__DIE__} = sub { }; #d#?
234 292
235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
245for my $pkg (qw( 303for my $pkg (qw(
246 cf::global cf::attachable 304 cf::global cf::attachable
247 cf::object cf::object::player 305 cf::object cf::object::player
248 cf::client cf::player 306 cf::client cf::player
249 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
250 cf::map cf::party cf::region 309 cf::party cf::region
251)) { 310)) {
252 no strict 'refs';
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 312}
255 313
256$EV::DIED = sub { 314$EV::DIED = sub {
257 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
258}; 316};
259 317
260############################################################################# 318#############################################################################
261 319
262=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300 358
301sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
303 361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
374=item cf::post_init { BLOCK }
375
376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
377but I<before> the server starts ticking again.
378
379The codeblock will have a single boolean argument to indicate whether this
380is a reload or not.
381
382=cut
383
384sub post_init(&) {
385 push @POST_INIT, shift;
386}
387
304=item cf::lock_wait $string 388=item cf::lock_wait $string
305 389
306Wait until the given lock is available. See cf::lock_acquire. 390Wait until the given lock is available. See cf::lock_acquire.
307 391
308=item my $lock = cf::lock_acquire $string 392=item my $lock = cf::lock_acquire $string
309 393
310Wait until the given lock is available and then acquires it and returns 394Wait 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, 395a L<Guard> object. If the guard object gets destroyed (goes out of scope,
312for example when the coroutine gets canceled), the lock is automatically 396for example when the coroutine gets canceled), the lock is automatically
313returned. 397returned.
314 398
315Locks are *not* recursive, locking from the same coro twice results in a 399Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro. 400deadlocked coro.
322 406
323Return true if the lock is currently active, i.e. somebody has locked it. 407Return true if the lock is currently active, i.e. somebody has locked it.
324 408
325=cut 409=cut
326 410
327our %LOCK; 411our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 412
330sub lock_wait($) { 413sub lock_wait($) {
331 my ($key) = @_; 414 $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} 415}
344 416
345sub lock_acquire($) { 417sub lock_acquire($) {
346 my ($key) = @_; 418 $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} 419}
360 420
361sub lock_active($) { 421sub lock_active($) {
362 my ($key) = @_; 422 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 423}
366 424
367sub freeze_mainloop { 425sub freeze_mainloop {
368 tick_inhibit_inc; 426 tick_inhibit_inc;
369 427
370 Coro::guard \&tick_inhibit_dec; 428 &Guard::guard (\&tick_inhibit_dec);
371} 429}
372 430
373=item cf::periodic $interval, $cb 431=item cf::periodic $interval, $cb
374 432
375Like EV::periodic, but randomly selects a starting point so that the actions 433Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer. 434get spread over time.
377 435
378=cut 436=cut
379 437
380sub periodic($$) { 438sub periodic($$) {
381 my ($interval, $cb) = @_; 439 my ($interval, $cb) = @_;
398 456
399=cut 457=cut
400 458
401our @SLOT_QUEUE; 459our @SLOT_QUEUE;
402our $SLOT_QUEUE; 460our $SLOT_QUEUE;
461our $SLOT_DECAY = 0.9;
403 462
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 463$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 464$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 465 $Coro::current->desc ("timeslot manager");
407 466
408 my $signal = new Coro::Signal; 467 my $signal = new Coro::Signal;
468 my $busy;
409 469
410 while () { 470 while () {
411 next_job: 471 next_job:
472
412 my $avail = cf::till_tick; 473 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 474
414 for (0 .. $#SLOT_QUEUE) { 475 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 476 if ($SLOT_QUEUE[$_][0] <= $avail) {
477 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 478 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 479 $job->[2]->send;
418 Coro::cede; 480 Coro::cede;
419 goto next_job; 481 goto next_job;
420 } 482 } else {
483 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 484 }
422 } 485 }
423 486
424 if (@SLOT_QUEUE) { 487 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 488 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 489 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 490 $signal->wait;
428 } else { 491 } else {
492 $busy = 0;
429 Coro::schedule; 493 Coro::schedule;
430 } 494 }
431 } 495 }
432}; 496};
433 497
434sub get_slot($;$$) { 498sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 499 return if tick_inhibit || $Coro::current == $Coro::main;
436 500
437 my ($time, $pri, $name) = @_; 501 my ($time, $pri, $name) = @_;
438 502
439 $time = $TICK * .6 if $time > $TICK * .6; 503 $time = clamp $time, 0.01, $TICK * .6;
504
440 my $sig = new Coro::Signal; 505 my $sig = new Coro::Signal;
441 506
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 507 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 508 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 509 $SLOT_QUEUE->ready;
470=cut 535=cut
471 536
472sub sync_job(&) { 537sub sync_job(&) {
473 my ($job) = @_; 538 my ($job) = @_;
474 539
475 if ($Coro::current == $Coro::main) { 540 if (in_main) {
476 my $time = EV::time; 541 my $time = AE::time;
477 542
478 # this is the main coro, too bad, we have to block 543 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 544 # till the operation succeeds, freezing the server :/
480 545
481 LOG llevError, Carp::longmess "sync job";#d# 546 #LOG llevError, Carp::longmess "sync job";#d#
482 547
483 my $freeze_guard = freeze_mainloop; 548 my $freeze_guard = freeze_mainloop;
484 549
485 my $busy = 1; 550 my $busy = 1;
486 my @res; 551 my @res;
487 552
488 (async { 553 (async {
489 $Coro::current->desc ("sync job coro"); 554 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 555 @res = eval { $job->() };
491 warn $@ if $@; 556 error $@ if $@;
492 undef $busy; 557 undef $busy;
493 })->prio (Coro::PRIO_MAX); 558 })->prio (Coro::PRIO_MAX);
494 559
495 while ($busy) { 560 while ($busy) {
496 if (Coro::nready) { 561 if (Coro::nready) {
498 } else { 563 } else {
499 EV::loop EV::LOOP_ONESHOT; 564 EV::loop EV::LOOP_ONESHOT;
500 } 565 }
501 } 566 }
502 567
503 my $time = EV::time - $time; 568 my $time = AE::time - $time;
504 569
505 $TICK_START += $time; # do not account sync jobs to server load 570 $TICK_START += $time; # do not account sync jobs to server load
506 571
507 wantarray ? @res : $res[0] 572 wantarray ? @res : $res[0]
508 } else { 573 } else {
530 $EXT_CORO{$coro+0} = $coro; 595 $EXT_CORO{$coro+0} = $coro;
531 596
532 $coro 597 $coro
533} 598}
534 599
535=item fork_call { }, $args 600=item fork_call { }, @args
536 601
537Executes the given code block with the given arguments in a seperate 602Executes the given code block with the given arguments in a seperate
538process, returning the results. Everything must be serialisable with 603process, returning the results. Everything must be serialisable with
539Coro::Storable. May, of course, block. Note that the executed sub may 604Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling. 605never block itself or use any form of event handling.
541 606
542=cut 607=cut
543 608
609sub post_fork {
610 reset_signals;
611}
612
544sub fork_call(&@) { 613sub fork_call(&@) {
545 my ($cb, @args) = @_; 614 my ($cb, @args) = @_;
546 615
547 # we seemingly have to make a local copy of the whole thing, 616 # we seemingly have to make a local copy of the whole thing,
548 # otherwise perl prematurely frees the stuff :/ 617 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious) 618 # TODO: investigate and fix (likely this will be rather laborious)
550 619
551 my @res = Coro::Util::fork_eval { 620 my @res = Coro::Util::fork_eval {
552 reset_signals; 621 cf::post_fork;
553 &$cb 622 &$cb
554 }, @args; 623 } @args;
555 624
556 wantarray ? @res : $res[-1] 625 wantarray ? @res : $res[-1]
626}
627
628sub objinfo {
629 (
630 "counter value" => cf::object::object_count,
631 "objects created" => cf::object::create_count,
632 "objects destroyed" => cf::object::destroy_count,
633 "freelist size" => cf::object::free_count,
634 "allocated objects" => cf::object::objects_size,
635 "active objects" => cf::object::actives_size,
636 )
557} 637}
558 638
559=item $coin = coin_from_name $name 639=item $coin = coin_from_name $name
560 640
561=cut 641=cut
598within each server. 678within each server.
599 679
600=cut 680=cut
601 681
602sub db_table($) { 682sub db_table($) {
683 cf::error "db_get called from main context"
684 if $Coro::current == $Coro::main;
685
603 my ($name) = @_; 686 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 687 my $db = BDB::db_create $DB_ENV;
605 688
606 eval { 689 eval {
607 $db->set_flags (BDB::CHKSUM); 690 $db->set_flags (BDB::CHKSUM);
617} 700}
618 701
619our $DB; 702our $DB;
620 703
621sub db_init { 704sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 705 $DB ||= db_table "db";
624 };
625} 706}
626 707
627sub db_get($$) { 708sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 709 my $key = "$_[0]/$_[1]";
629 710
630 cf::sync_job { 711 cf::error "db_get called from main context"
712 if $Coro::current == $Coro::main;
713
631 BDB::db_get $DB, undef, $key, my $data; 714 BDB::db_get $DB, undef, $key, my $data;
632 715
633 $! ? () 716 $! ? ()
634 : $data 717 : $data
635 }
636} 718}
637 719
638sub db_put($$$) { 720sub db_put($$$) {
639 BDB::dbreq_pri 4; 721 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 722 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
696 778
697 my $t1 = Time::HiRes::time; 779 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 780 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 781 my $t2 = Time::HiRes::time;
700 782
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 783 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 784
703 db_put cache => "$id/data", $data; 785 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 786 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 787 db_put cache => "$id/meta", $meta;
706 788
716 798
717=cut 799=cut
718 800
719sub datalog($@) { 801sub datalog($@) {
720 my ($type, %kv) = @_; 802 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 803 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 804}
723 805
724=back 806=back
725 807
726=cut 808=cut
727 809
728############################################################################# 810#############################################################################
729 811
730=head2 ATTACHABLE OBJECTS 812=head2 ATTACHABLE OBJECTS
731 813
732Many objects in crossfire are so-called attachable objects. That means you can 814Many objects in deliantra are so-called attachable objects. That means you can
733attach callbacks/event handlers (a collection of which is called an "attachment") 815attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 816to it. All such attachable objects support the following methods.
735 817
736In the following description, CLASS can be any of C<global>, C<object> 818In 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 819C<player>, C<client> or C<map> (i.e. the attachable objects in
787=item cf::CLASS::attachment $name, ... 869=item cf::CLASS::attachment $name, ...
788 870
789Register an attachment by C<$name> through which attachable objects of the 871Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 872given CLASS can refer to this attachment.
791 873
792Some classes such as crossfire maps and objects can specify attachments 874Some classes such as deliantra maps and objects can specify attachments
793that are attached at load/instantiate time, thus the need for a name. 875that are attached at load/instantiate time, thus the need for a name.
794 876
795These calls expect any number of the following handler/hook descriptions: 877These calls expect any number of the following handler/hook descriptions:
796 878
797=over 4 879=over 4
921 1003
922 } elsif (exists $cb_id{$type}) { 1004 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1005 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 1006
925 } elsif (ref $type) { 1007 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 1008 error "attaching objects not supported, ignoring.\n";
927 1009
928 } else { 1010 } else {
929 shift @arg; 1011 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 1012 error "attach argument '$type' not supported, ignoring.\n";
931 } 1013 }
932 } 1014 }
933} 1015}
934 1016
935sub _object_attach { 1017sub _object_attach {
945 _attach $registry, $klass, @attach; 1027 _attach $registry, $klass, @attach;
946 } 1028 }
947 1029
948 $obj->{$name} = \%arg; 1030 $obj->{$name} = \%arg;
949 } else { 1031 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1032 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1033 }
952 1034
953 $obj->{_attachment}{$name} = undef; 1035 $obj->{_attachment}{$name} = undef;
954} 1036}
955 1037
1014 1096
1015 for (@$callbacks) { 1097 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1098 eval { &{$_->[1]} };
1017 1099
1018 if ($@) { 1100 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1101 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1102 override;
1022 } 1103 }
1023 1104
1024 return 1 if $override; 1105 return 1 if $override;
1025 } 1106 }
1088 1169
1089sub reattach { 1170sub reattach {
1090 # basically do the same as instantiate, without calling instantiate 1171 # basically do the same as instantiate, without calling instantiate
1091 my ($obj) = @_; 1172 my ($obj) = @_;
1092 1173
1174 # no longer needed after getting rid of delete_package?
1093 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1175 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1094 1176
1095 my $registry = $obj->registry; 1177 my $registry = $obj->registry;
1096 1178
1097 @$registry = (); 1179 @$registry = ();
1098 1180
1103 for (@$attach) { 1185 for (@$attach) {
1104 my ($klass, @attach) = @$_; 1186 my ($klass, @attach) = @$_;
1105 _attach $registry, $klass, @attach; 1187 _attach $registry, $klass, @attach;
1106 } 1188 }
1107 } else { 1189 } else {
1108 warn "object uses attachment '$name' that is not available, postponing.\n"; 1190 info "object uses attachment '$name' that is not available, postponing.\n";
1109 } 1191 }
1110 } 1192 }
1111} 1193}
1112 1194
1113cf::attachable->attach ( 1195cf::attachable->attach (
1140 my ($filename, $rdata, $objs) = @_; 1222 my ($filename, $rdata, $objs) = @_;
1141 1223
1142 sync_job { 1224 sync_job {
1143 if (length $$rdata) { 1225 if (length $$rdata) {
1144 utf8::decode (my $decname = $filename); 1226 utf8::decode (my $decname = $filename);
1145 warn sprintf "saving %s (%d,%d)\n", 1227 trace sprintf "saving %s (%d,%d)\n",
1146 $decname, length $$rdata, scalar @$objs; 1228 $decname, length $$rdata, scalar @$objs
1229 if $VERBOSE_IO;
1147 1230
1148 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1231 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1149 aio_chmod $fh, SAVE_MODE; 1232 aio_chmod $fh, SAVE_MODE;
1150 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1233 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1151 aio_fsync $fh if $cf::USE_FSYNC; 1234 if ($cf::USE_FSYNC) {
1235 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;
1236 aio_fsync $fh;
1237 }
1152 aio_close $fh; 1238 aio_close $fh;
1153 1239
1154 if (@$objs) { 1240 if (@$objs) {
1155 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1241 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1156 aio_chmod $fh, SAVE_MODE; 1242 aio_chmod $fh, SAVE_MODE;
1157 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1243 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1158 aio_write $fh, 0, (length $data), $data, 0; 1244 aio_write $fh, 0, (length $data), $data, 0;
1159 aio_fsync $fh if $cf::USE_FSYNC; 1245 if ($cf::USE_FSYNC) {
1246 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;
1247 aio_fsync $fh;
1248 }
1160 aio_close $fh; 1249 aio_close $fh;
1161 aio_rename "$filename.pst~", "$filename.pst"; 1250 aio_rename "$filename.pst~", "$filename.pst";
1162 } 1251 }
1163 } else { 1252 } else {
1164 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1165 } 1254 }
1166 1255
1167 aio_rename "$filename~", $filename; 1256 aio_rename "$filename~", $filename;
1257
1258 $filename =~ s%/[^/]+$%%;
1259 aio_pathsync $filename if $cf::USE_FSYNC;
1168 } else { 1260 } else {
1169 warn "FATAL: $filename~: $!\n"; 1261 error "unable to save objects: $filename~: $!\n";
1170 } 1262 }
1171 } else { 1263 } else {
1172 aio_unlink $filename; 1264 aio_unlink $filename;
1173 aio_unlink "$filename.pst"; 1265 aio_unlink "$filename.pst";
1174 } 1266 }
1198 my $st = eval { Coro::Storable::thaw $av }; 1290 my $st = eval { Coro::Storable::thaw $av };
1199 $av = $st->{objs}; 1291 $av = $st->{objs};
1200 } 1292 }
1201 1293
1202 utf8::decode (my $decname = $filename); 1294 utf8::decode (my $decname = $filename);
1203 warn sprintf "loading %s (%d,%d)\n", 1295 trace sprintf "loading %s (%d,%d)\n",
1204 $decname, length $data, scalar @{$av || []}; 1296 $decname, length $data, scalar @{$av || []}
1297 if $VERBOSE_IO;
1205 1298
1206 ($data, $av) 1299 ($data, $av)
1207} 1300}
1208 1301
1209=head2 COMMAND CALLBACKS 1302=head2 COMMAND CALLBACKS
1265 my ($name, $cb) = @_; 1358 my ($name, $cb) = @_;
1266 1359
1267 $EXTICMD{$name} = $cb; 1360 $EXTICMD{$name} = $cb;
1268} 1361}
1269 1362
1363use File::Glob ();
1364
1270cf::player->attach ( 1365cf::player->attach (
1271 on_command => sub { 1366 on_unknown_command => sub {
1272 my ($pl, $name, $params) = @_; 1367 my ($pl, $name, $params) = @_;
1273 1368
1274 my $cb = $COMMAND{$name} 1369 my $cb = $COMMAND{$name}
1275 or return; 1370 or return;
1276 1371
1299 1394
1300 $pl->ext_reply ($reply, @reply) 1395 $pl->ext_reply ($reply, @reply)
1301 if $reply; 1396 if $reply;
1302 1397
1303 } else { 1398 } else {
1304 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1399 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1305 } 1400 }
1306 1401
1307 cf::override; 1402 cf::override;
1308 }, 1403 },
1309); 1404);
1310 1405
1406# "readahead" all extensions
1407sub cache_extensions {
1408 my $grp = IO::AIO::aio_group;
1409
1410 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1411 for (grep /\.ext$/, @{$_[0]}) {
1412 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1413 }
1414 };
1415
1416 $grp
1417}
1418
1311sub load_extensions { 1419sub load_extensions {
1420 info "loading extensions...";
1421
1312 cf::sync_job { 1422 cf::sync_job {
1313 my %todo; 1423 my %todo;
1314 1424
1315 for my $path (<$LIBDIR/*.ext>) { 1425 for my $path (<$LIBDIR/*.ext>) {
1316 next unless -r $path; 1426 next unless -r $path;
1334 1444
1335 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1445 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1336 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1446 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1337 1447
1338 $ext{source} = 1448 $ext{source} =
1339 "package $pkg; use strict; use utf8;\n" 1449 "package $pkg; use common::sense;\n"
1340 . "#line 1 \"$path\"\n{\n" 1450 . "#line 1 \"$path\"\n{\n"
1341 . $source 1451 . $source
1342 . "\n};\n1"; 1452 . "\n};\n1";
1343 1453
1344 $todo{$base} = \%ext; 1454 $todo{$base} = \%ext;
1345 } 1455 }
1346 1456
1457 my $pass = 0;
1347 my %done; 1458 my %done;
1348 while (%todo) { 1459 while (%todo) {
1349 my $progress; 1460 my $progress;
1350 1461
1462 ++$pass;
1463
1464 ext:
1351 while (my ($k, $v) = each %todo) { 1465 while (my ($k, $v) = each %todo) {
1352 for (split /,\s*/, $v->{meta}{depends}) { 1466 for (split /,\s*/, $v->{meta}{depends}) {
1353 goto skip 1467 next ext
1354 unless exists $done{$_}; 1468 unless exists $done{$_};
1355 } 1469 }
1356 1470
1357 warn "... loading '$k' into '$v->{pkg}'\n"; 1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1358 1472
1359 unless (eval $v->{source}) { 1473 my $active = eval $v->{source};
1474
1475 if (length $@) {
1360 my $msg = $@ ? "$v->{path}: $@\n" 1476 error "$v->{path}: $@\n";
1361 : "$v->{base}: extension inactive.\n";
1362 1477
1363 if (exists $v->{meta}{mandatory}) {
1364 warn $msg;
1365 cf::cleanup "mandatory extension failed to load, exiting."; 1478 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1366 } 1479 if exists $v->{meta}{mandatory};
1367 1480
1368 warn $msg; 1481 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1482 delete $todo{$k};
1483 } else {
1484 $done{$k} = delete $todo{$k};
1485 push @EXTS, $v->{pkg};
1486 $progress = 1;
1487
1488 info "$v->{base}: extension inactive.\n"
1489 unless $active;
1369 } 1490 }
1370
1371 $done{$k} = delete $todo{$k};
1372 push @EXTS, $v->{pkg};
1373 $progress = 1;
1374 } 1491 }
1375 1492
1376 skip: 1493 unless ($progress) {
1377 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1494 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1378 unless $progress; 1495
1496 while (my ($k, $v) = each %todo) {
1497 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1498 if exists $v->{meta}{mandatory};
1499 }
1500 }
1379 } 1501 }
1380 }; 1502 };
1381} 1503}
1382 1504
1383############################################################################# 1505#############################################################################
1384 1506
1385=back 1507=back
1386 1508
1387=head2 CORE EXTENSIONS 1509=head2 CORE EXTENSIONS
1388 1510
1389Functions and methods that extend core crossfire objects. 1511Functions and methods that extend core deliantra objects.
1390 1512
1391=cut 1513=cut
1392 1514
1393package cf::player; 1515package cf::player;
1394 1516
1437 1559
1438sub exists($) { 1560sub exists($) {
1439 my ($login) = @_; 1561 my ($login) = @_;
1440 1562
1441 $cf::PLAYER{$login} 1563 $cf::PLAYER{$login}
1442 or cf::sync_job { !aio_stat path $login } 1564 or !aio_stat path $login
1443} 1565}
1444 1566
1445sub find($) { 1567sub find($) {
1446 return $cf::PLAYER{$_[0]} || do { 1568 return $cf::PLAYER{$_[0]} || do {
1447 my $login = $_[0]; 1569 my $login = $_[0];
1467 $cf::PLAYER{$login} = $pl 1589 $cf::PLAYER{$login} = $pl
1468 } 1590 }
1469 } 1591 }
1470} 1592}
1471 1593
1594cf::player->attach (
1595 on_load => sub {
1596 my ($pl, $path) = @_;
1597
1598 # restore slots saved in save, below
1599 my $slots = delete $pl->{_slots};
1600
1601 $pl->ob->current_weapon ($slots->[0]);
1602 $pl->combat_ob ($slots->[1]);
1603 $pl->ranged_ob ($slots->[2]);
1604 },
1605);
1606
1472sub save($) { 1607sub save($) {
1473 my ($pl) = @_; 1608 my ($pl) = @_;
1474 1609
1475 return if $pl->{deny_save}; 1610 return if $pl->{deny_save};
1476 1611
1481 1616
1482 aio_mkdir playerdir $pl, 0770; 1617 aio_mkdir playerdir $pl, 0770;
1483 $pl->{last_save} = $cf::RUNTIME; 1618 $pl->{last_save} = $cf::RUNTIME;
1484 1619
1485 cf::get_slot 0.01; 1620 cf::get_slot 0.01;
1621
1622 # save slots, to be restored later
1623 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1486 1624
1487 $pl->save_pl ($path); 1625 $pl->save_pl ($path);
1488 cf::cede_to_tick; 1626 cf::cede_to_tick;
1489} 1627}
1490 1628
1522 my ($pl) = @_; 1660 my ($pl) = @_;
1523 1661
1524 my $name = $pl->ob->name; 1662 my $name = $pl->ob->name;
1525 1663
1526 $pl->{deny_save} = 1; 1664 $pl->{deny_save} = 1;
1527 $pl->password ("*"); # this should lock out the player until we nuked the dir 1665 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1528 1666
1529 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1530 $pl->deactivate; 1668 $pl->deactivate;
1669
1531 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1670 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1532 $pl->ob->check_score; 1671 ext::highscore::check ($pl->ob);
1672
1533 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1673 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1534 $pl->ns->destroy if $pl->ns; 1674 $pl->ns->destroy if $pl->ns;
1535 1675
1536 my $path = playerdir $pl; 1676 my $path = playerdir $pl;
1537 my $temp = "$path~$cf::RUNTIME~deleting~"; 1677 my $temp = "$path~$cf::RUNTIME~deleting~";
1592 \@logins 1732 \@logins
1593} 1733}
1594 1734
1595=item $player->maps 1735=item $player->maps
1596 1736
1737=item cf::player::maps $login
1738
1597Returns an arrayref of map paths that are private for this 1739Returns an arrayref of map paths that are private for this
1598player. May block. 1740player. May block.
1599 1741
1600=cut 1742=cut
1601 1743
1618 } 1760 }
1619 1761
1620 \@paths 1762 \@paths
1621} 1763}
1622 1764
1623=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1765=item $protocol_xml = $player->expand_cfpod ($cfpod)
1624 1766
1625Expand crossfire pod fragments into protocol xml. 1767Expand 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 1768
1716=item $player->ext_reply ($msgid, @msg) 1769=item $player->ext_reply ($msgid, @msg)
1717 1770
1718Sends an ext reply to the player. 1771Sends an ext reply to the player.
1719 1772
1751 1804
1752=cut 1805=cut
1753 1806
1754sub find_by_path($) { 1807sub find_by_path($) {
1755 my ($path) = @_; 1808 my ($path) = @_;
1809
1810 $path =~ s/^~[^\/]*//; # skip ~login
1756 1811
1757 my ($match, $specificity); 1812 my ($match, $specificity);
1758 1813
1759 for my $region (list) { 1814 for my $region (list) {
1760 if ($region->{match} && $path =~ $region->{match}) { 1815 if ($region->{match} && $path =~ $region->{match}) {
1792 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1847 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1793 1848
1794 # mit "rum" bekleckern, nicht 1849 # mit "rum" bekleckern, nicht
1795 $self->_create_random_map ( 1850 $self->_create_random_map (
1796 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1851 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1797 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1852 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1798 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1853 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1799 $rmp->{exit_on_final_map}, 1854 $rmp->{exit_on_final_map},
1800 $rmp->{xsize}, $rmp->{ysize}, 1855 $rmp->{xsize}, $rmp->{ysize},
1801 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1856 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1802 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1857 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1817 1872
1818sub register { 1873sub register {
1819 my (undef, $regex, $prio) = @_; 1874 my (undef, $regex, $prio) = @_;
1820 my $pkg = caller; 1875 my $pkg = caller;
1821 1876
1822 no strict;
1823 push @{"$pkg\::ISA"}, __PACKAGE__; 1877 push @{"$pkg\::ISA"}, __PACKAGE__;
1824 1878
1825 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1879 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1826} 1880}
1827 1881
1828# also paths starting with '/' 1882# also paths starting with '/'
1829$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1883$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1830 1884
1831sub thawer_merge { 1885sub thawer_merge {
1832 my ($self, $merge) = @_; 1886 my ($self, $merge) = @_;
1833 1887
1834 # we have to keep some variables in memory intact 1888 # we have to keep some variables in memory intact
1839} 1893}
1840 1894
1841sub normalise { 1895sub normalise {
1842 my ($path, $base) = @_; 1896 my ($path, $base) = @_;
1843 1897
1844 $path = "$path"; # make sure its a string 1898 $path = "$path"; # make sure it's a string
1845 1899
1846 $path =~ s/\.map$//; 1900 $path =~ s/\.map$//;
1847 1901
1848 # map plan: 1902 # map plan:
1849 # 1903 #
1888 $self->init; # pass $1 etc. 1942 $self->init; # pass $1 etc.
1889 return $self; 1943 return $self;
1890 } 1944 }
1891 } 1945 }
1892 1946
1893 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1947 Carp::cluck "unable to resolve path '$path' (base '$base')";
1894 () 1948 ()
1895} 1949}
1896 1950
1897sub init { 1951sub init {
1898 my ($self) = @_; 1952 my ($self) = @_;
1930sub uniq_path { 1984sub uniq_path {
1931 my ($self) = @_; 1985 my ($self) = @_;
1932 1986
1933 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1987 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1934 "$UNIQUEDIR/$path" 1988 "$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} 1989}
1945 1990
1946sub decay_objects { 1991sub decay_objects {
1947 my ($self) = @_; 1992 my ($self) = @_;
1948 1993
2030 2075
2031sub find; 2076sub find;
2032sub find { 2077sub find {
2033 my ($path, $origin) = @_; 2078 my ($path, $origin) = @_;
2034 2079
2080 cf::cede_to_tick;
2081
2035 $path = normalise $path, $origin && $origin->path; 2082 $path = normalise $path, $origin && $origin->path;
2036 2083
2037 cf::lock_wait "map_data:$path";#d#remove 2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2038 cf::lock_wait "map_find:$path"; 2085 my $guard2 = cf::lock_acquire "map_find:$path";
2039 2086
2040 $cf::MAP{$path} || do { 2087 $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 2088 my $map = new_from_path cf::map $path
2045 or return; 2089 or return;
2046 2090
2047 $map->{last_save} = $cf::RUNTIME; 2091 $map->{last_save} = $cf::RUNTIME;
2048 2092
2060 2104
2061 $cf::MAP{$path} = $map 2105 $cf::MAP{$path} = $map
2062 } 2106 }
2063} 2107}
2064 2108
2065sub pre_load { } 2109sub pre_load { }
2066sub post_load { } 2110#sub post_load { } # XS
2067 2111
2068sub load { 2112sub load {
2069 my ($self) = @_; 2113 my ($self) = @_;
2070 2114
2071 local $self->{deny_reset} = 1; # loading can take a long time 2115 local $self->{deny_reset} = 1; # loading can take a long time
2088 my $f = new_from_file cf::object::thawer $self->{load_path}; 2132 my $f = new_from_file cf::object::thawer $self->{load_path};
2089 $f->skip_block; 2133 $f->skip_block;
2090 $self->_load_objects ($f) 2134 $self->_load_objects ($f)
2091 or return; 2135 or return;
2092 2136
2093 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2137 $self->post_load_original
2094 if delete $self->{load_original}; 2138 if delete $self->{load_original};
2095 2139
2096 if (my $uniq = $self->uniq_path) { 2140 if (my $uniq = $self->uniq_path) {
2097 utf8::encode $uniq; 2141 utf8::encode $uniq;
2098 unless (aio_stat $uniq) { 2142 unless (aio_stat $uniq) {
2116 unless ($self->{deny_activate}) { 2160 unless ($self->{deny_activate}) {
2117 $self->decay_objects; 2161 $self->decay_objects;
2118 $self->fix_auto_apply; 2162 $self->fix_auto_apply;
2119 $self->update_buttons; 2163 $self->update_buttons;
2120 cf::cede_to_tick; 2164 cf::cede_to_tick;
2121 $self->set_darkness_map;
2122 cf::cede_to_tick;
2123 $self->activate; 2165 $self->activate;
2124 } 2166 }
2125 2167
2126 $self->{last_save} = $cf::RUNTIME; 2168 $self->{last_save} = $cf::RUNTIME;
2127 $self->last_access ($cf::RUNTIME); 2169 $self->last_access ($cf::RUNTIME);
2130 } 2172 }
2131 2173
2132 $self->post_load; 2174 $self->post_load;
2133} 2175}
2134 2176
2177# customize the map for a given player, i.e.
2178# return the _real_ map. used by e.g. per-player
2179# maps to change the path to ~playername/mappath
2135sub customise_for { 2180sub customise_for {
2136 my ($self, $ob) = @_; 2181 my ($self, $ob) = @_;
2137 2182
2138 return find "~" . $ob->name . "/" . $self->{path} 2183 return find "~" . $ob->name . "/" . $self->{path}
2139 if $self->per_player; 2184 if $self->per_player;
2155 or next; 2200 or next;
2156 $neigh = find $neigh, $map 2201 $neigh = find $neigh, $map
2157 or next; 2202 or next;
2158 $neigh->load; 2203 $neigh->load;
2159 2204
2205 # now find the diagonal neighbours
2160 push @neigh, 2206 push @neigh,
2161 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2162 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2163 } 2209 }
2164 2210
2171} 2217}
2172 2218
2173sub find_sync { 2219sub find_sync {
2174 my ($path, $origin) = @_; 2220 my ($path, $origin) = @_;
2175 2221
2176 cf::sync_job { find $path, $origin } 2222 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223 if $Coro::current == $Coro::main;
2224
2225 find $path, $origin
2177} 2226}
2178 2227
2179sub do_load_sync { 2228sub do_load_sync {
2180 my ($map) = @_; 2229 my ($map) = @_;
2181 2230
2182 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2183 if $Coro::current == $Coro::main; 2232 if $Coro::current == $Coro::main;
2184 2233
2185 cf::sync_job { $map->load }; 2234 $map->load;
2186} 2235}
2187 2236
2188our %MAP_PREFETCH; 2237our %MAP_PREFETCH;
2189our $MAP_PREFETCHER = undef; 2238our $MAP_PREFETCHER = undef;
2190 2239
2216 $MAP_PREFETCHER->prio (6); 2265 $MAP_PREFETCHER->prio (6);
2217 2266
2218 () 2267 ()
2219} 2268}
2220 2269
2270# common code, used by both ->save and ->swapout
2221sub save { 2271sub _save {
2222 my ($self) = @_; 2272 my ($self) = @_;
2223
2224 my $lock = cf::lock_acquire "map_data:$self->{path}";
2225 2273
2226 $self->{last_save} = $cf::RUNTIME; 2274 $self->{last_save} = $cf::RUNTIME;
2227 2275
2228 return unless $self->dirty; 2276 return unless $self->dirty;
2229 2277
2249 } else { 2297 } else {
2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2298 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2251 } 2299 }
2252} 2300}
2253 2301
2302sub save {
2303 my ($self) = @_;
2304
2305 my $lock = cf::lock_acquire "map_data:$self->{path}";
2306
2307 $self->_save;
2308}
2309
2254sub swap_out { 2310sub swap_out {
2255 my ($self) = @_; 2311 my ($self) = @_;
2256 2312
2257 # save first because save cedes
2258 $self->save;
2259
2260 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261 2314
2262 return if $self->players;
2263 return if $self->in_memory != cf::MAP_ACTIVE; 2315 return if $self->in_memory != cf::MAP_ACTIVE;
2264 return if $self->{deny_save}; 2316 return if $self->{deny_save};
2317 return if $self->players;
2265 2318
2319 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP;
2266 $self->in_memory (cf::MAP_SWAPPED); 2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # then atomically save
2325 $self->_save;
2326
2327 # then free the map
2328 $self->clear;
2329}
2330
2331sub reset_at {
2332 my ($self) = @_;
2333
2334 # TODO: safety, remove and allow resettable per-player maps
2335 return 1e99 if $self->{deny_reset};
2336
2337 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2338 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2339
2340 $time + $to
2341}
2342
2343sub should_reset {
2344 my ($self) = @_;
2345
2346 $self->reset_at <= $cf::RUNTIME
2347}
2348
2349sub reset {
2350 my ($self) = @_;
2351
2352 my $lock = cf::lock_acquire "map_data:$self->{path}";
2353
2354 return if $self->players;
2355
2356 cf::trace "resetting map ", $self->path, "\n";
2357
2358 $self->in_memory (cf::MAP_SWAPPED);
2359
2360 # need to save uniques path
2361 unless ($self->{deny_save}) {
2362 my $uniq = $self->uniq_path; utf8::encode $uniq;
2363
2364 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2365 if $uniq;
2366 }
2367
2368 delete $cf::MAP{$self->path};
2267 2369
2268 $self->deactivate; 2370 $self->deactivate;
2269 $_->clear_links_to ($self) for values %cf::MAP; 2371 $_->clear_links_to ($self) for values %cf::MAP;
2270 $self->clear; 2372 $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 2373
2316 $self->unlink_save; 2374 $self->unlink_save;
2317 $self->destroy; 2375 $self->destroy;
2318} 2376}
2319 2377
2327 2385
2328 delete $cf::MAP{$self->path}; 2386 delete $cf::MAP{$self->path};
2329 2387
2330 $self->unlink_save; 2388 $self->unlink_save;
2331 2389
2332 bless $self, "cf::map"; 2390 bless $self, "cf::map::wrap";
2333 delete $self->{deny_reset}; 2391 delete $self->{deny_reset};
2334 $self->{deny_save} = 1; 2392 $self->{deny_save} = 1;
2335 $self->reset_timeout (1); 2393 $self->reset_timeout (1);
2336 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2394 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2337 2395
2394 : normalise $_ 2452 : normalise $_
2395 } @{ aio_readdir $UNIQUEDIR or [] } 2453 } @{ aio_readdir $UNIQUEDIR or [] }
2396 ] 2454 ]
2397} 2455}
2398 2456
2457=item cf::map::static_maps
2458
2459Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2460file in the shared directory excluding F</styles> and F</editor>). May
2461block.
2462
2463=cut
2464
2465sub static_maps() {
2466 my @dirs = "";
2467 my @maps;
2468
2469 while (@dirs) {
2470 my $dir = shift @dirs;
2471
2472 next if $dir eq "/styles" || $dir eq "/editor";
2473
2474 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2475 or return;
2476
2477 for (@$files) {
2478 s/\.map$// or next;
2479 utf8::decode $_;
2480 push @maps, "$dir/$_";
2481 }
2482
2483 push @dirs, map "$dir/$_", @$dirs;
2484 }
2485
2486 \@maps
2487}
2488
2399=back 2489=back
2400 2490
2401=head3 cf::object 2491=head3 cf::object
2402 2492
2403=cut 2493=cut
2468 2558
2469our $SAY_CHANNEL = { 2559our $SAY_CHANNEL = {
2470 id => "say", 2560 id => "say",
2471 title => "Map", 2561 title => "Map",
2472 reply => "say ", 2562 reply => "say ",
2473 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2563 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2474}; 2564};
2475 2565
2476our $CHAT_CHANNEL = { 2566our $CHAT_CHANNEL = {
2477 id => "chat", 2567 id => "chat",
2478 title => "Chat", 2568 title => "Chat",
2533 2623
2534=item $player_object->enter_link 2624=item $player_object->enter_link
2535 2625
2536Freezes the player and moves him/her to a special map (C<{link}>). 2626Freezes the player and moves him/her to a special map (C<{link}>).
2537 2627
2538The player should be reasonably safe there for short amounts of time. You 2628The player should be reasonably safe there for short amounts of time (e.g.
2539I<MUST> call C<leave_link> as soon as possible, though. 2629for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2630though, as the player cannot control the character while it is on the link
2631map.
2540 2632
2541Will never block. 2633Will never block.
2542 2634
2543=item $player_object->leave_link ($map, $x, $y) 2635=item $player_object->leave_link ($map, $x, $y)
2544 2636
2564sub cf::object::player::enter_link { 2656sub cf::object::player::enter_link {
2565 my ($self) = @_; 2657 my ($self) = @_;
2566 2658
2567 $self->deactivate_recursive; 2659 $self->deactivate_recursive;
2568 2660
2661 ++$self->{_link_recursion};
2662
2569 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2663 return if UNIVERSAL::isa $self->map, "ext::map_link";
2570 2664
2571 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2665 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2572 if $self->map && $self->map->{path} ne "{link}"; 2666 if $self->map && $self->map->{path} ne "{link}";
2573 2667
2574 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2668 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2575} 2669}
2576 2670
2577sub cf::object::player::leave_link { 2671sub cf::object::player::leave_link {
2578 my ($self, $map, $x, $y) = @_; 2672 my ($self, $map, $x, $y) = @_;
2579 2673
2596 ($x, $y) = (-1, -1) 2690 ($x, $y) = (-1, -1)
2597 unless (defined $x) && (defined $y); 2691 unless (defined $x) && (defined $y);
2598 2692
2599 # use -1 or undef as default coordinates, not 0, 0 2693 # use -1 or undef as default coordinates, not 0, 0
2600 ($x, $y) = ($map->enter_x, $map->enter_y) 2694 ($x, $y) = ($map->enter_x, $map->enter_y)
2601 if $x <=0 && $y <= 0; 2695 if $x <= 0 && $y <= 0;
2602 2696
2603 $map->load; 2697 $map->load;
2604 $map->load_neighbours; 2698 $map->load_neighbours;
2605 2699
2606 return unless $self->contr->active; 2700 return unless $self->contr->active;
2607 $self->activate_recursive;
2608 2701
2609 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2610 $self->enter_map ($map, $x, $y); 2703 if ($self->enter_map ($map, $x, $y)) {
2611} 2704 # entering was successful
2705 delete $self->{_link_recursion};
2706 # only activate afterwards, to support waiting in hooks
2707 $self->activate_recursive;
2708 }
2612 2709
2710}
2711
2613=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2712=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2614 2713
2615Moves the player to the given map-path and coordinates by first freezing 2714Moves the player to the given map-path and coordinates by first freezing
2616her, loading and preparing them map, calling the provided $check callback 2715her, loading and preparing them map, calling the provided $check callback
2617that has to return the map if sucecssful, and then unfreezes the player on 2716that 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 2717the new (success) or old (failed) map position. In either case, $done will
2619be called at the end of this process. 2718be called at the end of this process.
2620 2719
2720Note that $check will be called with a potentially non-loaded map, so if
2721it needs a loaded map it has to call C<< ->load >>.
2722
2621=cut 2723=cut
2622 2724
2623our $GOTOGEN; 2725our $GOTOGEN;
2624 2726
2625sub cf::object::player::goto { 2727sub cf::object::player::goto {
2626 my ($self, $path, $x, $y, $check, $done) = @_; 2728 my ($self, $path, $x, $y, $check, $done) = @_;
2729
2730 if ($self->{_link_recursion} >= $MAX_LINKS) {
2731 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2732 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2733 ($path, $x, $y) = @$EMERGENCY_POSITION;
2734 }
2627 2735
2628 # do generation counting so two concurrent goto's will be executed in-order 2736 # do generation counting so two concurrent goto's will be executed in-order
2629 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2737 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2630 2738
2631 $self->enter_link; 2739 $self->enter_link;
2655 my $map = eval { 2763 my $map = eval {
2656 my $map = defined $path ? cf::map::find $path : undef; 2764 my $map = defined $path ? cf::map::find $path : undef;
2657 2765
2658 if ($map) { 2766 if ($map) {
2659 $map = $map->customise_for ($self); 2767 $map = $map->customise_for ($self);
2660 $map = $check->($map) if $check && $map; 2768 $map = $check->($map, $x, $y, $self) if $check && $map;
2661 } else { 2769 } else {
2662 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2770 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2663 } 2771 }
2664 2772
2665 $map 2773 $map
2673 if ($gen == $self->{_goto_generation}) { 2781 if ($gen == $self->{_goto_generation}) {
2674 delete $self->{_goto_generation}; 2782 delete $self->{_goto_generation};
2675 $self->leave_link ($map, $x, $y); 2783 $self->leave_link ($map, $x, $y);
2676 } 2784 }
2677 2785
2678 $done->() if $done; 2786 $done->($self) if $done;
2679 })->prio (1); 2787 })->prio (1);
2680} 2788}
2681 2789
2682=item $player_object->enter_exit ($exit_object) 2790=item $player_object->enter_exit ($exit_object)
2683 2791
2771 $self->contr->savebed ($map, $x, $y) 2879 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED); 2880 if $exit->flag (cf::FLAG_DAMNED);
2773 2881
2774 1 2882 1
2775 }) { 2883 }) {
2776 $self->message ("Something went wrong deep within the crossfire server. " 2884 $self->message ("Something went wrong deep within the deliantra server. "
2777 . "I'll try to bring you back to the map you were before. " 2885 . "I'll try to bring you back to the map you were before. "
2778 . "Please report this to the dungeon master!", 2886 . "Please report this to the dungeon master!",
2779 cf::NDI_UNIQUE | cf::NDI_RED); 2887 cf::NDI_UNIQUE | cf::NDI_RED);
2780 2888
2781 warn "ERROR in enter_exit: $@"; 2889 error "ERROR in enter_exit: $@";
2782 $self->leave_link; 2890 $self->leave_link;
2783 } 2891 }
2784 })->prio (1); 2892 })->prio (1);
2785} 2893}
2786 2894
2798sub cf::client::send_drawinfo { 2906sub cf::client::send_drawinfo {
2799 my ($self, $text, $flags) = @_; 2907 my ($self, $text, $flags) = @_;
2800 2908
2801 utf8::encode $text; 2909 utf8::encode $text;
2802 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2910 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2911}
2912
2913=item $client->send_big_packet ($pkt)
2914
2915Like C<send_packet>, but tries to compress large packets, and fragments
2916them as required.
2917
2918=cut
2919
2920our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2921
2922sub cf::client::send_big_packet {
2923 my ($self, $pkt) = @_;
2924
2925 # try lzf for large packets
2926 $pkt = "lzf " . Compress::LZF::compress $pkt
2927 if 1024 <= length $pkt and $self->{can_lzf};
2928
2929 # split very large packets
2930 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2931 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2932 $pkt = "frag";
2933 }
2934
2935 $self->send_packet ($pkt);
2803} 2936}
2804 2937
2805=item $client->send_msg ($channel, $msg, $color, [extra...]) 2938=item $client->send_msg ($channel, $msg, $color, [extra...])
2806 2939
2807Send a drawinfo or msg packet to the client, formatting the msg for the 2940Send a drawinfo or msg packet to the client, formatting the msg for the
2811 2944
2812=cut 2945=cut
2813 2946
2814# non-persistent channels (usually the info channel) 2947# non-persistent channels (usually the info channel)
2815our %CHANNEL = ( 2948our %CHANNEL = (
2949 "c/motd" => {
2950 id => "infobox",
2951 title => "MOTD",
2952 reply => undef,
2953 tooltip => "The message of the day",
2954 },
2816 "c/identify" => { 2955 "c/identify" => {
2817 id => "infobox", 2956 id => "infobox",
2818 title => "Identify", 2957 title => "Identify",
2819 reply => undef, 2958 reply => undef,
2820 tooltip => "Items recently identified", 2959 tooltip => "Items recently identified",
2822 "c/examine" => { 2961 "c/examine" => {
2823 id => "infobox", 2962 id => "infobox",
2824 title => "Examine", 2963 title => "Examine",
2825 reply => undef, 2964 reply => undef,
2826 tooltip => "Signs and other items you examined", 2965 tooltip => "Signs and other items you examined",
2966 },
2967 "c/shopinfo" => {
2968 id => "infobox",
2969 title => "Shop Info",
2970 reply => undef,
2971 tooltip => "What your bargaining skill tells you about the shop",
2827 }, 2972 },
2828 "c/book" => { 2973 "c/book" => {
2829 id => "infobox", 2974 id => "infobox",
2830 title => "Book", 2975 title => "Book",
2831 reply => undef, 2976 reply => undef,
2847 id => "infobox", 2992 id => "infobox",
2848 title => "Body Parts", 2993 title => "Body Parts",
2849 reply => undef, 2994 reply => undef,
2850 tooltip => "Shows which body parts you posess and are available", 2995 tooltip => "Shows which body parts you posess and are available",
2851 }, 2996 },
2997 "c/statistics" => {
2998 id => "infobox",
2999 title => "Statistics",
3000 reply => undef,
3001 tooltip => "Shows your primary statistics",
3002 },
3003 "c/skills" => {
3004 id => "infobox",
3005 title => "Skills",
3006 reply => undef,
3007 tooltip => "Shows your experience per skill and item power",
3008 },
3009 "c/shopitems" => {
3010 id => "infobox",
3011 title => "Shop Items",
3012 reply => undef,
3013 tooltip => "Shows the items currently for sale in this shop",
3014 },
3015 "c/resistances" => {
3016 id => "infobox",
3017 title => "Resistances",
3018 reply => undef,
3019 tooltip => "Shows your resistances",
3020 },
3021 "c/pets" => {
3022 id => "infobox",
3023 title => "Pets",
3024 reply => undef,
3025 tooltip => "Shows information abotu your pets/a specific pet",
3026 },
3027 "c/perceiveself" => {
3028 id => "infobox",
3029 title => "Perceive Self",
3030 reply => undef,
3031 tooltip => "You gained detailed knowledge about yourself",
3032 },
2852 "c/uptime" => { 3033 "c/uptime" => {
2853 id => "infobox", 3034 id => "infobox",
2854 title => "Uptime", 3035 title => "Uptime",
2855 reply => undef, 3036 reply => undef,
2856 tooltip => "How long the server has been running since last restart", 3037 tooltip => "How long the server has been running since last restart",
2865 id => "party", 3046 id => "party",
2866 title => "Party", 3047 title => "Party",
2867 reply => "gsay ", 3048 reply => "gsay ",
2868 tooltip => "Messages and chat related to your party", 3049 tooltip => "Messages and chat related to your party",
2869 }, 3050 },
3051 "c/death" => {
3052 id => "death",
3053 title => "Death",
3054 reply => undef,
3055 tooltip => "Reason for and more info about your most recent death",
3056 },
3057 "c/say" => $SAY_CHANNEL,
3058 "c/chat" => $CHAT_CHANNEL,
2870); 3059);
2871 3060
2872sub cf::client::send_msg { 3061sub cf::client::send_msg {
2873 my ($self, $channel, $msg, $color, @extra) = @_; 3062 my ($self, $channel, $msg, $color, @extra) = @_;
2874 3063
2875 $msg = $self->pl->expand_cfpod ($msg); 3064 $msg = $self->pl->expand_cfpod ($msg)
3065 unless $color & cf::NDI_VERBATIM;
2876 3066
2877 $color &= cf::NDI_CLIENT_MASK; # just in case... 3067 $color &= cf::NDI_CLIENT_MASK; # just in case...
2878 3068
2879 # check predefined channels, for the benefit of C 3069 # check predefined channels, for the benefit of C
2880 if ($CHANNEL{$channel}) { 3070 if ($CHANNEL{$channel}) {
2881 $channel = $CHANNEL{$channel}; 3071 $channel = $CHANNEL{$channel};
2882 3072
2883 $self->ext_msg (channel_info => $channel) 3073 $self->ext_msg (channel_info => $channel);
2884 if $self->can_msg;
2885
2886 $channel = $channel->{id}; 3074 $channel = $channel->{id};
2887 3075
2888 } elsif (ref $channel) { 3076 } elsif (ref $channel) {
2889 # send meta info to client, if not yet sent 3077 # send meta info to client, if not yet sent
2890 unless (exists $self->{channel}{$channel->{id}}) { 3078 unless (exists $self->{channel}{$channel->{id}}) {
2891 $self->{channel}{$channel->{id}} = $channel; 3079 $self->{channel}{$channel->{id}} = $channel;
2892 $self->ext_msg (channel_info => $channel) 3080 $self->ext_msg (channel_info => $channel);
2893 if $self->can_msg;
2894 } 3081 }
2895 3082
2896 $channel = $channel->{id}; 3083 $channel = $channel->{id};
2897 } 3084 }
2898 3085
2899 return unless @extra || length $msg; 3086 return unless @extra || length $msg;
2900 3087
2901 if ($self->can_msg) {
2902 # default colour, mask it out 3088 # default colour, mask it out
2903 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3089 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2904 if $color & cf::NDI_DEF; 3090 if $color & cf::NDI_DEF;
2905 3091
2906 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3092 my $pkt = "msg "
3093 . $self->{json_coder}->encode (
2907 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3094 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2908 } else { 3095 );
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 3096
2920 $color &= cf::NDI_COLOR_MASK; 3097 $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} 3098}
2934 3099
2935=item $client->ext_msg ($type, @msg) 3100=item $client->ext_msg ($type, @msg)
2936 3101
2937Sends an ext event to the client. 3102Sends an ext event to the client.
2940 3105
2941sub cf::client::ext_msg($$@) { 3106sub cf::client::ext_msg($$@) {
2942 my ($self, $type, @msg) = @_; 3107 my ($self, $type, @msg) = @_;
2943 3108
2944 if ($self->extcmd == 2) { 3109 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3110 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2946 } elsif ($self->extcmd == 1) { # TODO: remove 3111 } elsif ($self->extcmd == 1) { # TODO: remove
2947 push @msg, msgtype => "event_$type"; 3112 push @msg, msgtype => "event_$type";
2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3113 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 } 3114 }
2950} 3115}
2951 3116
2952=item $client->ext_reply ($msgid, @msg) 3117=item $client->ext_reply ($msgid, @msg)
2953 3118
2957 3122
2958sub cf::client::ext_reply($$@) { 3123sub cf::client::ext_reply($$@) {
2959 my ($self, $id, @msg) = @_; 3124 my ($self, $id, @msg) = @_;
2960 3125
2961 if ($self->extcmd == 2) { 3126 if ($self->extcmd == 2) {
2962 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2963 } elsif ($self->extcmd == 1) { 3128 } elsif ($self->extcmd == 1) {
2964 #TODO: version 1, remove 3129 #TODO: version 1, remove
2965 unshift @msg, msgtype => "reply", msgid => $id; 3130 unshift @msg, msgtype => "reply", msgid => $id;
2966 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2967 } 3132 }
2968} 3133}
2969 3134
2970=item $success = $client->query ($flags, "text", \&cb) 3135=item $success = $client->query ($flags, "text", \&cb)
2971 3136
3042 3207
3043 $ns->ext_reply ($reply, @reply) 3208 $ns->ext_reply ($reply, @reply)
3044 if $reply; 3209 if $reply;
3045 3210
3046 } else { 3211 } else {
3047 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3212 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3048 } 3213 }
3049 3214
3050 cf::override; 3215 cf::override;
3051 }, 3216 },
3052); 3217);
3072 3237
3073 $coro 3238 $coro
3074} 3239}
3075 3240
3076cf::client->attach ( 3241cf::client->attach (
3077 on_destroy => sub { 3242 on_client_destroy => sub {
3078 my ($ns) = @_; 3243 my ($ns) = @_;
3079 3244
3080 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3245 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3081 }, 3246 },
3082); 3247);
3098our $safe_hole = new Safe::Hole; 3263our $safe_hole = new Safe::Hole;
3099 3264
3100$SIG{FPE} = 'IGNORE'; 3265$SIG{FPE} = 'IGNORE';
3101 3266
3102$safe->permit_only (Opcode::opset qw( 3267$safe->permit_only (Opcode::opset qw(
3103 :base_core :base_mem :base_orig :base_math 3268 :base_core :base_mem :base_orig :base_math :base_loop
3104 grepstart grepwhile mapstart mapwhile 3269 grepstart grepwhile mapstart mapwhile
3105 sort time 3270 sort time
3106)); 3271));
3107 3272
3108# here we export the classes and methods available to script code 3273# here we export the classes and methods available to script code
3112The following functions and methods are available within a safe environment: 3277The following functions and methods are available within a safe environment:
3113 3278
3114 cf::object 3279 cf::object
3115 contr pay_amount pay_player map x y force_find force_add destroy 3280 contr pay_amount pay_player map x y force_find force_add destroy
3116 insert remove name archname title slaying race decrease split 3281 insert remove name archname title slaying race decrease split
3282 value
3117 3283
3118 cf::object::player 3284 cf::object::player
3119 player 3285 player
3120 3286
3121 cf::player 3287 cf::player
3127=cut 3293=cut
3128 3294
3129for ( 3295for (
3130 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3296 ["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 3297 insert remove inv nrof name archname title slaying race
3132 decrease split destroy)], 3298 decrease split destroy change_exp value msg lore send_msg)],
3133 ["cf::object::player" => qw(player)], 3299 ["cf::object::player" => qw(player)],
3134 ["cf::player" => qw(peaceful)], 3300 ["cf::player" => qw(peaceful send_msg)],
3135 ["cf::map" => qw(trigger)], 3301 ["cf::map" => qw(trigger)],
3136) { 3302) {
3137 no strict 'refs';
3138 my ($pkg, @funs) = @$_; 3303 my ($pkg, @funs) = @$_;
3139 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3304 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3140 for @funs; 3305 for @funs;
3141} 3306}
3142 3307
3157 3322
3158 my $qcode = $code; 3323 my $qcode = $code;
3159 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3324 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3160 $qcode =~ s/\n/\\n/g; 3325 $qcode =~ s/\n/\\n/g;
3161 3326
3327 %vars = (_dummy => 0) unless %vars;
3328
3329 my @res;
3162 local $_; 3330 local $_;
3163 local @safe::cf::_safe_eval_args = values %vars;
3164 3331
3165 my $eval = 3332 my $eval =
3166 "do {\n" 3333 "do {\n"
3167 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3334 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3168 . "#line 0 \"{$qcode}\"\n" 3335 . "#line 0 \"{$qcode}\"\n"
3169 . $code 3336 . $code
3170 . "\n}" 3337 . "\n}"
3171 ; 3338 ;
3172 3339
3340 if ($CFG{safe_eval}) {
3173 sub_generation_inc; 3341 sub_generation_inc;
3342 local @safe::cf::_safe_eval_args = values %vars;
3174 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3343 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3175 sub_generation_inc; 3344 sub_generation_inc;
3345 } else {
3346 local @cf::_safe_eval_args = values %vars;
3347 @res = wantarray ? eval eval : scalar eval $eval;
3348 }
3176 3349
3177 if ($@) { 3350 if ($@) {
3178 warn "$@"; 3351 warn "$@",
3179 warn "while executing safe code '$code'\n"; 3352 "while executing safe code '$code'\n",
3180 warn "with arguments " . (join " ", %vars) . "\n"; 3353 "with arguments " . (join " ", %vars) . "\n";
3181 } 3354 }
3182 3355
3183 wantarray ? @res : $res[0] 3356 wantarray ? @res : $res[0]
3184} 3357}
3185 3358
3199=cut 3372=cut
3200 3373
3201sub register_script_function { 3374sub register_script_function {
3202 my ($fun, $cb) = @_; 3375 my ($fun, $cb) = @_;
3203 3376
3204 no strict 'refs'; 3377 $fun = "safe::$fun" if $CFG{safe_eval};
3205 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3378 *$fun = $safe_hole->wrap ($cb);
3206} 3379}
3207 3380
3208=back 3381=back
3209 3382
3210=cut 3383=cut
3219 # for this (global event?) 3392 # for this (global event?)
3220 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3221 3394
3222 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3395 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3223 3396
3224 warn "loading facedata from $path\n"; 3397 trace "loading facedata from $path\n";
3225 3398
3226 my $facedata;
3227 0 < aio_load $path, $facedata 3399 0 < aio_load $path, my $facedata
3228 or die "$path: $!"; 3400 or die "$path: $!";
3229 3401
3230 $facedata = Coro::Storable::thaw $facedata; 3402 $facedata = Coro::Storable::thaw $facedata;
3231 3403
3232 $facedata->{version} == 2 3404 $facedata->{version} == 2
3233 or cf::cleanup "$path: version mismatch, cannot proceed."; 3405 or cf::cleanup "$path: version mismatch, cannot proceed.";
3234 3406
3235 # patch in the exptable 3407 # patch in the exptable
3408 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3236 $facedata->{resource}{"res/exp_table"} = { 3409 $facedata->{resource}{"res/exp_table"} = {
3237 type => FT_RSRC, 3410 type => FT_RSRC,
3238 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3411 data => $exp_table,
3412 hash => (Digest::MD5::md5 $exp_table),
3239 }; 3413 };
3240 cf::cede_to_tick; 3414 cf::cede_to_tick;
3241 3415
3242 { 3416 {
3243 my $faces = $facedata->{faceinfo}; 3417 my $faces = $facedata->{faceinfo};
3245 while (my ($face, $info) = each %$faces) { 3419 while (my ($face, $info) = each %$faces) {
3246 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3420 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3247 3421
3248 cf::face::set_visibility $idx, $info->{visibility}; 3422 cf::face::set_visibility $idx, $info->{visibility};
3249 cf::face::set_magicmap $idx, $info->{magicmap}; 3423 cf::face::set_magicmap $idx, $info->{magicmap};
3250 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3424 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3251 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3425 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3252 3426
3253 cf::cede_to_tick; 3427 cf::cede_to_tick;
3254 } 3428 }
3255 3429
3256 while (my ($face, $info) = each %$faces) { 3430 while (my ($face, $info) = each %$faces) {
3261 3435
3262 if (my $smooth = cf::face::find $info->{smooth}) { 3436 if (my $smooth = cf::face::find $info->{smooth}) {
3263 cf::face::set_smooth $idx, $smooth; 3437 cf::face::set_smooth $idx, $smooth;
3264 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3438 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3265 } else { 3439 } else {
3266 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3440 error "smooth face '$info->{smooth}' not found for face '$face'";
3267 } 3441 }
3268 3442
3269 cf::cede_to_tick; 3443 cf::cede_to_tick;
3270 } 3444 }
3271 } 3445 }
3280 3454
3281 cf::anim::invalidate_all; # d'oh 3455 cf::anim::invalidate_all; # d'oh
3282 } 3456 }
3283 3457
3284 { 3458 {
3285 # TODO: for gcfclient pleasure, we should give resources
3286 # that gcfclient doesn't grok a >10000 face index.
3287 my $res = $facedata->{resource}; 3459 my $res = $facedata->{resource};
3288 3460
3289 while (my ($name, $info) = each %$res) { 3461 while (my ($name, $info) = each %$res) {
3290 if (defined $info->{type}) { 3462 if (defined $info->{type}) {
3291 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3463 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3292 my $data;
3293 3464
3294 if ($info->{type} & 1) { 3465 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}; 3466 cf::face::set_type $idx, $info->{type};
3309 } else { 3467 } else {
3310 $RESOURCE{$name} = $info; 3468 $RESOURCE{$name} = $info; # unused
3311 } 3469 }
3312 3470
3313 cf::cede_to_tick; 3471 cf::cede_to_tick;
3314 } 3472 }
3315 } 3473 }
3316 3474
3317 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3475 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3318 3476
3319 1 3477 1
3320} 3478}
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 3479
3342register_exticmd fx_want => sub { 3480register_exticmd fx_want => sub {
3343 my ($ns, $want) = @_; 3481 my ($ns, $want) = @_;
3344 3482
3345 while (my ($k, $v) = each %$want) { 3483 while (my ($k, $v) = each %$want) {
3384sub reload_treasures { 3522sub reload_treasures {
3385 load_resource_file "$DATADIR/treasures" 3523 load_resource_file "$DATADIR/treasures"
3386 or die "unable to load treasurelists\n"; 3524 or die "unable to load treasurelists\n";
3387} 3525}
3388 3526
3527sub reload_sound {
3528 trace "loading sound config from $DATADIR/sound\n";
3529
3530 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3531 or die "$DATADIR/sound $!";
3532
3533 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3534
3535 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536 my $sound = $soundconf->{compat}[$_]
3537 or next;
3538
3539 my $face = cf::face::find "sound/$sound->[1]";
3540 cf::sound::set $sound->[0] => $face;
3541 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3542 }
3543
3544 while (my ($k, $v) = each %{$soundconf->{event}}) {
3545 my $face = cf::face::find "sound/$v";
3546 cf::sound::set $k => $face;
3547 }
3548}
3549
3389sub reload_resources { 3550sub reload_resources {
3390 warn "reloading resource files...\n"; 3551 trace "reloading resource files...\n";
3391 3552
3553 reload_exp_table;
3554 reload_materials;
3392 reload_facedata; 3555 reload_facedata;
3556 reload_sound;
3393 reload_archetypes; 3557 reload_archetypes;
3394 reload_regions; 3558 reload_regions;
3395 reload_treasures; 3559 reload_treasures;
3396 3560
3397 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3398}
3399
3400sub init {
3401 my $guard = freeze_mainloop;
3402
3403 reload_resources;
3404} 3562}
3405 3563
3406sub reload_config { 3564sub reload_config {
3407 open my $fh, "<:utf8", "$CONFDIR/config" 3565 trace "reloading config file...\n";
3408 or return;
3409 3566
3410 local $/; 3567 0 < aio_load "$CONFDIR/config", my $config
3411 *CFG = YAML::Load <$fh>; 3568 or die "$CONFDIR/config: $!";
3412 3569
3570 utf8::decode $config;
3571 *CFG = yaml_load $config;
3572
3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3414 3574
3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3575 $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}; 3576 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3417 3577
3418 if (exists $CFG{mlockall}) { 3578 if (exists $CFG{mlockall}) {
3422 }; 3582 };
3423 warn $@ if $@; 3583 warn $@ if $@;
3424 } 3584 }
3425} 3585}
3426 3586
3587sub pidfile() {
3588 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3589 or die "$PIDFILE: $!";
3590 flock $fh, &Fcntl::LOCK_EX
3591 or die "$PIDFILE: flock: $!";
3592 $fh
3593}
3594
3595# make sure only one server instance is running at any one time
3596sub atomic {
3597 my $fh = pidfile;
3598
3599 my $pid = <$fh>;
3600 kill 9, $pid if $pid > 0;
3601
3602 seek $fh, 0, 0;
3603 print $fh $$;
3604}
3605
3606sub main_loop {
3607 trace "EV::loop starting\n";
3608 if (1) {
3609 EV::loop;
3610 }
3611 trace "EV::loop returned\n";
3612 goto &main_loop unless $REALLY_UNLOOP;
3613}
3614
3427sub main { 3615sub main {
3616 cf::init_globals; # initialise logging
3617
3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3619 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3621 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3622
3623 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3624
3428 # we must not ever block the main coroutine 3625 # we must not ever block the main coroutine
3429 local $Coro::idle = sub { 3626 local $Coro::idle = sub {
3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3627 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3431 (async { 3628 (async {
3432 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3629 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT; 3630 EV::loop EV::LOOP_ONESHOT;
3434 })->prio (Coro::PRIO_MAX); 3631 })->prio (Coro::PRIO_MAX);
3435 }; 3632 };
3436 3633
3437 { 3634 evthread_start IO::AIO::poll_fileno;
3438 my $guard = freeze_mainloop; 3635
3636 cf::sync_job {
3637 cf::incloader::init ();
3638
3639 cf::init_anim;
3640 cf::init_attackmess;
3641 cf::init_dynamic;
3642
3643 cf::load_settings;
3644
3645 reload_resources;
3439 reload_config; 3646 reload_config;
3440 db_init; 3647 db_init;
3648
3649 cf::init_uuid;
3650 cf::init_signals;
3651 cf::init_skills;
3652
3653 cf::init_beforeplay;
3654
3655 atomic;
3656
3441 load_extensions; 3657 load_extensions;
3442 3658
3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3659 utime time, time, $RUNTIMEFILE;
3660
3661 # no (long-running) fork's whatsoever before this point(!)
3662 use POSIX ();
3663 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3664
3665 (pop @POST_INIT)->(0) while @POST_INIT;
3444 } 3666 };
3445 3667
3446 EV::loop; 3668 cf::object::thawer::errors_are_fatal 0;
3669 info "parse errors in files are no longer fatal from this point on.\n";
3670
3671 my $free_main; $free_main = EV::idle sub {
3672 undef $free_main;
3673 undef &main; # free gobs of memory :)
3674 };
3675
3676 goto &main_loop;
3447} 3677}
3448 3678
3449############################################################################# 3679#############################################################################
3450# initialisation and cleanup 3680# initialisation and cleanup
3451 3681
3452# install some emergency cleanup handlers 3682# install some emergency cleanup handlers
3453BEGIN { 3683BEGIN {
3454 our %SIGWATCHER = (); 3684 our %SIGWATCHER = ();
3455 for my $signal (qw(INT HUP TERM)) { 3685 for my $signal (qw(INT HUP TERM)) {
3456 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3686 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3457 cf::cleanup "SIG$signal"; 3687 cf::cleanup "SIG$signal";
3458 }; 3688 };
3459 } 3689 }
3460} 3690}
3461 3691
3462sub write_runtime_sync { 3692sub write_runtime_sync {
3463 my $runtime = "$LOCALDIR/runtime"; 3693 my $t0 = AE::time;
3464 3694
3465 # first touch the runtime file to show we are still running: 3695 # first touch the runtime file to show we are still running:
3466 # the fsync below can take a very very long time. 3696 # the fsync below can take a very very long time.
3467 3697
3468 IO::AIO::aio_utime $runtime, undef, undef; 3698 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3469 3699
3470 my $guard = cf::lock_acquire "write_runtime"; 3700 my $guard = cf::lock_acquire "write_runtime";
3471 3701
3472 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3702 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3473 or return; 3703 or return;
3474 3704
3475 my $value = $cf::RUNTIME + 90 + 10; 3705 my $value = $cf::RUNTIME + 90 + 10;
3476 # 10 is the runtime save interval, for a monotonic clock 3706 # 10 is the runtime save interval, for a monotonic clock
3477 # 60 allows for the watchdog to kill the server. 3707 # 60 allows for the watchdog to kill the server.
3487 aio_utime $fh, undef, undef; 3717 aio_utime $fh, undef, undef;
3488 3718
3489 close $fh 3719 close $fh
3490 or return; 3720 or return;
3491 3721
3492 aio_rename "$runtime~", $runtime 3722 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3493 and return; 3723 and return;
3494 3724
3495 warn "runtime file written.\n"; 3725 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3496 3726
3497 1 3727 1
3498} 3728}
3499 3729
3500our $uuid_lock; 3730our $uuid_lock;
3509 my $uuid = "$LOCALDIR/uuid"; 3739 my $uuid = "$LOCALDIR/uuid";
3510 3740
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3741 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return; 3742 or return;
3513 3743
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3744 my $value = uuid_seq uuid_cur;
3745
3746 unless ($value) {
3747 info "cowardly refusing to write zero uuid value!\n";
3748 return;
3749 }
3750
3751 my $value = uuid_str $value + $uuid_skip;
3515 $uuid_skip = 0; 3752 $uuid_skip = 0;
3516 3753
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3754 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return; 3755 and return;
3519 3756
3525 or return; 3762 or return;
3526 3763
3527 aio_rename "$uuid~", $uuid 3764 aio_rename "$uuid~", $uuid
3528 and return; 3765 and return;
3529 3766
3530 warn "uuid file written ($value).\n"; 3767 trace "uuid file written ($value).\n";
3531 3768
3532 1 3769 1
3533 3770
3534} 3771}
3535 3772
3541} 3778}
3542 3779
3543sub emergency_save() { 3780sub emergency_save() {
3544 my $freeze_guard = cf::freeze_mainloop; 3781 my $freeze_guard = cf::freeze_mainloop;
3545 3782
3546 warn "enter emergency perl save\n"; 3783 info "emergency_perl_save: enter\n";
3784
3785 # this is a trade-off: we want to be very quick here, so
3786 # save all maps without fsync, and later call a global sync
3787 # (which in turn might be very very slow)
3788 local $USE_FSYNC = 0;
3547 3789
3548 cf::sync_job { 3790 cf::sync_job {
3791 cf::write_runtime_sync; # external watchdog should not bark
3792
3549 # use a peculiar iteration method to avoid tripping on perl 3793 # use a peculiar iteration method to avoid tripping on perl
3550 # refcount bugs in for. also avoids problems with players 3794 # refcount bugs in for. also avoids problems with players
3551 # and maps saved/destroyed asynchronously. 3795 # and maps saved/destroyed asynchronously.
3552 warn "begin emergency player save\n"; 3796 info "emergency_perl_save: begin player save\n";
3553 for my $login (keys %cf::PLAYER) { 3797 for my $login (keys %cf::PLAYER) {
3554 my $pl = $cf::PLAYER{$login} or next; 3798 my $pl = $cf::PLAYER{$login} or next;
3555 $pl->valid or next; 3799 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3800 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3557 $pl->save; 3801 $pl->save;
3558 } 3802 }
3559 warn "end emergency player save\n"; 3803 info "emergency_perl_save: end player save\n";
3560 3804
3561 warn "begin emergency map save\n"; 3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3807 info "emergency_perl_save: begin map save\n";
3562 for my $path (keys %cf::MAP) { 3808 for my $path (keys %cf::MAP) {
3563 my $map = $cf::MAP{$path} or next; 3809 my $map = $cf::MAP{$path} or next;
3564 $map->valid or next; 3810 $map->valid or next;
3565 $map->save; 3811 $map->save;
3566 } 3812 }
3567 warn "end emergency map save\n"; 3813 info "emergency_perl_save: end map save\n";
3568 3814
3569 warn "begin emergency database checkpoint\n"; 3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 info "emergency_perl_save: begin database checkpoint\n";
3570 BDB::db_env_txn_checkpoint $DB_ENV; 3818 BDB::db_env_txn_checkpoint $DB_ENV;
3571 warn "end emergency database checkpoint\n"; 3819 info "emergency_perl_save: end database checkpoint\n";
3572 3820
3573 warn "begin write uuid\n"; 3821 info "emergency_perl_save: begin write uuid\n";
3574 write_uuid_sync 1; 3822 write_uuid_sync 1;
3575 warn "end write uuid\n"; 3823 info "emergency_perl_save: end write uuid\n";
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: syncing database to disk";
3828 BDB::db_env_txn_checkpoint $DB_ENV;
3829
3830 info "emergency_perl_save: starting sync\n";
3831 IO::AIO::aio_sync sub {
3832 info "emergency_perl_save: finished sync\n";
3833 };
3834
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3837 trace "emergency_perl_save: flushing outstanding aio requests";
3838 while (IO::AIO::nreqs || BDB::nreqs) {
3839 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3840 }
3841
3842 cf::write_runtime_sync; # external watchdog should not bark
3576 }; 3843 };
3577 3844
3578 warn "leave emergency perl save\n"; 3845 info "emergency_perl_save: leave\n";
3579} 3846}
3580 3847
3581sub post_cleanup { 3848sub post_cleanup {
3582 my ($make_core) = @_; 3849 my ($make_core) = @_;
3583 3850
3851 IO::AIO::flush;
3852
3584 warn Carp::longmess "post_cleanup backtrace" 3853 error Carp::longmess "post_cleanup backtrace"
3585 if $make_core; 3854 if $make_core;
3855
3856 my $fh = pidfile;
3857 unlink $PIDFILE if <$fh> == $$;
3858}
3859
3860# a safer delete_package, copied from Symbol
3861sub clear_package($) {
3862 my $pkg = shift;
3863
3864 # expand to full symbol table name if needed
3865 unless ($pkg =~ /^main::.*::$/) {
3866 $pkg = "main$pkg" if $pkg =~ /^::/;
3867 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3868 $pkg .= '::' unless $pkg =~ /::$/;
3869 }
3870
3871 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3872 my $stem_symtab = *{$stem}{HASH};
3873
3874 defined $stem_symtab and exists $stem_symtab->{$leaf}
3875 or return;
3876
3877 # clear all symbols
3878 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3879 for my $name (keys %$leaf_symtab) {
3880 _gv_clear *{"$pkg$name"};
3881# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3882 }
3586} 3883}
3587 3884
3588sub do_reload_perl() { 3885sub do_reload_perl() {
3589 # can/must only be called in main 3886 # can/must only be called in main
3590 if ($Coro::current != $Coro::main) { 3887 unless (in_main) {
3591 warn "can only reload from main coroutine"; 3888 error "can only reload from main coroutine";
3592 return; 3889 return;
3593 } 3890 }
3594 3891
3892 return if $RELOAD++;
3893
3894 my $t1 = AE::time;
3895
3896 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl";
3595 warn "reloading..."; 3898 info "reloading...";
3596 3899
3597 warn "entering sync_job"; 3900 trace "entering sync_job";
3598 3901
3599 cf::sync_job { 3902 cf::sync_job {
3600 cf::write_runtime_sync; # external watchdog should not bark
3601 cf::emergency_save; 3903 #cf::emergency_save;
3602 cf::write_runtime_sync; # external watchdog should not bark
3603 3904
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"; 3905 trace "cancelling all extension coros";
3621 $_->cancel for values %EXT_CORO; 3906 $_->cancel for values %EXT_CORO;
3622 %EXT_CORO = (); 3907 %EXT_CORO = ();
3623 3908
3624 warn "removing commands"; 3909 trace "removing commands";
3625 %COMMAND = (); 3910 %COMMAND = ();
3626 3911
3627 warn "removing ext/exti commands"; 3912 trace "removing ext/exti commands";
3628 %EXTCMD = (); 3913 %EXTCMD = ();
3629 %EXTICMD = (); 3914 %EXTICMD = ();
3630 3915
3631 warn "unloading/nuking all extensions"; 3916 trace "unloading/nuking all extensions";
3632 for my $pkg (@EXTS) { 3917 for my $pkg (@EXTS) {
3633 warn "... unloading $pkg"; 3918 trace "... unloading $pkg";
3634 3919
3635 if (my $cb = $pkg->can ("unload")) { 3920 if (my $cb = $pkg->can ("unload")) {
3636 eval { 3921 eval {
3637 $cb->($pkg); 3922 $cb->($pkg);
3638 1 3923 1
3639 } or warn "$pkg unloaded, but with errors: $@"; 3924 } or error "$pkg unloaded, but with errors: $@";
3925 }
3926
3927 trace "... clearing $pkg";
3928 clear_package $pkg;
3640 } 3929 }
3641 3930
3642 warn "... nuking $pkg";
3643 Symbol::delete_package $pkg;
3644 }
3645
3646 warn "unloading all perl modules loaded from $LIBDIR"; 3931 trace "unloading all perl modules loaded from $LIBDIR";
3647 while (my ($k, $v) = each %INC) { 3932 while (my ($k, $v) = each %INC) {
3648 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3649 3934
3650 warn "... unloading $k"; 3935 trace "... unloading $k";
3651 delete $INC{$k}; 3936 delete $INC{$k};
3652 3937
3653 $k =~ s/\.pm$//; 3938 $k =~ s/\.pm$//;
3654 $k =~ s/\//::/g; 3939 $k =~ s/\//::/g;
3655 3940
3656 if (my $cb = $k->can ("unload_module")) { 3941 if (my $cb = $k->can ("unload_module")) {
3657 $cb->(); 3942 $cb->();
3943 }
3944
3945 clear_package $k;
3658 } 3946 }
3659 3947
3660 Symbol::delete_package $k;
3661 }
3662
3663 warn "getting rid of safe::, as good as possible"; 3948 trace "getting rid of safe::, as good as possible";
3664 Symbol::delete_package "safe::$_" 3949 clear_package "safe::$_"
3665 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3950 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3666 3951
3667 warn "unloading cf.pm \"a bit\""; 3952 trace "unloading cf.pm \"a bit\"";
3668 delete $INC{"cf.pm"}; 3953 delete $INC{"cf.pm"};
3669 delete $INC{"cf/pod.pm"}; 3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3670 3955
3671 # don't, removes xs symbols, too, 3956 # don't, removes xs symbols, too,
3672 # and global variables created in xs 3957 # and global variables created in xs
3673 #Symbol::delete_package __PACKAGE__; 3958 #clear_package __PACKAGE__;
3674 3959
3675 warn "unload completed, starting to reload now"; 3960 info "unload completed, starting to reload now";
3676 3961
3677 warn "reloading cf.pm"; 3962 trace "reloading cf.pm";
3678 require cf; 3963 require cf;
3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3964 cf::_connect_to_perl_1;
3680 3965
3681 warn "loading config and database again"; 3966 trace "loading config and database again";
3682 cf::reload_config; 3967 cf::reload_config;
3683 3968
3684 warn "loading extensions"; 3969 trace "loading extensions";
3685 cf::load_extensions; 3970 cf::load_extensions;
3686 3971
3972 if ($REATTACH_ON_RELOAD) {
3687 warn "reattaching attachments to objects/players"; 3973 trace "reattaching attachments to objects/players";
3688 _global_reattach; # objects, sockets 3974 _global_reattach; # objects, sockets
3689 warn "reattaching attachments to maps"; 3975 trace "reattaching attachments to maps";
3690 reattach $_ for values %MAP; 3976 reattach $_ for values %MAP;
3691 warn "reattaching attachments to players"; 3977 trace "reattaching attachments to players";
3692 reattach $_ for values %PLAYER; 3978 reattach $_ for values %PLAYER;
3979 }
3693 3980
3981 trace "running post_init jobs";
3982 (pop @POST_INIT)->(1) while @POST_INIT;
3983
3694 warn "leaving sync_job"; 3984 trace "leaving sync_job";
3695 3985
3696 1 3986 1
3697 } or do { 3987 } or do {
3698 warn $@; 3988 error $@;
3699 cf::cleanup "error while reloading, exiting."; 3989 cf::cleanup "error while reloading, exiting.";
3990 };
3991
3992 info "reloaded";
3993 --$RELOAD;
3700 }; 3994 }
3701 3995
3702 warn "reloaded"; 3996 $t1 = AE::time - $t1;
3997 info "reload completed in ${t1}s\n";
3703}; 3998};
3704 3999
3705our $RELOAD_WATCHER; # used only during reload 4000our $RELOAD_WATCHER; # used only during reload
3706 4001
3707sub reload_perl() { 4002sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 4003 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 4004 # coro crashes during coro_state_free->destroy here.
3710 4005
4006 $RELOAD_WATCHER ||= cf::async {
4007 Coro::AIO::aio_wait cache_extensions;
4008
3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4009 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 4010 do_reload_perl;
3713 undef $RELOAD_WATCHER; 4011 undef $RELOAD_WATCHER;
4012 };
3714 }; 4013 };
3715} 4014}
3716 4015
3717register_command "reload" => sub { 4016register_command "reload" => sub {
3718 my ($who, $arg) = @_; 4017 my ($who, $arg) = @_;
3724 reload_perl; 4023 reload_perl;
3725 }; 4024 };
3726 } 4025 }
3727}; 4026};
3728 4027
3729unshift @INC, $LIBDIR; 4028#############################################################################
3730 4029
3731my $bug_warning = 0; 4030my $bug_warning = 0;
3732 4031
3733our @WAIT_FOR_TICK; 4032our @WAIT_FOR_TICK;
3734our @WAIT_FOR_TICK_BEGIN; 4033our @WAIT_FOR_TICK_BEGIN;
3735 4034
3736sub wait_for_tick { 4035sub wait_for_tick() {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 4037
3739 my $signal = new Coro::Signal; 4038 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK, $signal; 4039 push @WAIT_FOR_TICK, $signal;
3741 $signal->wait; 4040 $signal->wait;
3742} 4041}
3743 4042
3744sub wait_for_tick_begin { 4043sub wait_for_tick_begin() {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 4045
3747 my $signal = new Coro::Signal; 4046 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK_BEGIN, $signal; 4047 push @WAIT_FOR_TICK_BEGIN, $signal;
3749 $signal->wait; 4048 $signal->wait;
3750} 4049}
3756 return; 4055 return;
3757 } 4056 }
3758 4057
3759 cf::server_tick; # one server iteration 4058 cf::server_tick; # one server iteration
3760 4059
4060 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4061
3761 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4062 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4063 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3763 Coro::async_pool { 4064 Coro::async_pool {
3764 $Coro::current->{desc} = "runtime saver"; 4065 $Coro::current->{desc} = "runtime saver";
3765 write_runtime_sync 4066 write_runtime_sync
3766 or warn "ERROR: unable to write runtime file: $!"; 4067 or error "ERROR: unable to write runtime file: $!";
3767 }; 4068 };
3768 } 4069 }
3769 4070
3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3771 $sig->send; 4072 $sig->send;
3779 4080
3780 if (0) { 4081 if (0) {
3781 if ($NEXT_TICK) { 4082 if ($NEXT_TICK) {
3782 my $jitter = $TICK_START - $NEXT_TICK; 4083 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4084 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d# 4085 debug "jitter $JITTER\n";#d#
3785 } 4086 }
3786 } 4087 }
3787} 4088}
3788 4089
3789{ 4090{
3790 # configure BDB 4091 # configure BDB
3791 4092
3792 BDB::min_parallel 8; 4093 BDB::min_parallel 16;
3793 BDB::max_poll_reqs $TICK * 0.1; 4094 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 4095 $AnyEvent::BDB::WATCHER->priority (1);
3795 4096
3796 unless ($DB_ENV) { 4097 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 4098 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4099 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 | BDB::LOG_AUTOREMOVE, 1); 4100 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4101 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4102 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4103 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3802 4104
3803 cf::sync_job { 4105 cf::sync_job {
3804 eval { 4106 eval {
3830{ 4132{
3831 # configure IO::AIO 4133 # configure IO::AIO
3832 4134
3833 IO::AIO::min_parallel 8; 4135 IO::AIO::min_parallel 8;
3834 IO::AIO::max_poll_time $TICK * 0.1; 4136 IO::AIO::max_poll_time $TICK * 0.1;
3835 #undef $AnyEvent::AIO::WATCHER; 4137 undef $AnyEvent::AIO::WATCHER;
3836} 4138}
3837 4139
3838my $_log_backtrace; 4140my $_log_backtrace;
3839 4141
3840sub _log_backtrace { 4142sub _log_backtrace {
3843 $msg =~ s/\n//; 4145 $msg =~ s/\n//;
3844 4146
3845 # limit the # of concurrent backtraces 4147 # limit the # of concurrent backtraces
3846 if ($_log_backtrace < 2) { 4148 if ($_log_backtrace < 2) {
3847 ++$_log_backtrace; 4149 ++$_log_backtrace;
4150 my $perl_bt = Carp::longmess $msg;
3848 async { 4151 async {
3849 $Coro::current->{desc} = "abt $msg"; 4152 $Coro::current->{desc} = "abt $msg";
3850 4153
3851 my @bt = fork_call { 4154 my @bt = fork_call {
3852 @addr = map { sprintf "%x", $_ } @addr; 4155 @addr = map { sprintf "%x", $_ } @addr;
3863 } 4166 }
3864 4167
3865 @funcs 4168 @funcs
3866 }; 4169 };
3867 4170
3868 LOG llevInfo, "[ABT] $msg\n"; 4171 LOG llevInfo, "[ABT] $perl_bt\n";
4172 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3869 LOG llevInfo, "[ABT] $_\n" for @bt; 4173 LOG llevInfo, "[ABT] $_\n" for @bt;
3870 --$_log_backtrace; 4174 --$_log_backtrace;
3871 }; 4175 };
3872 } else { 4176 } else {
3873 LOG llevInfo, "[ABT] $msg\n"; 4177 LOG llevInfo, "[ABT] $msg\n";
3874 LOG llevInfo, "[ABT] [suppressed]\n"; 4178 LOG llevInfo, "[ABT] [suppressed]\n";
3875 } 4179 }
3876} 4180}
3877 4181
3878# load additional modules 4182# load additional modules
3879use cf::pod; 4183require "cf/$_.pm" for @EXTRA_MODULES;
4184cf::_connect_to_perl_2;
3880 4185
3881END { cf::emergency_save } 4186END { cf::emergency_save }
3882 4187
3883evthread_start IO::AIO::poll_fileno;
3884
38851 41881
3886 4189

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines