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.441 by root, Sat Aug 30 05:19:03 2008 UTC vs.
Revision 1.549 by root, Tue May 11 13:19:59 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 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
50 52
51use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
52use BDB (); 54use BDB ();
53use Data::Dumper; 55use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 56use Fcntl;
56use YAML (); 57use YAML::XS ();
57use IO::AIO (); 58use IO::AIO ();
58use Time::HiRes; 59use Time::HiRes;
59use Compress::LZF; 60use Compress::LZF;
60use Digest::MD5 (); 61use Digest::MD5 ();
61 62
63 64
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';
252)) { 310)) {
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 }
1104 for (@$attach) { 1185 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1186 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1187 _attach $registry, $klass, @attach;
1107 } 1188 }
1108 } else { 1189 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1190 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1191 }
1111 } 1192 }
1112} 1193}
1113 1194
1114cf::attachable->attach ( 1195cf::attachable->attach (
1141 my ($filename, $rdata, $objs) = @_; 1222 my ($filename, $rdata, $objs) = @_;
1142 1223
1143 sync_job { 1224 sync_job {
1144 if (length $$rdata) { 1225 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1226 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1227 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1228 $decname, length $$rdata, scalar @$objs
1229 if $VERBOSE_IO;
1148 1230
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1231 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1232 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1233 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 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 }
1153 aio_close $fh; 1238 aio_close $fh;
1154 1239
1155 if (@$objs) { 1240 if (@$objs) {
1156 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) {
1157 aio_chmod $fh, SAVE_MODE; 1242 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1243 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1244 aio_write $fh, 0, (length $data), $data, 0;
1160 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 }
1161 aio_close $fh; 1249 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1250 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1251 }
1164 } else { 1252 } else {
1165 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1166 } 1254 }
1167 1255
1168 aio_rename "$filename~", $filename; 1256 aio_rename "$filename~", $filename;
1257
1258 $filename =~ s%/[^/]+$%%;
1259 aio_pathsync $filename if $cf::USE_FSYNC;
1169 } else { 1260 } else {
1170 warn "FATAL: $filename~: $!\n"; 1261 error "unable to save objects: $filename~: $!\n";
1171 } 1262 }
1172 } else { 1263 } else {
1173 aio_unlink $filename; 1264 aio_unlink $filename;
1174 aio_unlink "$filename.pst"; 1265 aio_unlink "$filename.pst";
1175 } 1266 }
1199 my $st = eval { Coro::Storable::thaw $av }; 1290 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs}; 1291 $av = $st->{objs};
1201 } 1292 }
1202 1293
1203 utf8::decode (my $decname = $filename); 1294 utf8::decode (my $decname = $filename);
1204 warn sprintf "loading %s (%d,%d)\n", 1295 trace sprintf "loading %s (%d,%d)\n",
1205 $decname, length $data, scalar @{$av || []}; 1296 $decname, length $data, scalar @{$av || []}
1297 if $VERBOSE_IO;
1206 1298
1207 ($data, $av) 1299 ($data, $av)
1208} 1300}
1209 1301
1210=head2 COMMAND CALLBACKS 1302=head2 COMMAND CALLBACKS
1266 my ($name, $cb) = @_; 1358 my ($name, $cb) = @_;
1267 1359
1268 $EXTICMD{$name} = $cb; 1360 $EXTICMD{$name} = $cb;
1269} 1361}
1270 1362
1363use File::Glob ();
1364
1271cf::player->attach ( 1365cf::player->attach (
1272 on_command => sub { 1366 on_unknown_command => sub {
1273 my ($pl, $name, $params) = @_; 1367 my ($pl, $name, $params) = @_;
1274 1368
1275 my $cb = $COMMAND{$name} 1369 my $cb = $COMMAND{$name}
1276 or return; 1370 or return;
1277 1371
1300 1394
1301 $pl->ext_reply ($reply, @reply) 1395 $pl->ext_reply ($reply, @reply)
1302 if $reply; 1396 if $reply;
1303 1397
1304 } else { 1398 } else {
1305 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1399 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1306 } 1400 }
1307 1401
1308 cf::override; 1402 cf::override;
1309 }, 1403 },
1310); 1404);
1311 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
1312sub load_extensions { 1419sub load_extensions {
1420 info "loading extensions...";
1421
1313 cf::sync_job { 1422 cf::sync_job {
1314 my %todo; 1423 my %todo;
1315 1424
1316 for my $path (<$LIBDIR/*.ext>) { 1425 for my $path (<$LIBDIR/*.ext>) {
1317 next unless -r $path; 1426 next unless -r $path;
1335 1444
1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1445 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1446 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1338 1447
1339 $ext{source} = 1448 $ext{source} =
1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1449 "package $pkg; use common::sense;\n"
1341 . "#line 1 \"$path\"\n{\n" 1450 . "#line 1 \"$path\"\n{\n"
1342 . $source 1451 . $source
1343 . "\n};\n1"; 1452 . "\n};\n1";
1344 1453
1345 $todo{$base} = \%ext; 1454 $todo{$base} = \%ext;
1346 } 1455 }
1347 1456
1457 my $pass = 0;
1348 my %done; 1458 my %done;
1349 while (%todo) { 1459 while (%todo) {
1350 my $progress; 1460 my $progress;
1351 1461
1462 ++$pass;
1463
1464 ext:
1352 while (my ($k, $v) = each %todo) { 1465 while (my ($k, $v) = each %todo) {
1353 for (split /,\s*/, $v->{meta}{depends}) { 1466 for (split /,\s*/, $v->{meta}{depends}) {
1354 goto skip 1467 next ext
1355 unless exists $done{$_}; 1468 unless exists $done{$_};
1356 } 1469 }
1357 1470
1358 warn "... loading '$k' into '$v->{pkg}'\n"; 1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1359 1472
1360 unless (eval $v->{source}) { 1473 my $active = eval $v->{source};
1474
1475 if (length $@) {
1361 my $msg = $@ ? "$v->{path}: $@\n" 1476 error "$v->{path}: $@\n";
1362 : "$v->{base}: extension inactive.\n";
1363 1477
1364 if (exists $v->{meta}{mandatory}) {
1365 warn $msg;
1366 cf::cleanup "mandatory extension failed to load, exiting."; 1478 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1367 } 1479 if exists $v->{meta}{mandatory};
1368 1480
1369 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;
1370 } 1490 }
1371
1372 $done{$k} = delete $todo{$k};
1373 push @EXTS, $v->{pkg};
1374 $progress = 1;
1375 } 1491 }
1376 1492
1377 skip: 1493 unless ($progress) {
1378 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1494 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1379 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 }
1380 } 1501 }
1381 }; 1502 };
1382} 1503}
1383 1504
1384############################################################################# 1505#############################################################################
1385 1506
1386=back 1507=back
1387 1508
1388=head2 CORE EXTENSIONS 1509=head2 CORE EXTENSIONS
1389 1510
1390Functions and methods that extend core crossfire objects. 1511Functions and methods that extend core deliantra objects.
1391 1512
1392=cut 1513=cut
1393 1514
1394package cf::player; 1515package cf::player;
1395 1516
1438 1559
1439sub exists($) { 1560sub exists($) {
1440 my ($login) = @_; 1561 my ($login) = @_;
1441 1562
1442 $cf::PLAYER{$login} 1563 $cf::PLAYER{$login}
1443 or cf::sync_job { !aio_stat path $login } 1564 or !aio_stat path $login
1444} 1565}
1445 1566
1446sub find($) { 1567sub find($) {
1447 return $cf::PLAYER{$_[0]} || do { 1568 return $cf::PLAYER{$_[0]} || do {
1448 my $login = $_[0]; 1569 my $login = $_[0];
1468 $cf::PLAYER{$login} = $pl 1589 $cf::PLAYER{$login} = $pl
1469 } 1590 }
1470 } 1591 }
1471} 1592}
1472 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
1473sub save($) { 1607sub save($) {
1474 my ($pl) = @_; 1608 my ($pl) = @_;
1475 1609
1476 return if $pl->{deny_save}; 1610 return if $pl->{deny_save};
1477 1611
1482 1616
1483 aio_mkdir playerdir $pl, 0770; 1617 aio_mkdir playerdir $pl, 0770;
1484 $pl->{last_save} = $cf::RUNTIME; 1618 $pl->{last_save} = $cf::RUNTIME;
1485 1619
1486 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];
1487 1624
1488 $pl->save_pl ($path); 1625 $pl->save_pl ($path);
1489 cf::cede_to_tick; 1626 cf::cede_to_tick;
1490} 1627}
1491 1628
1523 my ($pl) = @_; 1660 my ($pl) = @_;
1524 1661
1525 my $name = $pl->ob->name; 1662 my $name = $pl->ob->name;
1526 1663
1527 $pl->{deny_save} = 1; 1664 $pl->{deny_save} = 1;
1528 $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
1529 1666
1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1531 $pl->deactivate; 1668 $pl->deactivate;
1669
1532 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;
1533 $pl->ob->check_score;
1534 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1671 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1672 ext::highscore::check ($pl->ob);
1673
1535 $pl->ns->destroy if $pl->ns; 1674 $pl->ns->destroy if $pl->ns;
1536 1675
1537 my $path = playerdir $pl; 1676 my $path = playerdir $pl;
1538 my $temp = "$path~$cf::RUNTIME~deleting~"; 1677 my $temp = "$path~$cf::RUNTIME~deleting~";
1539 aio_rename $path, $temp; 1678 aio_rename $path, $temp;
1593 \@logins 1732 \@logins
1594} 1733}
1595 1734
1596=item $player->maps 1735=item $player->maps
1597 1736
1737=item cf::player::maps $login
1738
1598Returns an arrayref of map paths that are private for this 1739Returns an arrayref of map paths that are private for this
1599player. May block. 1740player. May block.
1600 1741
1601=cut 1742=cut
1602 1743
1619 } 1760 }
1620 1761
1621 \@paths 1762 \@paths
1622} 1763}
1623 1764
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1765=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625 1766
1626Expand crossfire pod fragments into protocol xml. 1767Expand deliantra pod fragments into protocol xml.
1627
1628=cut
1629
1630use re 'eval';
1631
1632my $group;
1633my $interior; $interior = qr{
1634 # match a pod interior sequence sans C<< >>
1635 (?:
1636 \ (.*?)\ (?{ $group = $^N })
1637 | < (??{$interior}) >
1638 )
1639}x;
1640
1641sub expand_cfpod {
1642 my ($self, $pod) = @_;
1643
1644 my $xml;
1645
1646 while () {
1647 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1648 $group = $1;
1649
1650 $group =~ s/&/&amp;/g;
1651 $group =~ s/</&lt;/g;
1652
1653 $xml .= $group;
1654 } elsif ($pod =~ m%\G
1655 ([BCGHITU])
1656 <
1657 (?:
1658 ([^<>]*) (?{ $group = $^N })
1659 | < $interior >
1660 )
1661 >
1662 %gcsx
1663 ) {
1664 my ($code, $data) = ($1, $group);
1665
1666 if ($code eq "B") {
1667 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1668 } elsif ($code eq "I") {
1669 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1670 } elsif ($code eq "U") {
1671 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1672 } elsif ($code eq "C") {
1673 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1674 } elsif ($code eq "T") {
1675 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1676 } elsif ($code eq "G") {
1677 my ($male, $female) = split /\|/, $data;
1678 $data = $self->gender ? $female : $male;
1679 $xml .= expand_cfpod ($self, $data);
1680 } elsif ($code eq "H") {
1681 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1682 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1683 "")
1684 [$self->{hintmode}];
1685 } else {
1686 $xml .= "error processing '$code($data)' directive";
1687 }
1688 } else {
1689 if ($pod =~ /\G(.+)/) {
1690 warn "parse error while expanding $pod (at $1)";
1691 }
1692 last;
1693 }
1694 }
1695
1696 for ($xml) {
1697 # create single paragraphs (very hackish)
1698 s/(?<=\S)\n(?=\w)/ /g;
1699
1700 # compress some whitespace
1701 s/\s+\n/\n/g; # ws line-ends
1702 s/\n\n+/\n/g; # double lines
1703 s/^\n+//; # beginning lines
1704 s/\n+$//; # ending lines
1705 }
1706
1707 $xml
1708}
1709
1710no re 'eval';
1711
1712sub hintmode {
1713 $_[0]{hintmode} = $_[1] if @_ > 1;
1714 $_[0]{hintmode}
1715}
1716 1768
1717=item $player->ext_reply ($msgid, @msg) 1769=item $player->ext_reply ($msgid, @msg)
1718 1770
1719Sends an ext reply to the player. 1771Sends an ext reply to the player.
1720 1772
1752 1804
1753=cut 1805=cut
1754 1806
1755sub find_by_path($) { 1807sub find_by_path($) {
1756 my ($path) = @_; 1808 my ($path) = @_;
1809
1810 $path =~ s/^~[^\/]*//; # skip ~login
1757 1811
1758 my ($match, $specificity); 1812 my ($match, $specificity);
1759 1813
1760 for my $region (list) { 1814 for my $region (list) {
1761 if ($region->{match} && $path =~ $region->{match}) { 1815 if ($region->{match} && $path =~ $region->{match}) {
1793 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
1794 1848
1795 # mit "rum" bekleckern, nicht 1849 # mit "rum" bekleckern, nicht
1796 $self->_create_random_map ( 1850 $self->_create_random_map (
1797 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1851 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1798 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1852 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1799 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1853 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1800 $rmp->{exit_on_final_map}, 1854 $rmp->{exit_on_final_map},
1801 $rmp->{xsize}, $rmp->{ysize}, 1855 $rmp->{xsize}, $rmp->{ysize},
1802 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1856 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1803 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1857 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1818 1872
1819sub register { 1873sub register {
1820 my (undef, $regex, $prio) = @_; 1874 my (undef, $regex, $prio) = @_;
1821 my $pkg = caller; 1875 my $pkg = caller;
1822 1876
1823 no strict;
1824 push @{"$pkg\::ISA"}, __PACKAGE__; 1877 push @{"$pkg\::ISA"}, __PACKAGE__;
1825 1878
1826 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1879 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1827} 1880}
1828 1881
1829# also paths starting with '/' 1882# also paths starting with '/'
1830$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1883$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1831 1884
1832sub thawer_merge { 1885sub thawer_merge {
1833 my ($self, $merge) = @_; 1886 my ($self, $merge) = @_;
1834 1887
1835 # we have to keep some variables in memory intact 1888 # we have to keep some variables in memory intact
1840} 1893}
1841 1894
1842sub normalise { 1895sub normalise {
1843 my ($path, $base) = @_; 1896 my ($path, $base) = @_;
1844 1897
1845 $path = "$path"; # make sure its a string 1898 $path = "$path"; # make sure it's a string
1846 1899
1847 $path =~ s/\.map$//; 1900 $path =~ s/\.map$//;
1848 1901
1849 # map plan: 1902 # map plan:
1850 # 1903 #
1889 $self->init; # pass $1 etc. 1942 $self->init; # pass $1 etc.
1890 return $self; 1943 return $self;
1891 } 1944 }
1892 } 1945 }
1893 1946
1894 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1947 Carp::cluck "unable to resolve path '$path' (base '$base')";
1895 () 1948 ()
1896} 1949}
1897 1950
1898sub init { 1951sub init {
1899 my ($self) = @_; 1952 my ($self) = @_;
1931sub uniq_path { 1984sub uniq_path {
1932 my ($self) = @_; 1985 my ($self) = @_;
1933 1986
1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1987 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1935 "$UNIQUEDIR/$path" 1988 "$UNIQUEDIR/$path"
1936}
1937
1938# and all this just because we cannot iterate over
1939# all maps in C++...
1940sub change_all_map_light {
1941 my ($change) = @_;
1942
1943 $_->change_map_light ($change)
1944 for grep $_->outdoor, values %cf::MAP;
1945} 1989}
1946 1990
1947sub decay_objects { 1991sub decay_objects {
1948 my ($self) = @_; 1992 my ($self) = @_;
1949 1993
2031 2075
2032sub find; 2076sub find;
2033sub find { 2077sub find {
2034 my ($path, $origin) = @_; 2078 my ($path, $origin) = @_;
2035 2079
2080 cf::cede_to_tick;
2081
2036 $path = normalise $path, $origin && $origin->path; 2082 $path = normalise $path, $origin && $origin->path;
2037 2083
2038 cf::lock_wait "map_data:$path";#d#remove 2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2039 cf::lock_wait "map_find:$path"; 2085 my $guard2 = cf::lock_acquire "map_find:$path";
2040 2086
2041 $cf::MAP{$path} || do { 2087 $cf::MAP{$path} || do {
2042 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2043 my $guard2 = cf::lock_acquire "map_find:$path";
2044
2045 my $map = new_from_path cf::map $path 2088 my $map = new_from_path cf::map $path
2046 or return; 2089 or return;
2047 2090
2048 $map->{last_save} = $cf::RUNTIME; 2091 $map->{last_save} = $cf::RUNTIME;
2049 2092
2061 2104
2062 $cf::MAP{$path} = $map 2105 $cf::MAP{$path} = $map
2063 } 2106 }
2064} 2107}
2065 2108
2066sub pre_load { } 2109sub pre_load { }
2067sub post_load { } 2110#sub post_load { } # XS
2068 2111
2069sub load { 2112sub load {
2070 my ($self) = @_; 2113 my ($self) = @_;
2071 2114
2072 local $self->{deny_reset} = 1; # loading can take a long time 2115 local $self->{deny_reset} = 1; # loading can take a long time
2117 unless ($self->{deny_activate}) { 2160 unless ($self->{deny_activate}) {
2118 $self->decay_objects; 2161 $self->decay_objects;
2119 $self->fix_auto_apply; 2162 $self->fix_auto_apply;
2120 $self->update_buttons; 2163 $self->update_buttons;
2121 cf::cede_to_tick; 2164 cf::cede_to_tick;
2122 $self->set_darkness_map;
2123 cf::cede_to_tick;
2124 $self->activate; 2165 $self->activate;
2125 } 2166 }
2126 2167
2127 $self->{last_save} = $cf::RUNTIME; 2168 $self->{last_save} = $cf::RUNTIME;
2128 $self->last_access ($cf::RUNTIME); 2169 $self->last_access ($cf::RUNTIME);
2131 } 2172 }
2132 2173
2133 $self->post_load; 2174 $self->post_load;
2134} 2175}
2135 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
2136sub customise_for { 2180sub customise_for {
2137 my ($self, $ob) = @_; 2181 my ($self, $ob) = @_;
2138 2182
2139 return find "~" . $ob->name . "/" . $self->{path} 2183 return find "~" . $ob->name . "/" . $self->{path}
2140 if $self->per_player; 2184 if $self->per_player;
2156 or next; 2200 or next;
2157 $neigh = find $neigh, $map 2201 $neigh = find $neigh, $map
2158 or next; 2202 or next;
2159 $neigh->load; 2203 $neigh->load;
2160 2204
2205 # now find the diagonal neighbours
2161 push @neigh, 2206 push @neigh,
2162 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2163 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2164 } 2209 }
2165 2210
2172} 2217}
2173 2218
2174sub find_sync { 2219sub find_sync {
2175 my ($path, $origin) = @_; 2220 my ($path, $origin) = @_;
2176 2221
2177 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
2178} 2226}
2179 2227
2180sub do_load_sync { 2228sub do_load_sync {
2181 my ($map) = @_; 2229 my ($map) = @_;
2182 2230
2183 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2184 if $Coro::current == $Coro::main; 2232 if $Coro::current == $Coro::main;
2185 2233
2186 cf::sync_job { $map->load }; 2234 $map->load;
2187} 2235}
2188 2236
2189our %MAP_PREFETCH; 2237our %MAP_PREFETCH;
2190our $MAP_PREFETCHER = undef; 2238our $MAP_PREFETCHER = undef;
2191 2239
2217 $MAP_PREFETCHER->prio (6); 2265 $MAP_PREFETCHER->prio (6);
2218 2266
2219 () 2267 ()
2220} 2268}
2221 2269
2270# common code, used by both ->save and ->swapout
2222sub save { 2271sub _save {
2223 my ($self) = @_; 2272 my ($self) = @_;
2224
2225 my $lock = cf::lock_acquire "map_data:$self->{path}";
2226 2273
2227 $self->{last_save} = $cf::RUNTIME; 2274 $self->{last_save} = $cf::RUNTIME;
2228 2275
2229 return unless $self->dirty; 2276 return unless $self->dirty;
2230 2277
2250 } else { 2297 } else {
2251 $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);
2252 } 2299 }
2253} 2300}
2254 2301
2302sub save {
2303 my ($self) = @_;
2304
2305 my $lock = cf::lock_acquire "map_data:$self->{path}";
2306
2307 $self->_save;
2308}
2309
2255sub swap_out { 2310sub swap_out {
2256 my ($self) = @_; 2311 my ($self) = @_;
2257 2312
2258 # save first because save cedes
2259 $self->save;
2260
2261 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2262 2314
2263 return if $self->players;
2264 return if $self->in_memory != cf::MAP_ACTIVE; 2315 return if $self->in_memory != cf::MAP_ACTIVE;
2265 return if $self->{deny_save}; 2316 return if $self->{deny_save};
2317 return if $self->players;
2266 2318
2319 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP;
2267 $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};
2268 2369
2269 $self->deactivate; 2370 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP; 2371 $_->clear_links_to ($self) for values %cf::MAP;
2271 $self->clear; 2372 $self->clear;
2272}
2273
2274sub reset_at {
2275 my ($self) = @_;
2276
2277 # TODO: safety, remove and allow resettable per-player maps
2278 return 1e99 if $self->{deny_reset};
2279
2280 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2281 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2282
2283 $time + $to
2284}
2285
2286sub should_reset {
2287 my ($self) = @_;
2288
2289 $self->reset_at <= $cf::RUNTIME
2290}
2291
2292sub reset {
2293 my ($self) = @_;
2294
2295 my $lock = cf::lock_acquire "map_data:$self->{path}";
2296
2297 return if $self->players;
2298
2299 warn "resetting map ", $self->path;
2300
2301 $self->in_memory (cf::MAP_SWAPPED);
2302
2303 # need to save uniques path
2304 unless ($self->{deny_save}) {
2305 my $uniq = $self->uniq_path; utf8::encode $uniq;
2306
2307 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2308 if $uniq;
2309 }
2310
2311 delete $cf::MAP{$self->path};
2312
2313 $self->deactivate;
2314 $_->clear_links_to ($self) for values %cf::MAP;
2315 $self->clear;
2316 2373
2317 $self->unlink_save; 2374 $self->unlink_save;
2318 $self->destroy; 2375 $self->destroy;
2319} 2376}
2320 2377
2328 2385
2329 delete $cf::MAP{$self->path}; 2386 delete $cf::MAP{$self->path};
2330 2387
2331 $self->unlink_save; 2388 $self->unlink_save;
2332 2389
2333 bless $self, "cf::map"; 2390 bless $self, "cf::map::wrap";
2334 delete $self->{deny_reset}; 2391 delete $self->{deny_reset};
2335 $self->{deny_save} = 1; 2392 $self->{deny_save} = 1;
2336 $self->reset_timeout (1); 2393 $self->reset_timeout (1);
2337 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2394 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2338 2395
2395 : normalise $_ 2452 : normalise $_
2396 } @{ aio_readdir $UNIQUEDIR or [] } 2453 } @{ aio_readdir $UNIQUEDIR or [] }
2397 ] 2454 ]
2398} 2455}
2399 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
2400=back 2489=back
2401 2490
2402=head3 cf::object 2491=head3 cf::object
2403 2492
2404=cut 2493=cut
2469 2558
2470our $SAY_CHANNEL = { 2559our $SAY_CHANNEL = {
2471 id => "say", 2560 id => "say",
2472 title => "Map", 2561 title => "Map",
2473 reply => "say ", 2562 reply => "say ",
2474 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.",
2475}; 2564};
2476 2565
2477our $CHAT_CHANNEL = { 2566our $CHAT_CHANNEL = {
2478 id => "chat", 2567 id => "chat",
2479 title => "Chat", 2568 title => "Chat",
2534 2623
2535=item $player_object->enter_link 2624=item $player_object->enter_link
2536 2625
2537Freezes 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}>).
2538 2627
2539The 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.
2540I<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.
2541 2632
2542Will never block. 2633Will never block.
2543 2634
2544=item $player_object->leave_link ($map, $x, $y) 2635=item $player_object->leave_link ($map, $x, $y)
2545 2636
2565sub cf::object::player::enter_link { 2656sub cf::object::player::enter_link {
2566 my ($self) = @_; 2657 my ($self) = @_;
2567 2658
2568 $self->deactivate_recursive; 2659 $self->deactivate_recursive;
2569 2660
2661 ++$self->{_link_recursion};
2662
2570 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2663 return if UNIVERSAL::isa $self->map, "ext::map_link";
2571 2664
2572 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2665 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2573 if $self->map && $self->map->{path} ne "{link}"; 2666 if $self->map && $self->map->{path} ne "{link}";
2574 2667
2575 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2668 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2576} 2669}
2577 2670
2578sub cf::object::player::leave_link { 2671sub cf::object::player::leave_link {
2579 my ($self, $map, $x, $y) = @_; 2672 my ($self, $map, $x, $y) = @_;
2580 2673
2597 ($x, $y) = (-1, -1) 2690 ($x, $y) = (-1, -1)
2598 unless (defined $x) && (defined $y); 2691 unless (defined $x) && (defined $y);
2599 2692
2600 # use -1 or undef as default coordinates, not 0, 0 2693 # use -1 or undef as default coordinates, not 0, 0
2601 ($x, $y) = ($map->enter_x, $map->enter_y) 2694 ($x, $y) = ($map->enter_x, $map->enter_y)
2602 if $x <=0 && $y <= 0; 2695 if $x <= 0 && $y <= 0;
2603 2696
2604 $map->load; 2697 $map->load;
2605 $map->load_neighbours; 2698 $map->load_neighbours;
2606 2699
2607 return unless $self->contr->active; 2700 return unless $self->contr->active;
2608 $self->activate_recursive;
2609 2701
2610 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2611 $self->enter_map ($map, $x, $y); 2703 if ($self->enter_map ($map, $x, $y)) {
2612} 2704 # entering was successful
2705 delete $self->{_link_recursion};
2706 # only activate afterwards, to support waiting in hooks
2707 $self->activate_recursive;
2708 }
2613 2709
2710}
2711
2614=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)]])
2615 2713
2616Moves 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
2617her, loading and preparing them map, calling the provided $check callback 2715her, loading and preparing them map, calling the provided $check callback
2618that 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
2619the 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
2626 2724
2627our $GOTOGEN; 2725our $GOTOGEN;
2628 2726
2629sub cf::object::player::goto { 2727sub cf::object::player::goto {
2630 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 }
2631 2735
2632 # 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
2633 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2737 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2634 2738
2635 $self->enter_link; 2739 $self->enter_link;
2659 my $map = eval { 2763 my $map = eval {
2660 my $map = defined $path ? cf::map::find $path : undef; 2764 my $map = defined $path ? cf::map::find $path : undef;
2661 2765
2662 if ($map) { 2766 if ($map) {
2663 $map = $map->customise_for ($self); 2767 $map = $map->customise_for ($self);
2664 $map = $check->($map) if $check && $map; 2768 $map = $check->($map, $x, $y, $self) if $check && $map;
2665 } else { 2769 } else {
2666 $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);
2667 } 2771 }
2668 2772
2669 $map 2773 $map
2677 if ($gen == $self->{_goto_generation}) { 2781 if ($gen == $self->{_goto_generation}) {
2678 delete $self->{_goto_generation}; 2782 delete $self->{_goto_generation};
2679 $self->leave_link ($map, $x, $y); 2783 $self->leave_link ($map, $x, $y);
2680 } 2784 }
2681 2785
2682 $done->() if $done; 2786 $done->($self) if $done;
2683 })->prio (1); 2787 })->prio (1);
2684} 2788}
2685 2789
2686=item $player_object->enter_exit ($exit_object) 2790=item $player_object->enter_exit ($exit_object)
2687 2791
2775 $self->contr->savebed ($map, $x, $y) 2879 $self->contr->savebed ($map, $x, $y)
2776 if $exit->flag (cf::FLAG_DAMNED); 2880 if $exit->flag (cf::FLAG_DAMNED);
2777 2881
2778 1 2882 1
2779 }) { 2883 }) {
2780 $self->message ("Something went wrong deep within the crossfire server. " 2884 $self->message ("Something went wrong deep within the deliantra server. "
2781 . "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. "
2782 . "Please report this to the dungeon master!", 2886 . "Please report this to the dungeon master!",
2783 cf::NDI_UNIQUE | cf::NDI_RED); 2887 cf::NDI_UNIQUE | cf::NDI_RED);
2784 2888
2785 warn "ERROR in enter_exit: $@"; 2889 error "ERROR in enter_exit: $@";
2786 $self->leave_link; 2890 $self->leave_link;
2787 } 2891 }
2788 })->prio (1); 2892 })->prio (1);
2789} 2893}
2790 2894
2802sub cf::client::send_drawinfo { 2906sub cf::client::send_drawinfo {
2803 my ($self, $text, $flags) = @_; 2907 my ($self, $text, $flags) = @_;
2804 2908
2805 utf8::encode $text; 2909 utf8::encode $text;
2806 $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);
2807} 2936}
2808 2937
2809=item $client->send_msg ($channel, $msg, $color, [extra...]) 2938=item $client->send_msg ($channel, $msg, $color, [extra...])
2810 2939
2811Send 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
2815 2944
2816=cut 2945=cut
2817 2946
2818# non-persistent channels (usually the info channel) 2947# non-persistent channels (usually the info channel)
2819our %CHANNEL = ( 2948our %CHANNEL = (
2949 "c/motd" => {
2950 id => "infobox",
2951 title => "MOTD",
2952 reply => undef,
2953 tooltip => "The message of the day",
2954 },
2820 "c/identify" => { 2955 "c/identify" => {
2821 id => "infobox", 2956 id => "infobox",
2822 title => "Identify", 2957 title => "Identify",
2823 reply => undef, 2958 reply => undef,
2824 tooltip => "Items recently identified", 2959 tooltip => "Items recently identified",
2826 "c/examine" => { 2961 "c/examine" => {
2827 id => "infobox", 2962 id => "infobox",
2828 title => "Examine", 2963 title => "Examine",
2829 reply => undef, 2964 reply => undef,
2830 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",
2831 }, 2972 },
2832 "c/book" => { 2973 "c/book" => {
2833 id => "infobox", 2974 id => "infobox",
2834 title => "Book", 2975 title => "Book",
2835 reply => undef, 2976 reply => undef,
2851 id => "infobox", 2992 id => "infobox",
2852 title => "Body Parts", 2993 title => "Body Parts",
2853 reply => undef, 2994 reply => undef,
2854 tooltip => "Shows which body parts you posess and are available", 2995 tooltip => "Shows which body parts you posess and are available",
2855 }, 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 },
2856 "c/uptime" => { 3033 "c/uptime" => {
2857 id => "infobox", 3034 id => "infobox",
2858 title => "Uptime", 3035 title => "Uptime",
2859 reply => undef, 3036 reply => undef,
2860 tooltip => "How long the server has been running since last restart", 3037 tooltip => "How long the server has been running since last restart",
2869 id => "party", 3046 id => "party",
2870 title => "Party", 3047 title => "Party",
2871 reply => "gsay ", 3048 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party", 3049 tooltip => "Messages and chat related to your party",
2873 }, 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,
2874); 3059);
2875 3060
2876sub cf::client::send_msg { 3061sub cf::client::send_msg {
2877 my ($self, $channel, $msg, $color, @extra) = @_; 3062 my ($self, $channel, $msg, $color, @extra) = @_;
2878 3063
2879 $msg = $self->pl->expand_cfpod ($msg); 3064 $msg = $self->pl->expand_cfpod ($msg)
3065 unless $color & cf::NDI_VERBATIM;
2880 3066
2881 $color &= cf::NDI_CLIENT_MASK; # just in case... 3067 $color &= cf::NDI_CLIENT_MASK; # just in case...
2882 3068
2883 # check predefined channels, for the benefit of C 3069 # check predefined channels, for the benefit of C
2884 if ($CHANNEL{$channel}) { 3070 if ($CHANNEL{$channel}) {
2885 $channel = $CHANNEL{$channel}; 3071 $channel = $CHANNEL{$channel};
2886 3072
2887 $self->ext_msg (channel_info => $channel) 3073 $self->ext_msg (channel_info => $channel);
2888 if $self->can_msg;
2889
2890 $channel = $channel->{id}; 3074 $channel = $channel->{id};
2891 3075
2892 } elsif (ref $channel) { 3076 } elsif (ref $channel) {
2893 # send meta info to client, if not yet sent 3077 # send meta info to client, if not yet sent
2894 unless (exists $self->{channel}{$channel->{id}}) { 3078 unless (exists $self->{channel}{$channel->{id}}) {
2895 $self->{channel}{$channel->{id}} = $channel; 3079 $self->{channel}{$channel->{id}} = $channel;
2896 $self->ext_msg (channel_info => $channel) 3080 $self->ext_msg (channel_info => $channel);
2897 if $self->can_msg;
2898 } 3081 }
2899 3082
2900 $channel = $channel->{id}; 3083 $channel = $channel->{id};
2901 } 3084 }
2902 3085
2903 return unless @extra || length $msg; 3086 return unless @extra || length $msg;
2904 3087
2905 if ($self->can_msg) {
2906 # default colour, mask it out 3088 # default colour, mask it out
2907 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3089 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2908 if $color & cf::NDI_DEF; 3090 if $color & cf::NDI_DEF;
2909 3091
2910 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3092 my $pkt = "msg "
3093 . $self->{json_coder}->encode (
2911 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3094 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2912 } else { 3095 );
2913 if ($color >= 0) {
2914 # replace some tags by gcfclient-compatible ones
2915 for ($msg) {
2916 1 while
2917 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2918 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2919 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2920 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2921 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2922 }
2923 3096
2924 $color &= cf::NDI_COLOR_MASK; 3097 $self->send_big_packet ($pkt);
2925
2926 utf8::encode $msg;
2927
2928 if (0 && $msg =~ /\[/) {
2929 # COMMAND/INFO
2930 $self->send_packet ("drawextinfo $color 10 8 $msg")
2931 } else {
2932 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2933 $self->send_packet ("drawinfo $color $msg")
2934 }
2935 }
2936 }
2937} 3098}
2938 3099
2939=item $client->ext_msg ($type, @msg) 3100=item $client->ext_msg ($type, @msg)
2940 3101
2941Sends an ext event to the client. 3102Sends an ext event to the client.
2944 3105
2945sub cf::client::ext_msg($$@) { 3106sub cf::client::ext_msg($$@) {
2946 my ($self, $type, @msg) = @_; 3107 my ($self, $type, @msg) = @_;
2947 3108
2948 if ($self->extcmd == 2) { 3109 if ($self->extcmd == 2) {
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3110 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2950 } elsif ($self->extcmd == 1) { # TODO: remove 3111 } elsif ($self->extcmd == 1) { # TODO: remove
2951 push @msg, msgtype => "event_$type"; 3112 push @msg, msgtype => "event_$type";
2952 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3113 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2953 } 3114 }
2954} 3115}
2955 3116
2956=item $client->ext_reply ($msgid, @msg) 3117=item $client->ext_reply ($msgid, @msg)
2957 3118
2961 3122
2962sub cf::client::ext_reply($$@) { 3123sub cf::client::ext_reply($$@) {
2963 my ($self, $id, @msg) = @_; 3124 my ($self, $id, @msg) = @_;
2964 3125
2965 if ($self->extcmd == 2) { 3126 if ($self->extcmd == 2) {
2966 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2967 } elsif ($self->extcmd == 1) { 3128 } elsif ($self->extcmd == 1) {
2968 #TODO: version 1, remove 3129 #TODO: version 1, remove
2969 unshift @msg, msgtype => "reply", msgid => $id; 3130 unshift @msg, msgtype => "reply", msgid => $id;
2970 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2971 } 3132 }
2972} 3133}
2973 3134
2974=item $success = $client->query ($flags, "text", \&cb) 3135=item $success = $client->query ($flags, "text", \&cb)
2975 3136
3046 3207
3047 $ns->ext_reply ($reply, @reply) 3208 $ns->ext_reply ($reply, @reply)
3048 if $reply; 3209 if $reply;
3049 3210
3050 } else { 3211 } else {
3051 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";
3052 } 3213 }
3053 3214
3054 cf::override; 3215 cf::override;
3055 }, 3216 },
3056); 3217);
3076 3237
3077 $coro 3238 $coro
3078} 3239}
3079 3240
3080cf::client->attach ( 3241cf::client->attach (
3081 on_destroy => sub { 3242 on_client_destroy => sub {
3082 my ($ns) = @_; 3243 my ($ns) = @_;
3083 3244
3084 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3245 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3085 }, 3246 },
3086); 3247);
3102our $safe_hole = new Safe::Hole; 3263our $safe_hole = new Safe::Hole;
3103 3264
3104$SIG{FPE} = 'IGNORE'; 3265$SIG{FPE} = 'IGNORE';
3105 3266
3106$safe->permit_only (Opcode::opset qw( 3267$safe->permit_only (Opcode::opset qw(
3107 :base_core :base_mem :base_orig :base_math 3268 :base_core :base_mem :base_orig :base_math :base_loop
3108 grepstart grepwhile mapstart mapwhile 3269 grepstart grepwhile mapstart mapwhile
3109 sort time 3270 sort time
3110)); 3271));
3111 3272
3112# here we export the classes and methods available to script code 3273# here we export the classes and methods available to script code
3116The following functions and methods are available within a safe environment: 3277The following functions and methods are available within a safe environment:
3117 3278
3118 cf::object 3279 cf::object
3119 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
3120 insert remove name archname title slaying race decrease split 3281 insert remove name archname title slaying race decrease split
3282 value
3121 3283
3122 cf::object::player 3284 cf::object::player
3123 player 3285 player
3124 3286
3125 cf::player 3287 cf::player
3131=cut 3293=cut
3132 3294
3133for ( 3295for (
3134 ["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
3135 insert remove inv nrof name archname title slaying race 3297 insert remove inv nrof name archname title slaying race
3136 decrease split destroy change_exp)], 3298 decrease split destroy change_exp value msg lore send_msg)],
3137 ["cf::object::player" => qw(player)], 3299 ["cf::object::player" => qw(player)],
3138 ["cf::player" => qw(peaceful)], 3300 ["cf::player" => qw(peaceful send_msg)],
3139 ["cf::map" => qw(trigger)], 3301 ["cf::map" => qw(trigger)],
3140) { 3302) {
3141 no strict 'refs';
3142 my ($pkg, @funs) = @$_; 3303 my ($pkg, @funs) = @$_;
3143 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3304 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3144 for @funs; 3305 for @funs;
3145} 3306}
3146 3307
3161 3322
3162 my $qcode = $code; 3323 my $qcode = $code;
3163 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3324 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3164 $qcode =~ s/\n/\\n/g; 3325 $qcode =~ s/\n/\\n/g;
3165 3326
3327 %vars = (_dummy => 0) unless %vars;
3328
3329 my @res;
3166 local $_; 3330 local $_;
3167 local @safe::cf::_safe_eval_args = values %vars;
3168 3331
3169 my $eval = 3332 my $eval =
3170 "do {\n" 3333 "do {\n"
3171 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3334 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3172 . "#line 0 \"{$qcode}\"\n" 3335 . "#line 0 \"{$qcode}\"\n"
3173 . $code 3336 . $code
3174 . "\n}" 3337 . "\n}"
3175 ; 3338 ;
3176 3339
3340 if ($CFG{safe_eval}) {
3177 sub_generation_inc; 3341 sub_generation_inc;
3342 local @safe::cf::_safe_eval_args = values %vars;
3178 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3343 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3179 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 }
3180 3349
3181 if ($@) { 3350 if ($@) {
3182 warn "$@"; 3351 warn "$@",
3183 warn "while executing safe code '$code'\n"; 3352 "while executing safe code '$code'\n",
3184 warn "with arguments " . (join " ", %vars) . "\n"; 3353 "with arguments " . (join " ", %vars) . "\n";
3185 } 3354 }
3186 3355
3187 wantarray ? @res : $res[0] 3356 wantarray ? @res : $res[0]
3188} 3357}
3189 3358
3203=cut 3372=cut
3204 3373
3205sub register_script_function { 3374sub register_script_function {
3206 my ($fun, $cb) = @_; 3375 my ($fun, $cb) = @_;
3207 3376
3208 no strict 'refs'; 3377 $fun = "safe::$fun" if $CFG{safe_eval};
3209 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3378 *$fun = $safe_hole->wrap ($cb);
3210} 3379}
3211 3380
3212=back 3381=back
3213 3382
3214=cut 3383=cut
3223 # for this (global event?) 3392 # for this (global event?)
3224 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3225 3394
3226 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3395 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3227 3396
3228 warn "loading facedata from $path\n"; 3397 trace "loading facedata from $path\n";
3229 3398
3230 my $facedata;
3231 0 < aio_load $path, $facedata 3399 0 < aio_load $path, my $facedata
3232 or die "$path: $!"; 3400 or die "$path: $!";
3233 3401
3234 $facedata = Coro::Storable::thaw $facedata; 3402 $facedata = Coro::Storable::thaw $facedata;
3235 3403
3236 $facedata->{version} == 2 3404 $facedata->{version} == 2
3237 or cf::cleanup "$path: version mismatch, cannot proceed."; 3405 or cf::cleanup "$path: version mismatch, cannot proceed.";
3238 3406
3239 # 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]);
3240 $facedata->{resource}{"res/exp_table"} = { 3409 $facedata->{resource}{"res/exp_table"} = {
3241 type => FT_RSRC, 3410 type => FT_RSRC,
3242 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),
3243 }; 3413 };
3244 cf::cede_to_tick; 3414 cf::cede_to_tick;
3245 3415
3246 { 3416 {
3247 my $faces = $facedata->{faceinfo}; 3417 my $faces = $facedata->{faceinfo};
3249 while (my ($face, $info) = each %$faces) { 3419 while (my ($face, $info) = each %$faces) {
3250 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3420 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3251 3421
3252 cf::face::set_visibility $idx, $info->{visibility}; 3422 cf::face::set_visibility $idx, $info->{visibility};
3253 cf::face::set_magicmap $idx, $info->{magicmap}; 3423 cf::face::set_magicmap $idx, $info->{magicmap};
3254 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3424 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3255 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3425 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3256 3426
3257 cf::cede_to_tick; 3427 cf::cede_to_tick;
3258 } 3428 }
3259 3429
3260 while (my ($face, $info) = each %$faces) { 3430 while (my ($face, $info) = each %$faces) {
3265 3435
3266 if (my $smooth = cf::face::find $info->{smooth}) { 3436 if (my $smooth = cf::face::find $info->{smooth}) {
3267 cf::face::set_smooth $idx, $smooth; 3437 cf::face::set_smooth $idx, $smooth;
3268 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3438 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3269 } else { 3439 } else {
3270 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3440 error "smooth face '$info->{smooth}' not found for face '$face'";
3271 } 3441 }
3272 3442
3273 cf::cede_to_tick; 3443 cf::cede_to_tick;
3274 } 3444 }
3275 } 3445 }
3284 3454
3285 cf::anim::invalidate_all; # d'oh 3455 cf::anim::invalidate_all; # d'oh
3286 } 3456 }
3287 3457
3288 { 3458 {
3289 # TODO: for gcfclient pleasure, we should give resources
3290 # that gcfclient doesn't grok a >10000 face index.
3291 my $res = $facedata->{resource}; 3459 my $res = $facedata->{resource};
3292 3460
3293 while (my ($name, $info) = each %$res) { 3461 while (my ($name, $info) = each %$res) {
3294 if (defined $info->{type}) { 3462 if (defined $info->{type}) {
3295 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3463 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3296 my $data;
3297 3464
3298 if ($info->{type} & 1) { 3465 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3299 # prepend meta info
3300
3301 my $meta = $enc->encode ({
3302 name => $name,
3303 %{ $info->{meta} || {} },
3304 });
3305
3306 $data = pack "(w/a*)*", $meta, $info->{data};
3307 } else {
3308 $data = $info->{data};
3309 }
3310
3311 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3312 cf::face::set_type $idx, $info->{type}; 3466 cf::face::set_type $idx, $info->{type};
3313 } else { 3467 } else {
3314 $RESOURCE{$name} = $info; 3468 $RESOURCE{$name} = $info; # unused
3315 } 3469 }
3316 3470
3317 cf::cede_to_tick; 3471 cf::cede_to_tick;
3318 } 3472 }
3319 } 3473 }
3320 3474
3321 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3475 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3322 3476
3323 1 3477 1
3324} 3478}
3325
3326cf::global->attach (on_resource_update => sub {
3327 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3328 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3329
3330 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3331 my $sound = $soundconf->{compat}[$_]
3332 or next;
3333
3334 my $face = cf::face::find "sound/$sound->[1]";
3335 cf::sound::set $sound->[0] => $face;
3336 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3337 }
3338
3339 while (my ($k, $v) = each %{$soundconf->{event}}) {
3340 my $face = cf::face::find "sound/$v";
3341 cf::sound::set $k => $face;
3342 }
3343 }
3344});
3345 3479
3346register_exticmd fx_want => sub { 3480register_exticmd fx_want => sub {
3347 my ($ns, $want) = @_; 3481 my ($ns, $want) = @_;
3348 3482
3349 while (my ($k, $v) = each %$want) { 3483 while (my ($k, $v) = each %$want) {
3388sub reload_treasures { 3522sub reload_treasures {
3389 load_resource_file "$DATADIR/treasures" 3523 load_resource_file "$DATADIR/treasures"
3390 or die "unable to load treasurelists\n"; 3524 or die "unable to load treasurelists\n";
3391} 3525}
3392 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
3393sub reload_resources { 3550sub reload_resources {
3394 warn "reloading resource files...\n"; 3551 trace "reloading resource files...\n";
3395 3552
3553 reload_exp_table;
3554 reload_materials;
3396 reload_facedata; 3555 reload_facedata;
3556 reload_sound;
3397 reload_archetypes; 3557 reload_archetypes;
3398 reload_regions; 3558 reload_regions;
3399 reload_treasures; 3559 reload_treasures;
3400 3560
3401 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3402}
3403
3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
3409 reload_resources;
3410} 3562}
3411 3563
3412sub reload_config { 3564sub reload_config {
3413 open my $fh, "<:utf8", "$CONFDIR/config" 3565 trace "reloading config file...\n";
3414 or return;
3415 3566
3416 local $/; 3567 0 < aio_load "$CONFDIR/config", my $config
3417 *CFG = YAML::Load <$fh>; 3568 or die "$CONFDIR/config: $!";
3418 3569
3570 utf8::decode $config;
3571 *CFG = yaml_load $config;
3572
3419 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3420 3574
3421 $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};
3422 $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};
3423 3577
3424 if (exists $CFG{mlockall}) { 3578 if (exists $CFG{mlockall}) {
3428 }; 3582 };
3429 warn $@ if $@; 3583 warn $@ if $@;
3430 } 3584 }
3431} 3585}
3432 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
3433sub 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
3434 # we must not ever block the main coroutine 3625 # we must not ever block the main coroutine
3435 local $Coro::idle = sub { 3626 local $Coro::idle = sub {
3436 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#
3437 (async { 3628 (async {
3438 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3629 $Coro::current->{desc} = "IDLE BUG HANDLER";
3439 EV::loop EV::LOOP_ONESHOT; 3630 EV::loop EV::LOOP_ONESHOT;
3440 })->prio (Coro::PRIO_MAX); 3631 })->prio (Coro::PRIO_MAX);
3441 }; 3632 };
3442 3633
3443 { 3634 evthread_start IO::AIO::poll_fileno;
3444 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;
3445 reload_config; 3646 reload_config;
3446 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
3447 load_extensions; 3657 load_extensions;
3448 3658
3449 $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;
3450 } 3666 };
3451 3667
3452 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;
3453} 3677}
3454 3678
3455############################################################################# 3679#############################################################################
3456# initialisation and cleanup 3680# initialisation and cleanup
3457 3681
3458# install some emergency cleanup handlers 3682# install some emergency cleanup handlers
3459BEGIN { 3683BEGIN {
3460 our %SIGWATCHER = (); 3684 our %SIGWATCHER = ();
3461 for my $signal (qw(INT HUP TERM)) { 3685 for my $signal (qw(INT HUP TERM)) {
3462 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3686 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3463 cf::cleanup "SIG$signal"; 3687 cf::cleanup "SIG$signal";
3464 }; 3688 };
3465 } 3689 }
3466} 3690}
3467 3691
3468sub write_runtime_sync { 3692sub write_runtime_sync {
3469 my $runtime = "$LOCALDIR/runtime"; 3693 my $t0 = AE::time;
3470 3694
3471 # first touch the runtime file to show we are still running: 3695 # first touch the runtime file to show we are still running:
3472 # the fsync below can take a very very long time. 3696 # the fsync below can take a very very long time.
3473 3697
3474 IO::AIO::aio_utime $runtime, undef, undef; 3698 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3475 3699
3476 my $guard = cf::lock_acquire "write_runtime"; 3700 my $guard = cf::lock_acquire "write_runtime";
3477 3701
3478 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3702 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3479 or return; 3703 or return;
3480 3704
3481 my $value = $cf::RUNTIME + 90 + 10; 3705 my $value = $cf::RUNTIME + 90 + 10;
3482 # 10 is the runtime save interval, for a monotonic clock 3706 # 10 is the runtime save interval, for a monotonic clock
3483 # 60 allows for the watchdog to kill the server. 3707 # 60 allows for the watchdog to kill the server.
3493 aio_utime $fh, undef, undef; 3717 aio_utime $fh, undef, undef;
3494 3718
3495 close $fh 3719 close $fh
3496 or return; 3720 or return;
3497 3721
3498 aio_rename "$runtime~", $runtime 3722 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3499 and return; 3723 and return;
3500 3724
3501 warn "runtime file written.\n"; 3725 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3502 3726
3503 1 3727 1
3504} 3728}
3505 3729
3506our $uuid_lock; 3730our $uuid_lock;
3515 my $uuid = "$LOCALDIR/uuid"; 3739 my $uuid = "$LOCALDIR/uuid";
3516 3740
3517 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3741 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3518 or return; 3742 or return;
3519 3743
3520 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;
3521 $uuid_skip = 0; 3752 $uuid_skip = 0;
3522 3753
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3754 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return; 3755 and return;
3525 3756
3531 or return; 3762 or return;
3532 3763
3533 aio_rename "$uuid~", $uuid 3764 aio_rename "$uuid~", $uuid
3534 and return; 3765 and return;
3535 3766
3536 warn "uuid file written ($value).\n"; 3767 trace "uuid file written ($value).\n";
3537 3768
3538 1 3769 1
3539 3770
3540} 3771}
3541 3772
3547} 3778}
3548 3779
3549sub emergency_save() { 3780sub emergency_save() {
3550 my $freeze_guard = cf::freeze_mainloop; 3781 my $freeze_guard = cf::freeze_mainloop;
3551 3782
3552 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;
3553 3789
3554 cf::sync_job { 3790 cf::sync_job {
3791 cf::write_runtime_sync; # external watchdog should not bark
3792
3555 # use a peculiar iteration method to avoid tripping on perl 3793 # use a peculiar iteration method to avoid tripping on perl
3556 # refcount bugs in for. also avoids problems with players 3794 # refcount bugs in for. also avoids problems with players
3557 # and maps saved/destroyed asynchronously. 3795 # and maps saved/destroyed asynchronously.
3558 warn "begin emergency player save\n"; 3796 info "emergency_perl_save: begin player save\n";
3559 for my $login (keys %cf::PLAYER) { 3797 for my $login (keys %cf::PLAYER) {
3560 my $pl = $cf::PLAYER{$login} or next; 3798 my $pl = $cf::PLAYER{$login} or next;
3561 $pl->valid or next; 3799 $pl->valid or next;
3562 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3800 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3563 $pl->save; 3801 $pl->save;
3564 } 3802 }
3565 warn "end emergency player save\n"; 3803 info "emergency_perl_save: end player save\n";
3566 3804
3567 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";
3568 for my $path (keys %cf::MAP) { 3808 for my $path (keys %cf::MAP) {
3569 my $map = $cf::MAP{$path} or next; 3809 my $map = $cf::MAP{$path} or next;
3570 $map->valid or next; 3810 $map->valid or next;
3571 $map->save; 3811 $map->save;
3572 } 3812 }
3573 warn "end emergency map save\n"; 3813 info "emergency_perl_save: end map save\n";
3574 3814
3575 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";
3576 BDB::db_env_txn_checkpoint $DB_ENV; 3818 BDB::db_env_txn_checkpoint $DB_ENV;
3577 warn "end emergency database checkpoint\n"; 3819 info "emergency_perl_save: end database checkpoint\n";
3578 3820
3579 warn "begin write uuid\n"; 3821 info "emergency_perl_save: begin write uuid\n";
3580 write_uuid_sync 1; 3822 write_uuid_sync 1;
3581 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
3582 }; 3843 };
3583 3844
3584 warn "leave emergency perl save\n"; 3845 info "emergency_perl_save: leave\n";
3585} 3846}
3586 3847
3587sub post_cleanup { 3848sub post_cleanup {
3588 my ($make_core) = @_; 3849 my ($make_core) = @_;
3589 3850
3851 IO::AIO::flush;
3852
3590 warn Carp::longmess "post_cleanup backtrace" 3853 error Carp::longmess "post_cleanup backtrace"
3591 if $make_core; 3854 if $make_core;
3855
3856 my $fh = pidfile;
3857 unlink $PIDFILE if <$fh> == $$;
3592} 3858}
3593 3859
3594# a safer delete_package, copied from Symbol 3860# a safer delete_package, copied from Symbol
3595sub clear_package($) { 3861sub clear_package($) {
3596 my $pkg = shift; 3862 my $pkg = shift;
3612 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3878 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3613 for my $name (keys %$leaf_symtab) { 3879 for my $name (keys %$leaf_symtab) {
3614 _gv_clear *{"$pkg$name"}; 3880 _gv_clear *{"$pkg$name"};
3615# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3881# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3616 } 3882 }
3617 warn "cleared package #$pkg\n";#d#
3618} 3883}
3619
3620our $RELOAD; # how many times to reload
3621 3884
3622sub do_reload_perl() { 3885sub do_reload_perl() {
3623 # can/must only be called in main 3886 # can/must only be called in main
3624 if ($Coro::current != $Coro::main) { 3887 unless (in_main) {
3625 warn "can only reload from main coroutine"; 3888 error "can only reload from main coroutine";
3626 return; 3889 return;
3627 } 3890 }
3628 3891
3629 return if $RELOAD++; 3892 return if $RELOAD++;
3630 3893
3894 my $t1 = AE::time;
3895
3631 while ($RELOAD) { 3896 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl";
3632 warn "reloading..."; 3898 info "reloading...";
3633 3899
3634 warn "entering sync_job"; 3900 trace "entering sync_job";
3635 3901
3636 cf::sync_job { 3902 cf::sync_job {
3637 cf::write_runtime_sync; # external watchdog should not bark
3638 cf::emergency_save; 3903 #cf::emergency_save;
3639 cf::write_runtime_sync; # external watchdog should not bark
3640 3904
3641 warn "syncing database to disk";
3642 BDB::db_env_txn_checkpoint $DB_ENV;
3643
3644 # if anything goes wrong in here, we should simply crash as we already saved
3645
3646 warn "flushing outstanding aio requests";
3647 while (IO::AIO::nreqs || BDB::nreqs) {
3648 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3649 }
3650
3651 warn "cancelling all extension coros"; 3905 trace "cancelling all extension coros";
3652 $_->cancel for values %EXT_CORO; 3906 $_->cancel for values %EXT_CORO;
3653 %EXT_CORO = (); 3907 %EXT_CORO = ();
3654 3908
3655 warn "removing commands"; 3909 trace "removing commands";
3656 %COMMAND = (); 3910 %COMMAND = ();
3657 3911
3658 warn "removing ext/exti commands"; 3912 trace "removing ext/exti commands";
3659 %EXTCMD = (); 3913 %EXTCMD = ();
3660 %EXTICMD = (); 3914 %EXTICMD = ();
3661 3915
3662 warn "unloading/nuking all extensions"; 3916 trace "unloading/nuking all extensions";
3663 for my $pkg (@EXTS) { 3917 for my $pkg (@EXTS) {
3664 warn "... unloading $pkg"; 3918 trace "... unloading $pkg";
3665 3919
3666 if (my $cb = $pkg->can ("unload")) { 3920 if (my $cb = $pkg->can ("unload")) {
3667 eval { 3921 eval {
3668 $cb->($pkg); 3922 $cb->($pkg);
3669 1 3923 1
3670 } or warn "$pkg unloaded, but with errors: $@"; 3924 } or error "$pkg unloaded, but with errors: $@";
3671 } 3925 }
3672 3926
3673 warn "... clearing $pkg"; 3927 trace "... clearing $pkg";
3674 clear_package $pkg; 3928 clear_package $pkg;
3675 } 3929 }
3676 3930
3677 warn "unloading all perl modules loaded from $LIBDIR"; 3931 trace "unloading all perl modules loaded from $LIBDIR";
3678 while (my ($k, $v) = each %INC) { 3932 while (my ($k, $v) = each %INC) {
3679 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3680 3934
3681 warn "... unloading $k"; 3935 trace "... unloading $k";
3682 delete $INC{$k}; 3936 delete $INC{$k};
3683 3937
3684 $k =~ s/\.pm$//; 3938 $k =~ s/\.pm$//;
3685 $k =~ s/\//::/g; 3939 $k =~ s/\//::/g;
3686 3940
3689 } 3943 }
3690 3944
3691 clear_package $k; 3945 clear_package $k;
3692 } 3946 }
3693 3947
3694 warn "getting rid of safe::, as good as possible"; 3948 trace "getting rid of safe::, as good as possible";
3695 clear_package "safe::$_" 3949 clear_package "safe::$_"
3696 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);
3697 3951
3698 warn "unloading cf.pm \"a bit\""; 3952 trace "unloading cf.pm \"a bit\"";
3699 delete $INC{"cf.pm"}; 3953 delete $INC{"cf.pm"};
3700 delete $INC{"cf/pod.pm"}; 3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3701 3955
3702 # don't, removes xs symbols, too, 3956 # don't, removes xs symbols, too,
3703 # and global variables created in xs 3957 # and global variables created in xs
3704 #clear_package __PACKAGE__; 3958 #clear_package __PACKAGE__;
3705 3959
3706 warn "unload completed, starting to reload now"; 3960 info "unload completed, starting to reload now";
3707 3961
3708 warn "reloading cf.pm"; 3962 trace "reloading cf.pm";
3709 require cf; 3963 require cf;
3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3964 cf::_connect_to_perl_1;
3711 3965
3712 warn "loading config and database again"; 3966 trace "loading config and database again";
3713 cf::reload_config; 3967 cf::reload_config;
3714 3968
3715 warn "loading extensions"; 3969 trace "loading extensions";
3716 cf::load_extensions; 3970 cf::load_extensions;
3717 3971
3972 if ($REATTACH_ON_RELOAD) {
3718 warn "reattaching attachments to objects/players"; 3973 trace "reattaching attachments to objects/players";
3719 _global_reattach; # objects, sockets 3974 _global_reattach; # objects, sockets
3720 warn "reattaching attachments to maps"; 3975 trace "reattaching attachments to maps";
3721 reattach $_ for values %MAP; 3976 reattach $_ for values %MAP;
3722 warn "reattaching attachments to players"; 3977 trace "reattaching attachments to players";
3723 reattach $_ for values %PLAYER; 3978 reattach $_ for values %PLAYER;
3979 }
3724 3980
3981 trace "running post_init jobs";
3982 (pop @POST_INIT)->(1) while @POST_INIT;
3983
3725 warn "leaving sync_job"; 3984 trace "leaving sync_job";
3726 3985
3727 1 3986 1
3728 } or do { 3987 } or do {
3729 warn $@; 3988 error $@;
3730 cf::cleanup "error while reloading, exiting."; 3989 cf::cleanup "error while reloading, exiting.";
3731 }; 3990 };
3732 3991
3733 warn "reloaded"; 3992 info "reloaded";
3734 --$RELOAD; 3993 --$RELOAD;
3735 } 3994 }
3995
3996 $t1 = AE::time - $t1;
3997 info "reload completed in ${t1}s\n";
3736}; 3998};
3737 3999
3738our $RELOAD_WATCHER; # used only during reload 4000our $RELOAD_WATCHER; # used only during reload
3739 4001
3740sub reload_perl() { 4002sub reload_perl() {
3741 # doing reload synchronously and two reloads happen back-to-back, 4003 # doing reload synchronously and two reloads happen back-to-back,
3742 # coro crashes during coro_state_free->destroy here. 4004 # coro crashes during coro_state_free->destroy here.
3743 4005
4006 $RELOAD_WATCHER ||= cf::async {
4007 Coro::AIO::aio_wait cache_extensions;
4008
3744 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4009 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3745 do_reload_perl; 4010 do_reload_perl;
3746 undef $RELOAD_WATCHER; 4011 undef $RELOAD_WATCHER;
4012 };
3747 }; 4013 };
3748} 4014}
3749 4015
3750register_command "reload" => sub { 4016register_command "reload" => sub {
3751 my ($who, $arg) = @_; 4017 my ($who, $arg) = @_;
3757 reload_perl; 4023 reload_perl;
3758 }; 4024 };
3759 } 4025 }
3760}; 4026};
3761 4027
3762unshift @INC, $LIBDIR; 4028#############################################################################
3763 4029
3764my $bug_warning = 0; 4030my $bug_warning = 0;
3765 4031
3766our @WAIT_FOR_TICK; 4032our @WAIT_FOR_TICK;
3767our @WAIT_FOR_TICK_BEGIN; 4033our @WAIT_FOR_TICK_BEGIN;
3768 4034
3769sub wait_for_tick { 4035sub wait_for_tick() {
3770 return if tick_inhibit || $Coro::current == $Coro::main; 4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3771 4037
3772 my $signal = new Coro::Signal; 4038 my $signal = new Coro::Signal;
3773 push @WAIT_FOR_TICK, $signal; 4039 push @WAIT_FOR_TICK, $signal;
3774 $signal->wait; 4040 $signal->wait;
3775} 4041}
3776 4042
3777sub wait_for_tick_begin { 4043sub wait_for_tick_begin() {
3778 return if tick_inhibit || $Coro::current == $Coro::main; 4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3779 4045
3780 my $signal = new Coro::Signal; 4046 my $signal = new Coro::Signal;
3781 push @WAIT_FOR_TICK_BEGIN, $signal; 4047 push @WAIT_FOR_TICK_BEGIN, $signal;
3782 $signal->wait; 4048 $signal->wait;
3783} 4049}
3789 return; 4055 return;
3790 } 4056 }
3791 4057
3792 cf::server_tick; # one server iteration 4058 cf::server_tick; # one server iteration
3793 4059
4060 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4061
3794 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4062 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3795 $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.;
3796 Coro::async_pool { 4064 Coro::async_pool {
3797 $Coro::current->{desc} = "runtime saver"; 4065 $Coro::current->{desc} = "runtime saver";
3798 write_runtime_sync 4066 write_runtime_sync
3799 or warn "ERROR: unable to write runtime file: $!"; 4067 or error "ERROR: unable to write runtime file: $!";
3800 }; 4068 };
3801 } 4069 }
3802 4070
3803 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3804 $sig->send; 4072 $sig->send;
3812 4080
3813 if (0) { 4081 if (0) {
3814 if ($NEXT_TICK) { 4082 if ($NEXT_TICK) {
3815 my $jitter = $TICK_START - $NEXT_TICK; 4083 my $jitter = $TICK_START - $NEXT_TICK;
3816 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4084 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3817 warn "jitter $JITTER\n";#d# 4085 debug "jitter $JITTER\n";#d#
3818 } 4086 }
3819 } 4087 }
3820} 4088}
3821 4089
3822{ 4090{
3823 # configure BDB 4091 # configure BDB
3824 4092
3825 BDB::min_parallel 8; 4093 BDB::min_parallel 16;
3826 BDB::max_poll_reqs $TICK * 0.1; 4094 BDB::max_poll_reqs $TICK * 0.1;
3827 $AnyEvent::BDB::WATCHER->priority (1); 4095 $AnyEvent::BDB::WATCHER->priority (1);
3828 4096
3829 unless ($DB_ENV) { 4097 unless ($DB_ENV) {
3830 $DB_ENV = BDB::db_env_create; 4098 $DB_ENV = BDB::db_env_create;
3877 $msg =~ s/\n//; 4145 $msg =~ s/\n//;
3878 4146
3879 # limit the # of concurrent backtraces 4147 # limit the # of concurrent backtraces
3880 if ($_log_backtrace < 2) { 4148 if ($_log_backtrace < 2) {
3881 ++$_log_backtrace; 4149 ++$_log_backtrace;
4150 my $perl_bt = Carp::longmess $msg;
3882 async { 4151 async {
3883 $Coro::current->{desc} = "abt $msg"; 4152 $Coro::current->{desc} = "abt $msg";
3884 4153
3885 my @bt = fork_call { 4154 my @bt = fork_call {
3886 @addr = map { sprintf "%x", $_ } @addr; 4155 @addr = map { sprintf "%x", $_ } @addr;
3897 } 4166 }
3898 4167
3899 @funcs 4168 @funcs
3900 }; 4169 };
3901 4170
3902 LOG llevInfo, "[ABT] $msg\n"; 4171 LOG llevInfo, "[ABT] $perl_bt\n";
4172 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3903 LOG llevInfo, "[ABT] $_\n" for @bt; 4173 LOG llevInfo, "[ABT] $_\n" for @bt;
3904 --$_log_backtrace; 4174 --$_log_backtrace;
3905 }; 4175 };
3906 } else { 4176 } else {
3907 LOG llevInfo, "[ABT] $msg\n"; 4177 LOG llevInfo, "[ABT] $msg\n";
3908 LOG llevInfo, "[ABT] [suppressed]\n"; 4178 LOG llevInfo, "[ABT] [suppressed]\n";
3909 } 4179 }
3910} 4180}
3911 4181
3912# load additional modules 4182# load additional modules
3913use cf::pod; 4183require "cf/$_.pm" for @EXTRA_MODULES;
4184cf::_connect_to_perl_2;
3914 4185
3915END { cf::emergency_save } 4186END { cf::emergency_save }
3916 4187
39171 41881
3918 4189

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines