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.439 by root, Mon Jul 14 16:42:49 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 utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
35 36
37use Guard ();
36use Coro (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
39use Coro::AnyEvent; 42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
43use Coro::AnyEvent; 47use Coro::AnyEvent;
44use Coro::AIO; 48use Coro::AIO;
45use Coro::BDB 1.6; 49use Coro::BDB 1.6;
46use Coro::Storable; 50use Coro::Storable;
47use Coro::Util (); 51use Coro::Util ();
48 52
49use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
50use BDB (); 54use BDB ();
51use Data::Dumper; 55use Data::Dumper;
52use Digest::MD5;
53use Fcntl; 56use Fcntl;
54use YAML (); 57use YAML::XS ();
55use IO::AIO (); 58use IO::AIO ();
56use Time::HiRes; 59use Time::HiRes;
57use Compress::LZF; 60use Compress::LZF;
58use Digest::MD5 (); 61use Digest::MD5 ();
59 62
… …
61 64
62# configure various modules to our taste 65# configure various modules to our taste
63# 66#
64$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
65Coro::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";
66Compress::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
67 75
68$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" };
69 78
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
71 82
72our %COMMAND = (); 83our %COMMAND = ();
73our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
74 85
75our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
76our %EXTCMD = (); 87our %EXTCMD = ();
77our %EXTICMD = (); 88our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
80 91
81our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
83 96
84our $CONFDIR = confdir; 97our $CONFDIR = confdir;
85our $DATADIR = datadir; 98our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
89our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
95our %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;
96 118
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 121our $NEXT_TICK;
100our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
101 123
102our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 127our $DB_ENV;
106 128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
107our %CFG; 131our %CFG;
108 132
109our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 134our $RUNTIME;
111our $NOW; 135our $NOW;
… …
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 146our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
124 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
125binmode STDOUT; 154binmode STDOUT;
126binmode STDERR; 155binmode STDERR;
127 156
128# read virtual server time, if available 157# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
133} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
134 165
135mkdir $_ 166mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 168
138our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
139 170
140sub 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::"} };
141 187
142############################################################################# 188#############################################################################
143 189
144=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
145 191
… …
187from wherever your confdir points to. 233from wherever your confdir points to.
188 234
189=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
190 236
191These 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
192returns 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
193per 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.
194 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
195=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
196 247
197This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
198C<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
199that call. 250that call.
200 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
201=back 258=back
202 259
203=cut 260=cut
204 261
205BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
206 *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 {
207 my $msg = join "", @_; 269 my $msg = join "", @_;
208 270
209 $msg .= "\n" 271 $msg .= "\n"
210 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
211 273
212 $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;
213 275
214 LOG llevError, $msg; 276 LOG llevWarn, $msg;
215 }; 277};
216}
217 278
218$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
220 281
221 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d# 286 return;#d#
224 }#d# 287 }#d#
225 288
226 # kill coroutine otherwise 289 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate 290 Coro::terminate
229}; 291};
230
231$SIG{__DIE__} = sub { }; #d#?
232 292
233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
243for my $pkg (qw( 303for my $pkg (qw(
244 cf::global cf::attachable 304 cf::global cf::attachable
245 cf::object cf::object::player 305 cf::object cf::object::player
246 cf::client cf::player 306 cf::client cf::player
247 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
248 cf::map cf::party cf::region 309 cf::party cf::region
249)) { 310)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 312}
253 313
254$EV::DIED = sub { 314$EV::DIED = sub {
255 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
256}; 316};
257 317
258############################################################################# 318#############################################################################
259 319
260=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
… …
297our $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
298 358
299sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
301 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
302=item cf::lock_wait $string 388=item cf::lock_wait $string
303 389
304Wait until the given lock is available. See cf::lock_acquire. 390Wait until the given lock is available. See cf::lock_acquire.
305 391
306=item my $lock = cf::lock_acquire $string 392=item my $lock = cf::lock_acquire $string
307 393
308Wait 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
309a 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,
310for example when the coroutine gets canceled), the lock is automatically 396for example when the coroutine gets canceled), the lock is automatically
311returned. 397returned.
312 398
313Locks 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
314deadlocked coro. 400deadlocked coro.
… …
320 406
321Return 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.
322 408
323=cut 409=cut
324 410
325our %LOCK; 411our $LOCKS = new Coro::SemaphoreSet;
326our %LOCKER;#d#
327 412
328sub lock_wait($) { 413sub lock_wait($) {
329 my ($key) = @_; 414 $LOCKS->wait ($_[0]);
330
331 if ($LOCKER{$key} == $Coro::current) {#d#
332 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
333 return;#d#
334 }#d#
335
336 # wait for lock, if any
337 while ($LOCK{$key}) {
338 push @{ $LOCK{$key} }, $Coro::current;
339 Coro::schedule;
340 }
341} 415}
342 416
343sub lock_acquire($) { 417sub lock_acquire($) {
344 my ($key) = @_; 418 $LOCKS->guard ($_[0])
345
346 # wait, to be sure we are not locked
347 lock_wait $key;
348
349 $LOCK{$key} = [];
350 $LOCKER{$key} = $Coro::current;#d#
351
352 Coro::guard {
353 delete $LOCKER{$key};#d#
354 # wake up all waiters, to be on the safe side
355 $_->ready for @{ delete $LOCK{$key} };
356 }
357} 419}
358 420
359sub lock_active($) { 421sub lock_active($) {
360 my ($key) = @_; 422 $LOCKS->count ($_[0]) < 1
361
362 ! ! $LOCK{$key}
363} 423}
364 424
365sub freeze_mainloop { 425sub freeze_mainloop {
366 tick_inhibit_inc; 426 tick_inhibit_inc;
367 427
368 Coro::guard \&tick_inhibit_dec; 428 &Guard::guard (\&tick_inhibit_dec);
369} 429}
370 430
371=item cf::periodic $interval, $cb 431=item cf::periodic $interval, $cb
372 432
373Like 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
374get spread over timer. 434get spread over time.
375 435
376=cut 436=cut
377 437
378sub periodic($$) { 438sub periodic($$) {
379 my ($interval, $cb) = @_; 439 my ($interval, $cb) = @_;
… …
396 456
397=cut 457=cut
398 458
399our @SLOT_QUEUE; 459our @SLOT_QUEUE;
400our $SLOT_QUEUE; 460our $SLOT_QUEUE;
461our $SLOT_DECAY = 0.9;
401 462
402$SLOT_QUEUE->cancel if $SLOT_QUEUE; 463$SLOT_QUEUE->cancel if $SLOT_QUEUE;
403$SLOT_QUEUE = Coro::async { 464$SLOT_QUEUE = Coro::async {
404 $Coro::current->desc ("timeslot manager"); 465 $Coro::current->desc ("timeslot manager");
405 466
406 my $signal = new Coro::Signal; 467 my $signal = new Coro::Signal;
468 my $busy;
407 469
408 while () { 470 while () {
409 next_job: 471 next_job:
472
410 my $avail = cf::till_tick; 473 my $avail = cf::till_tick;
411 if ($avail > 0.01) { 474
412 for (0 .. $#SLOT_QUEUE) { 475 for (0 .. $#SLOT_QUEUE) {
413 if ($SLOT_QUEUE[$_][0] < $avail) { 476 if ($SLOT_QUEUE[$_][0] <= $avail) {
477 $busy = 0;
414 my $job = splice @SLOT_QUEUE, $_, 1, (); 478 my $job = splice @SLOT_QUEUE, $_, 1, ();
415 $job->[2]->send; 479 $job->[2]->send;
416 Coro::cede; 480 Coro::cede;
417 goto next_job; 481 goto next_job;
418 } 482 } else {
483 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
419 } 484 }
420 } 485 }
421 486
422 if (@SLOT_QUEUE) { 487 if (@SLOT_QUEUE) {
423 # 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
424 push @cf::WAIT_FOR_TICK, $signal; 489 push @cf::WAIT_FOR_TICK, $signal;
425 $signal->wait; 490 $signal->wait;
426 } else { 491 } else {
492 $busy = 0;
427 Coro::schedule; 493 Coro::schedule;
428 } 494 }
429 } 495 }
430}; 496};
431 497
432sub get_slot($;$$) { 498sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main; 499 return if tick_inhibit || $Coro::current == $Coro::main;
434 500
435 my ($time, $pri, $name) = @_; 501 my ($time, $pri, $name) = @_;
436 502
437 $time = $TICK * .6 if $time > $TICK * .6; 503 $time = clamp $time, 0.01, $TICK * .6;
504
438 my $sig = new Coro::Signal; 505 my $sig = new Coro::Signal;
439 506
440 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 507 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
441 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 508 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
442 $SLOT_QUEUE->ready; 509 $SLOT_QUEUE->ready;
… …
468=cut 535=cut
469 536
470sub sync_job(&) { 537sub sync_job(&) {
471 my ($job) = @_; 538 my ($job) = @_;
472 539
473 if ($Coro::current == $Coro::main) { 540 if (in_main) {
474 my $time = EV::time; 541 my $time = AE::time;
475 542
476 # this is the main coro, too bad, we have to block 543 # this is the main coro, too bad, we have to block
477 # till the operation succeeds, freezing the server :/ 544 # till the operation succeeds, freezing the server :/
478 545
479 LOG llevError, Carp::longmess "sync job";#d# 546 #LOG llevError, Carp::longmess "sync job";#d#
480 547
481 my $freeze_guard = freeze_mainloop; 548 my $freeze_guard = freeze_mainloop;
482 549
483 my $busy = 1; 550 my $busy = 1;
484 my @res; 551 my @res;
485 552
486 (async { 553 (async {
487 $Coro::current->desc ("sync job coro"); 554 $Coro::current->desc ("sync job coro");
488 @res = eval { $job->() }; 555 @res = eval { $job->() };
489 warn $@ if $@; 556 error $@ if $@;
490 undef $busy; 557 undef $busy;
491 })->prio (Coro::PRIO_MAX); 558 })->prio (Coro::PRIO_MAX);
492 559
493 while ($busy) { 560 while ($busy) {
494 if (Coro::nready) { 561 if (Coro::nready) {
… …
496 } else { 563 } else {
497 EV::loop EV::LOOP_ONESHOT; 564 EV::loop EV::LOOP_ONESHOT;
498 } 565 }
499 } 566 }
500 567
501 my $time = EV::time - $time; 568 my $time = AE::time - $time;
502 569
503 $TICK_START += $time; # do not account sync jobs to server load 570 $TICK_START += $time; # do not account sync jobs to server load
504 571
505 wantarray ? @res : $res[0] 572 wantarray ? @res : $res[0]
506 } else { 573 } else {
… …
528 $EXT_CORO{$coro+0} = $coro; 595 $EXT_CORO{$coro+0} = $coro;
529 596
530 $coro 597 $coro
531} 598}
532 599
533=item fork_call { }, $args 600=item fork_call { }, @args
534 601
535Executes the given code block with the given arguments in a seperate 602Executes the given code block with the given arguments in a seperate
536process, returning the results. Everything must be serialisable with 603process, returning the results. Everything must be serialisable with
537Coro::Storable. May, of course, block. Note that the executed sub may 604Coro::Storable. May, of course, block. Note that the executed sub may
538never block itself or use any form of event handling. 605never block itself or use any form of event handling.
539 606
540=cut 607=cut
541 608
609sub post_fork {
610 reset_signals;
611}
612
542sub fork_call(&@) { 613sub fork_call(&@) {
543 my ($cb, @args) = @_; 614 my ($cb, @args) = @_;
544 615
545 # 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,
546 # otherwise perl prematurely frees the stuff :/ 617 # otherwise perl prematurely frees the stuff :/
547 # TODO: investigate and fix (likely this will be rather laborious) 618 # TODO: investigate and fix (likely this will be rather laborious)
548 619
549 my @res = Coro::Util::fork_eval { 620 my @res = Coro::Util::fork_eval {
550 reset_signals; 621 cf::post_fork;
551 &$cb 622 &$cb
552 }, @args; 623 } @args;
553 624
554 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 )
555} 637}
556 638
557=item $coin = coin_from_name $name 639=item $coin = coin_from_name $name
558 640
559=cut 641=cut
… …
596within each server. 678within each server.
597 679
598=cut 680=cut
599 681
600sub db_table($) { 682sub db_table($) {
683 cf::error "db_get called from main context"
684 if $Coro::current == $Coro::main;
685
601 my ($name) = @_; 686 my ($name) = @_;
602 my $db = BDB::db_create $DB_ENV; 687 my $db = BDB::db_create $DB_ENV;
603 688
604 eval { 689 eval {
605 $db->set_flags (BDB::CHKSUM); 690 $db->set_flags (BDB::CHKSUM);
… …
615} 700}
616 701
617our $DB; 702our $DB;
618 703
619sub db_init { 704sub db_init {
620 cf::sync_job {
621 $DB ||= db_table "db"; 705 $DB ||= db_table "db";
622 };
623} 706}
624 707
625sub db_get($$) { 708sub db_get($$) {
626 my $key = "$_[0]/$_[1]"; 709 my $key = "$_[0]/$_[1]";
627 710
628 cf::sync_job { 711 cf::error "db_get called from main context"
712 if $Coro::current == $Coro::main;
713
629 BDB::db_get $DB, undef, $key, my $data; 714 BDB::db_get $DB, undef, $key, my $data;
630 715
631 $! ? () 716 $! ? ()
632 : $data 717 : $data
633 }
634} 718}
635 719
636sub db_put($$$) { 720sub db_put($$$) {
637 BDB::dbreq_pri 4; 721 BDB::dbreq_pri 4;
638 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 722 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
694 778
695 my $t1 = Time::HiRes::time; 779 my $t1 = Time::HiRes::time;
696 my $data = $process->(\@data); 780 my $data = $process->(\@data);
697 my $t2 = Time::HiRes::time; 781 my $t2 = Time::HiRes::time;
698 782
699 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 783 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
700 784
701 db_put cache => "$id/data", $data; 785 db_put cache => "$id/data", $data;
702 db_put cache => "$id/md5" , $md5; 786 db_put cache => "$id/md5" , $md5;
703 db_put cache => "$id/meta", $meta; 787 db_put cache => "$id/meta", $meta;
704 788
… …
714 798
715=cut 799=cut
716 800
717sub datalog($@) { 801sub datalog($@) {
718 my ($type, %kv) = @_; 802 my ($type, %kv) = @_;
719 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 803 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
720} 804}
721 805
722=back 806=back
723 807
724=cut 808=cut
725 809
726############################################################################# 810#############################################################################
727 811
728=head2 ATTACHABLE OBJECTS 812=head2 ATTACHABLE OBJECTS
729 813
730Many 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
731attach callbacks/event handlers (a collection of which is called an "attachment") 815attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 816to it. All such attachable objects support the following methods.
733 817
734In 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>
735C<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
… …
785=item cf::CLASS::attachment $name, ... 869=item cf::CLASS::attachment $name, ...
786 870
787Register an attachment by C<$name> through which attachable objects of the 871Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 872given CLASS can refer to this attachment.
789 873
790Some classes such as crossfire maps and objects can specify attachments 874Some classes such as deliantra maps and objects can specify attachments
791that 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.
792 876
793These calls expect any number of the following handler/hook descriptions: 877These calls expect any number of the following handler/hook descriptions:
794 878
795=over 4 879=over 4
… …
919 1003
920 } elsif (exists $cb_id{$type}) { 1004 } elsif (exists $cb_id{$type}) {
921 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1005 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
922 1006
923 } elsif (ref $type) { 1007 } elsif (ref $type) {
924 warn "attaching objects not supported, ignoring.\n"; 1008 error "attaching objects not supported, ignoring.\n";
925 1009
926 } else { 1010 } else {
927 shift @arg; 1011 shift @arg;
928 warn "attach argument '$type' not supported, ignoring.\n"; 1012 error "attach argument '$type' not supported, ignoring.\n";
929 } 1013 }
930 } 1014 }
931} 1015}
932 1016
933sub _object_attach { 1017sub _object_attach {
… …
943 _attach $registry, $klass, @attach; 1027 _attach $registry, $klass, @attach;
944 } 1028 }
945 1029
946 $obj->{$name} = \%arg; 1030 $obj->{$name} = \%arg;
947 } else { 1031 } else {
948 warn "object uses attachment '$name' which is not available, postponing.\n"; 1032 info "object uses attachment '$name' which is not available, postponing.\n";
949 } 1033 }
950 1034
951 $obj->{_attachment}{$name} = undef; 1035 $obj->{_attachment}{$name} = undef;
952} 1036}
953 1037
… …
1012 1096
1013 for (@$callbacks) { 1097 for (@$callbacks) {
1014 eval { &{$_->[1]} }; 1098 eval { &{$_->[1]} };
1015 1099
1016 if ($@) { 1100 if ($@) {
1017 warn "$@";
1018 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1101 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1019 override; 1102 override;
1020 } 1103 }
1021 1104
1022 return 1 if $override; 1105 return 1 if $override;
1023 } 1106 }
… …
1086 1169
1087sub reattach { 1170sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1171 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1172 my ($obj) = @_;
1090 1173
1174 # no longer needed after getting rid of delete_package?
1091 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1175 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1092 1176
1093 my $registry = $obj->registry; 1177 my $registry = $obj->registry;
1094 1178
1095 @$registry = (); 1179 @$registry = ();
1096 1180
… …
1101 for (@$attach) { 1185 for (@$attach) {
1102 my ($klass, @attach) = @$_; 1186 my ($klass, @attach) = @$_;
1103 _attach $registry, $klass, @attach; 1187 _attach $registry, $klass, @attach;
1104 } 1188 }
1105 } else { 1189 } else {
1106 warn "object uses attachment '$name' that is not available, postponing.\n"; 1190 info "object uses attachment '$name' that is not available, postponing.\n";
1107 } 1191 }
1108 } 1192 }
1109} 1193}
1110 1194
1111cf::attachable->attach ( 1195cf::attachable->attach (
… …
1138 my ($filename, $rdata, $objs) = @_; 1222 my ($filename, $rdata, $objs) = @_;
1139 1223
1140 sync_job { 1224 sync_job {
1141 if (length $$rdata) { 1225 if (length $$rdata) {
1142 utf8::decode (my $decname = $filename); 1226 utf8::decode (my $decname = $filename);
1143 warn sprintf "saving %s (%d,%d)\n", 1227 trace sprintf "saving %s (%d,%d)\n",
1144 $decname, length $$rdata, scalar @$objs; 1228 $decname, length $$rdata, scalar @$objs
1229 if $VERBOSE_IO;
1145 1230
1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1231 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1147 aio_chmod $fh, SAVE_MODE; 1232 aio_chmod $fh, SAVE_MODE;
1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1233 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1149 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 }
1150 aio_close $fh; 1238 aio_close $fh;
1151 1239
1152 if (@$objs) { 1240 if (@$objs) {
1153 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) {
1154 aio_chmod $fh, SAVE_MODE; 1242 aio_chmod $fh, SAVE_MODE;
1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1243 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1156 aio_write $fh, 0, (length $data), $data, 0; 1244 aio_write $fh, 0, (length $data), $data, 0;
1157 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 }
1158 aio_close $fh; 1249 aio_close $fh;
1159 aio_rename "$filename.pst~", "$filename.pst"; 1250 aio_rename "$filename.pst~", "$filename.pst";
1160 } 1251 }
1161 } else { 1252 } else {
1162 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1163 } 1254 }
1164 1255
1165 aio_rename "$filename~", $filename; 1256 aio_rename "$filename~", $filename;
1257
1258 $filename =~ s%/[^/]+$%%;
1259 aio_pathsync $filename if $cf::USE_FSYNC;
1166 } else { 1260 } else {
1167 warn "FATAL: $filename~: $!\n"; 1261 error "unable to save objects: $filename~: $!\n";
1168 } 1262 }
1169 } else { 1263 } else {
1170 aio_unlink $filename; 1264 aio_unlink $filename;
1171 aio_unlink "$filename.pst"; 1265 aio_unlink "$filename.pst";
1172 } 1266 }
… …
1196 my $st = eval { Coro::Storable::thaw $av }; 1290 my $st = eval { Coro::Storable::thaw $av };
1197 $av = $st->{objs}; 1291 $av = $st->{objs};
1198 } 1292 }
1199 1293
1200 utf8::decode (my $decname = $filename); 1294 utf8::decode (my $decname = $filename);
1201 warn sprintf "loading %s (%d,%d)\n", 1295 trace sprintf "loading %s (%d,%d)\n",
1202 $decname, length $data, scalar @{$av || []}; 1296 $decname, length $data, scalar @{$av || []}
1297 if $VERBOSE_IO;
1203 1298
1204 ($data, $av) 1299 ($data, $av)
1205} 1300}
1206 1301
1207=head2 COMMAND CALLBACKS 1302=head2 COMMAND CALLBACKS
… …
1263 my ($name, $cb) = @_; 1358 my ($name, $cb) = @_;
1264 1359
1265 $EXTICMD{$name} = $cb; 1360 $EXTICMD{$name} = $cb;
1266} 1361}
1267 1362
1363use File::Glob ();
1364
1268cf::player->attach ( 1365cf::player->attach (
1269 on_command => sub { 1366 on_unknown_command => sub {
1270 my ($pl, $name, $params) = @_; 1367 my ($pl, $name, $params) = @_;
1271 1368
1272 my $cb = $COMMAND{$name} 1369 my $cb = $COMMAND{$name}
1273 or return; 1370 or return;
1274 1371
… …
1297 1394
1298 $pl->ext_reply ($reply, @reply) 1395 $pl->ext_reply ($reply, @reply)
1299 if $reply; 1396 if $reply;
1300 1397
1301 } else { 1398 } else {
1302 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1399 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1303 } 1400 }
1304 1401
1305 cf::override; 1402 cf::override;
1306 }, 1403 },
1307); 1404);
1308 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
1309sub load_extensions { 1419sub load_extensions {
1420 info "loading extensions...";
1421
1310 cf::sync_job { 1422 cf::sync_job {
1311 my %todo; 1423 my %todo;
1312 1424
1313 for my $path (<$LIBDIR/*.ext>) { 1425 for my $path (<$LIBDIR/*.ext>) {
1314 next unless -r $path; 1426 next unless -r $path;
… …
1332 1444
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1445 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1446 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1447
1336 $ext{source} = 1448 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1449 "package $pkg; use common::sense;\n"
1338 . "#line 1 \"$path\"\n{\n" 1450 . "#line 1 \"$path\"\n{\n"
1339 . $source 1451 . $source
1340 . "\n};\n1"; 1452 . "\n};\n1";
1341 1453
1342 $todo{$base} = \%ext; 1454 $todo{$base} = \%ext;
1343 } 1455 }
1344 1456
1457 my $pass = 0;
1345 my %done; 1458 my %done;
1346 while (%todo) { 1459 while (%todo) {
1347 my $progress; 1460 my $progress;
1348 1461
1462 ++$pass;
1463
1464 ext:
1349 while (my ($k, $v) = each %todo) { 1465 while (my ($k, $v) = each %todo) {
1350 for (split /,\s*/, $v->{meta}{depends}) { 1466 for (split /,\s*/, $v->{meta}{depends}) {
1351 goto skip 1467 next ext
1352 unless exists $done{$_}; 1468 unless exists $done{$_};
1353 } 1469 }
1354 1470
1355 warn "... loading '$k' into '$v->{pkg}'\n"; 1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1356 1472
1357 unless (eval $v->{source}) { 1473 my $active = eval $v->{source};
1474
1475 if (length $@) {
1358 my $msg = $@ ? "$v->{path}: $@\n" 1476 error "$v->{path}: $@\n";
1359 : "$v->{base}: extension inactive.\n";
1360 1477
1361 if (exists $v->{meta}{mandatory}) {
1362 warn $msg;
1363 cf::cleanup "mandatory extension failed to load, exiting."; 1478 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1364 } 1479 if exists $v->{meta}{mandatory};
1365 1480
1366 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;
1367 } 1490 }
1368
1369 $done{$k} = delete $todo{$k};
1370 push @EXTS, $v->{pkg};
1371 $progress = 1;
1372 } 1491 }
1373 1492
1374 skip: 1493 unless ($progress) {
1375 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1494 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1376 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 }
1377 } 1501 }
1378 }; 1502 };
1379} 1503}
1380 1504
1381############################################################################# 1505#############################################################################
1382 1506
1383=back 1507=back
1384 1508
1385=head2 CORE EXTENSIONS 1509=head2 CORE EXTENSIONS
1386 1510
1387Functions and methods that extend core crossfire objects. 1511Functions and methods that extend core deliantra objects.
1388 1512
1389=cut 1513=cut
1390 1514
1391package cf::player; 1515package cf::player;
1392 1516
… …
1435 1559
1436sub exists($) { 1560sub exists($) {
1437 my ($login) = @_; 1561 my ($login) = @_;
1438 1562
1439 $cf::PLAYER{$login} 1563 $cf::PLAYER{$login}
1440 or cf::sync_job { !aio_stat path $login } 1564 or !aio_stat path $login
1441} 1565}
1442 1566
1443sub find($) { 1567sub find($) {
1444 return $cf::PLAYER{$_[0]} || do { 1568 return $cf::PLAYER{$_[0]} || do {
1445 my $login = $_[0]; 1569 my $login = $_[0];
… …
1465 $cf::PLAYER{$login} = $pl 1589 $cf::PLAYER{$login} = $pl
1466 } 1590 }
1467 } 1591 }
1468} 1592}
1469 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
1470sub save($) { 1607sub save($) {
1471 my ($pl) = @_; 1608 my ($pl) = @_;
1472 1609
1473 return if $pl->{deny_save}; 1610 return if $pl->{deny_save};
1474 1611
… …
1479 1616
1480 aio_mkdir playerdir $pl, 0770; 1617 aio_mkdir playerdir $pl, 0770;
1481 $pl->{last_save} = $cf::RUNTIME; 1618 $pl->{last_save} = $cf::RUNTIME;
1482 1619
1483 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];
1484 1624
1485 $pl->save_pl ($path); 1625 $pl->save_pl ($path);
1486 cf::cede_to_tick; 1626 cf::cede_to_tick;
1487} 1627}
1488 1628
… …
1520 my ($pl) = @_; 1660 my ($pl) = @_;
1521 1661
1522 my $name = $pl->ob->name; 1662 my $name = $pl->ob->name;
1523 1663
1524 $pl->{deny_save} = 1; 1664 $pl->{deny_save} = 1;
1525 $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
1526 1666
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1528 $pl->deactivate; 1668 $pl->deactivate;
1669
1529 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;
1530 $pl->ob->check_score;
1531 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1671 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1672 ext::highscore::check ($pl->ob);
1673
1532 $pl->ns->destroy if $pl->ns; 1674 $pl->ns->destroy if $pl->ns;
1533 1675
1534 my $path = playerdir $pl; 1676 my $path = playerdir $pl;
1535 my $temp = "$path~$cf::RUNTIME~deleting~"; 1677 my $temp = "$path~$cf::RUNTIME~deleting~";
1536 aio_rename $path, $temp; 1678 aio_rename $path, $temp;
… …
1590 \@logins 1732 \@logins
1591} 1733}
1592 1734
1593=item $player->maps 1735=item $player->maps
1594 1736
1737=item cf::player::maps $login
1738
1595Returns an arrayref of map paths that are private for this 1739Returns an arrayref of map paths that are private for this
1596player. May block. 1740player. May block.
1597 1741
1598=cut 1742=cut
1599 1743
… …
1616 } 1760 }
1617 1761
1618 \@paths 1762 \@paths
1619} 1763}
1620 1764
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1765=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1766
1623Expand crossfire pod fragments into protocol xml. 1767Expand deliantra pod fragments into protocol xml.
1624
1625=cut
1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1638sub expand_cfpod {
1639 my ($self, $pod) = @_;
1640
1641 my $xml;
1642
1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1646
1647 $group =~ s/&/&amp;/g;
1648 $group =~ s/</&lt;/g;
1649
1650 $xml .= $group;
1651 } elsif ($pod =~ m%\G
1652 ([BCGHITU])
1653 <
1654 (?:
1655 ([^<>]*) (?{ $group = $^N })
1656 | < $interior >
1657 )
1658 >
1659 %gcsx
1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1680 "")
1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1692
1693 for ($xml) {
1694 # create single paragraphs (very hackish)
1695 s/(?<=\S)\n(?=\w)/ /g;
1696
1697 # compress some whitespace
1698 s/\s+\n/\n/g; # ws line-ends
1699 s/\n\n+/\n/g; # double lines
1700 s/^\n+//; # beginning lines
1701 s/\n+$//; # ending lines
1702 }
1703
1704 $xml
1705}
1706
1707no re 'eval';
1708
1709sub hintmode {
1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1711 $_[0]{hintmode}
1712}
1713 1768
1714=item $player->ext_reply ($msgid, @msg) 1769=item $player->ext_reply ($msgid, @msg)
1715 1770
1716Sends an ext reply to the player. 1771Sends an ext reply to the player.
1717 1772
… …
1749 1804
1750=cut 1805=cut
1751 1806
1752sub find_by_path($) { 1807sub find_by_path($) {
1753 my ($path) = @_; 1808 my ($path) = @_;
1809
1810 $path =~ s/^~[^\/]*//; # skip ~login
1754 1811
1755 my ($match, $specificity); 1812 my ($match, $specificity);
1756 1813
1757 for my $region (list) { 1814 for my $region (list) {
1758 if ($region->{match} && $path =~ $region->{match}) { 1815 if ($region->{match} && $path =~ $region->{match}) {
… …
1790 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
1791 1848
1792 # mit "rum" bekleckern, nicht 1849 # mit "rum" bekleckern, nicht
1793 $self->_create_random_map ( 1850 $self->_create_random_map (
1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1851 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1852 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1853 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1797 $rmp->{exit_on_final_map}, 1854 $rmp->{exit_on_final_map},
1798 $rmp->{xsize}, $rmp->{ysize}, 1855 $rmp->{xsize}, $rmp->{ysize},
1799 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1856 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1800 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1857 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1815 1872
1816sub register { 1873sub register {
1817 my (undef, $regex, $prio) = @_; 1874 my (undef, $regex, $prio) = @_;
1818 my $pkg = caller; 1875 my $pkg = caller;
1819 1876
1820 no strict;
1821 push @{"$pkg\::ISA"}, __PACKAGE__; 1877 push @{"$pkg\::ISA"}, __PACKAGE__;
1822 1878
1823 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1879 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1824} 1880}
1825 1881
1826# also paths starting with '/' 1882# also paths starting with '/'
1827$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1883$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1828 1884
1829sub thawer_merge { 1885sub thawer_merge {
1830 my ($self, $merge) = @_; 1886 my ($self, $merge) = @_;
1831 1887
1832 # we have to keep some variables in memory intact 1888 # we have to keep some variables in memory intact
… …
1837} 1893}
1838 1894
1839sub normalise { 1895sub normalise {
1840 my ($path, $base) = @_; 1896 my ($path, $base) = @_;
1841 1897
1842 $path = "$path"; # make sure its a string 1898 $path = "$path"; # make sure it's a string
1843 1899
1844 $path =~ s/\.map$//; 1900 $path =~ s/\.map$//;
1845 1901
1846 # map plan: 1902 # map plan:
1847 # 1903 #
… …
1886 $self->init; # pass $1 etc. 1942 $self->init; # pass $1 etc.
1887 return $self; 1943 return $self;
1888 } 1944 }
1889 } 1945 }
1890 1946
1891 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1947 Carp::cluck "unable to resolve path '$path' (base '$base')";
1892 () 1948 ()
1893} 1949}
1894 1950
1895sub init { 1951sub init {
1896 my ($self) = @_; 1952 my ($self) = @_;
… …
1928sub uniq_path { 1984sub uniq_path {
1929 my ($self) = @_; 1985 my ($self) = @_;
1930 1986
1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1987 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932 "$UNIQUEDIR/$path" 1988 "$UNIQUEDIR/$path"
1933}
1934
1935# and all this just because we cannot iterate over
1936# all maps in C++...
1937sub change_all_map_light {
1938 my ($change) = @_;
1939
1940 $_->change_map_light ($change)
1941 for grep $_->outdoor, values %cf::MAP;
1942} 1989}
1943 1990
1944sub decay_objects { 1991sub decay_objects {
1945 my ($self) = @_; 1992 my ($self) = @_;
1946 1993
… …
2028 2075
2029sub find; 2076sub find;
2030sub find { 2077sub find {
2031 my ($path, $origin) = @_; 2078 my ($path, $origin) = @_;
2032 2079
2080 cf::cede_to_tick;
2081
2033 $path = normalise $path, $origin && $origin->path; 2082 $path = normalise $path, $origin && $origin->path;
2034 2083
2035 cf::lock_wait "map_data:$path";#d#remove 2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 cf::lock_wait "map_find:$path"; 2085 my $guard2 = cf::lock_acquire "map_find:$path";
2037 2086
2038 $cf::MAP{$path} || do { 2087 $cf::MAP{$path} || do {
2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
2041
2042 my $map = new_from_path cf::map $path 2088 my $map = new_from_path cf::map $path
2043 or return; 2089 or return;
2044 2090
2045 $map->{last_save} = $cf::RUNTIME; 2091 $map->{last_save} = $cf::RUNTIME;
2046 2092
… …
2058 2104
2059 $cf::MAP{$path} = $map 2105 $cf::MAP{$path} = $map
2060 } 2106 }
2061} 2107}
2062 2108
2063sub pre_load { } 2109sub pre_load { }
2064sub post_load { } 2110#sub post_load { } # XS
2065 2111
2066sub load { 2112sub load {
2067 my ($self) = @_; 2113 my ($self) = @_;
2068 2114
2069 local $self->{deny_reset} = 1; # loading can take a long time 2115 local $self->{deny_reset} = 1; # loading can take a long time
… …
2114 unless ($self->{deny_activate}) { 2160 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2161 $self->decay_objects;
2116 $self->fix_auto_apply; 2162 $self->fix_auto_apply;
2117 $self->update_buttons; 2163 $self->update_buttons;
2118 cf::cede_to_tick; 2164 cf::cede_to_tick;
2119 $self->set_darkness_map;
2120 cf::cede_to_tick;
2121 $self->activate; 2165 $self->activate;
2122 } 2166 }
2123 2167
2124 $self->{last_save} = $cf::RUNTIME; 2168 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME); 2169 $self->last_access ($cf::RUNTIME);
… …
2128 } 2172 }
2129 2173
2130 $self->post_load; 2174 $self->post_load;
2131} 2175}
2132 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
2133sub customise_for { 2180sub customise_for {
2134 my ($self, $ob) = @_; 2181 my ($self, $ob) = @_;
2135 2182
2136 return find "~" . $ob->name . "/" . $self->{path} 2183 return find "~" . $ob->name . "/" . $self->{path}
2137 if $self->per_player; 2184 if $self->per_player;
… …
2153 or next; 2200 or next;
2154 $neigh = find $neigh, $map 2201 $neigh = find $neigh, $map
2155 or next; 2202 or next;
2156 $neigh->load; 2203 $neigh->load;
2157 2204
2205 # now find the diagonal neighbours
2158 push @neigh, 2206 push @neigh,
2159 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2160 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2161 } 2209 }
2162 2210
… …
2169} 2217}
2170 2218
2171sub find_sync { 2219sub find_sync {
2172 my ($path, $origin) = @_; 2220 my ($path, $origin) = @_;
2173 2221
2174 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
2175} 2226}
2176 2227
2177sub do_load_sync { 2228sub do_load_sync {
2178 my ($map) = @_; 2229 my ($map) = @_;
2179 2230
2180 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2181 if $Coro::current == $Coro::main; 2232 if $Coro::current == $Coro::main;
2182 2233
2183 cf::sync_job { $map->load }; 2234 $map->load;
2184} 2235}
2185 2236
2186our %MAP_PREFETCH; 2237our %MAP_PREFETCH;
2187our $MAP_PREFETCHER = undef; 2238our $MAP_PREFETCHER = undef;
2188 2239
… …
2214 $MAP_PREFETCHER->prio (6); 2265 $MAP_PREFETCHER->prio (6);
2215 2266
2216 () 2267 ()
2217} 2268}
2218 2269
2270# common code, used by both ->save and ->swapout
2219sub save { 2271sub _save {
2220 my ($self) = @_; 2272 my ($self) = @_;
2221
2222 my $lock = cf::lock_acquire "map_data:$self->{path}";
2223 2273
2224 $self->{last_save} = $cf::RUNTIME; 2274 $self->{last_save} = $cf::RUNTIME;
2225 2275
2226 return unless $self->dirty; 2276 return unless $self->dirty;
2227 2277
… …
2247 } else { 2297 } else {
2248 $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);
2249 } 2299 }
2250} 2300}
2251 2301
2302sub save {
2303 my ($self) = @_;
2304
2305 my $lock = cf::lock_acquire "map_data:$self->{path}";
2306
2307 $self->_save;
2308}
2309
2252sub swap_out { 2310sub swap_out {
2253 my ($self) = @_; 2311 my ($self) = @_;
2254 2312
2255 # save first because save cedes
2256 $self->save;
2257
2258 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2259 2314
2260 return if $self->players;
2261 return if $self->in_memory != cf::MAP_ACTIVE; 2315 return if $self->in_memory != cf::MAP_ACTIVE;
2262 return if $self->{deny_save}; 2316 return if $self->{deny_save};
2317 return if $self->players;
2263 2318
2319 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP;
2264 $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};
2265 2369
2266 $self->deactivate; 2370 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP; 2371 $_->clear_links_to ($self) for values %cf::MAP;
2268 $self->clear; 2372 $self->clear;
2269}
2270
2271sub reset_at {
2272 my ($self) = @_;
2273
2274 # TODO: safety, remove and allow resettable per-player maps
2275 return 1e99 if $self->{deny_reset};
2276
2277 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2278 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2279
2280 $time + $to
2281}
2282
2283sub should_reset {
2284 my ($self) = @_;
2285
2286 $self->reset_at <= $cf::RUNTIME
2287}
2288
2289sub reset {
2290 my ($self) = @_;
2291
2292 my $lock = cf::lock_acquire "map_data:$self->{path}";
2293
2294 return if $self->players;
2295
2296 warn "resetting map ", $self->path;
2297
2298 $self->in_memory (cf::MAP_SWAPPED);
2299
2300 # need to save uniques path
2301 unless ($self->{deny_save}) {
2302 my $uniq = $self->uniq_path; utf8::encode $uniq;
2303
2304 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2305 if $uniq;
2306 }
2307
2308 delete $cf::MAP{$self->path};
2309
2310 $self->deactivate;
2311 $_->clear_links_to ($self) for values %cf::MAP;
2312 $self->clear;
2313 2373
2314 $self->unlink_save; 2374 $self->unlink_save;
2315 $self->destroy; 2375 $self->destroy;
2316} 2376}
2317 2377
… …
2325 2385
2326 delete $cf::MAP{$self->path}; 2386 delete $cf::MAP{$self->path};
2327 2387
2328 $self->unlink_save; 2388 $self->unlink_save;
2329 2389
2330 bless $self, "cf::map"; 2390 bless $self, "cf::map::wrap";
2331 delete $self->{deny_reset}; 2391 delete $self->{deny_reset};
2332 $self->{deny_save} = 1; 2392 $self->{deny_save} = 1;
2333 $self->reset_timeout (1); 2393 $self->reset_timeout (1);
2334 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2394 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2335 2395
… …
2392 : normalise $_ 2452 : normalise $_
2393 } @{ aio_readdir $UNIQUEDIR or [] } 2453 } @{ aio_readdir $UNIQUEDIR or [] }
2394 ] 2454 ]
2395} 2455}
2396 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
2397=back 2489=back
2398 2490
2399=head3 cf::object 2491=head3 cf::object
2400 2492
2401=cut 2493=cut
… …
2466 2558
2467our $SAY_CHANNEL = { 2559our $SAY_CHANNEL = {
2468 id => "say", 2560 id => "say",
2469 title => "Map", 2561 title => "Map",
2470 reply => "say ", 2562 reply => "say ",
2471 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.",
2472}; 2564};
2473 2565
2474our $CHAT_CHANNEL = { 2566our $CHAT_CHANNEL = {
2475 id => "chat", 2567 id => "chat",
2476 title => "Chat", 2568 title => "Chat",
… …
2531 2623
2532=item $player_object->enter_link 2624=item $player_object->enter_link
2533 2625
2534Freezes 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}>).
2535 2627
2536The 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.
2537I<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.
2538 2632
2539Will never block. 2633Will never block.
2540 2634
2541=item $player_object->leave_link ($map, $x, $y) 2635=item $player_object->leave_link ($map, $x, $y)
2542 2636
… …
2562sub cf::object::player::enter_link { 2656sub cf::object::player::enter_link {
2563 my ($self) = @_; 2657 my ($self) = @_;
2564 2658
2565 $self->deactivate_recursive; 2659 $self->deactivate_recursive;
2566 2660
2661 ++$self->{_link_recursion};
2662
2567 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2663 return if UNIVERSAL::isa $self->map, "ext::map_link";
2568 2664
2569 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2665 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2570 if $self->map && $self->map->{path} ne "{link}"; 2666 if $self->map && $self->map->{path} ne "{link}";
2571 2667
2572 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2668 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2573} 2669}
2574 2670
2575sub cf::object::player::leave_link { 2671sub cf::object::player::leave_link {
2576 my ($self, $map, $x, $y) = @_; 2672 my ($self, $map, $x, $y) = @_;
2577 2673
… …
2594 ($x, $y) = (-1, -1) 2690 ($x, $y) = (-1, -1)
2595 unless (defined $x) && (defined $y); 2691 unless (defined $x) && (defined $y);
2596 2692
2597 # use -1 or undef as default coordinates, not 0, 0 2693 # use -1 or undef as default coordinates, not 0, 0
2598 ($x, $y) = ($map->enter_x, $map->enter_y) 2694 ($x, $y) = ($map->enter_x, $map->enter_y)
2599 if $x <=0 && $y <= 0; 2695 if $x <= 0 && $y <= 0;
2600 2696
2601 $map->load; 2697 $map->load;
2602 $map->load_neighbours; 2698 $map->load_neighbours;
2603 2699
2604 return unless $self->contr->active; 2700 return unless $self->contr->active;
2605 $self->activate_recursive;
2606 2701
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2703 if ($self->enter_map ($map, $x, $y)) {
2609} 2704 # entering was successful
2705 delete $self->{_link_recursion};
2706 # only activate afterwards, to support waiting in hooks
2707 $self->activate_recursive;
2708 }
2610 2709
2710}
2711
2611=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)]])
2612 2713
2613Moves 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
2614her, loading and preparing them map, calling the provided $check callback 2715her, loading and preparing them map, calling the provided $check callback
2615that 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
2616the 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
… …
2623 2724
2624our $GOTOGEN; 2725our $GOTOGEN;
2625 2726
2626sub cf::object::player::goto { 2727sub cf::object::player::goto {
2627 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 }
2628 2735
2629 # 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
2630 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2737 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2631 2738
2632 $self->enter_link; 2739 $self->enter_link;
… …
2656 my $map = eval { 2763 my $map = eval {
2657 my $map = defined $path ? cf::map::find $path : undef; 2764 my $map = defined $path ? cf::map::find $path : undef;
2658 2765
2659 if ($map) { 2766 if ($map) {
2660 $map = $map->customise_for ($self); 2767 $map = $map->customise_for ($self);
2661 $map = $check->($map) if $check && $map; 2768 $map = $check->($map, $x, $y, $self) if $check && $map;
2662 } else { 2769 } else {
2663 $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);
2664 } 2771 }
2665 2772
2666 $map 2773 $map
… …
2674 if ($gen == $self->{_goto_generation}) { 2781 if ($gen == $self->{_goto_generation}) {
2675 delete $self->{_goto_generation}; 2782 delete $self->{_goto_generation};
2676 $self->leave_link ($map, $x, $y); 2783 $self->leave_link ($map, $x, $y);
2677 } 2784 }
2678 2785
2679 $done->() if $done; 2786 $done->($self) if $done;
2680 })->prio (1); 2787 })->prio (1);
2681} 2788}
2682 2789
2683=item $player_object->enter_exit ($exit_object) 2790=item $player_object->enter_exit ($exit_object)
2684 2791
… …
2772 $self->contr->savebed ($map, $x, $y) 2879 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED); 2880 if $exit->flag (cf::FLAG_DAMNED);
2774 2881
2775 1 2882 1
2776 }) { 2883 }) {
2777 $self->message ("Something went wrong deep within the crossfire server. " 2884 $self->message ("Something went wrong deep within the deliantra server. "
2778 . "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. "
2779 . "Please report this to the dungeon master!", 2886 . "Please report this to the dungeon master!",
2780 cf::NDI_UNIQUE | cf::NDI_RED); 2887 cf::NDI_UNIQUE | cf::NDI_RED);
2781 2888
2782 warn "ERROR in enter_exit: $@"; 2889 error "ERROR in enter_exit: $@";
2783 $self->leave_link; 2890 $self->leave_link;
2784 } 2891 }
2785 })->prio (1); 2892 })->prio (1);
2786} 2893}
2787 2894
… …
2799sub cf::client::send_drawinfo { 2906sub cf::client::send_drawinfo {
2800 my ($self, $text, $flags) = @_; 2907 my ($self, $text, $flags) = @_;
2801 2908
2802 utf8::encode $text; 2909 utf8::encode $text;
2803 $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);
2804} 2936}
2805 2937
2806=item $client->send_msg ($channel, $msg, $color, [extra...]) 2938=item $client->send_msg ($channel, $msg, $color, [extra...])
2807 2939
2808Send 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
… …
2812 2944
2813=cut 2945=cut
2814 2946
2815# non-persistent channels (usually the info channel) 2947# non-persistent channels (usually the info channel)
2816our %CHANNEL = ( 2948our %CHANNEL = (
2949 "c/motd" => {
2950 id => "infobox",
2951 title => "MOTD",
2952 reply => undef,
2953 tooltip => "The message of the day",
2954 },
2817 "c/identify" => { 2955 "c/identify" => {
2818 id => "infobox", 2956 id => "infobox",
2819 title => "Identify", 2957 title => "Identify",
2820 reply => undef, 2958 reply => undef,
2821 tooltip => "Items recently identified", 2959 tooltip => "Items recently identified",
… …
2823 "c/examine" => { 2961 "c/examine" => {
2824 id => "infobox", 2962 id => "infobox",
2825 title => "Examine", 2963 title => "Examine",
2826 reply => undef, 2964 reply => undef,
2827 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",
2828 }, 2972 },
2829 "c/book" => { 2973 "c/book" => {
2830 id => "infobox", 2974 id => "infobox",
2831 title => "Book", 2975 title => "Book",
2832 reply => undef, 2976 reply => undef,
… …
2848 id => "infobox", 2992 id => "infobox",
2849 title => "Body Parts", 2993 title => "Body Parts",
2850 reply => undef, 2994 reply => undef,
2851 tooltip => "Shows which body parts you posess and are available", 2995 tooltip => "Shows which body parts you posess and are available",
2852 }, 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 },
2853 "c/uptime" => { 3033 "c/uptime" => {
2854 id => "infobox", 3034 id => "infobox",
2855 title => "Uptime", 3035 title => "Uptime",
2856 reply => undef, 3036 reply => undef,
2857 tooltip => "How long the server has been running since last restart", 3037 tooltip => "How long the server has been running since last restart",
… …
2866 id => "party", 3046 id => "party",
2867 title => "Party", 3047 title => "Party",
2868 reply => "gsay ", 3048 reply => "gsay ",
2869 tooltip => "Messages and chat related to your party", 3049 tooltip => "Messages and chat related to your party",
2870 }, 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,
2871); 3059);
2872 3060
2873sub cf::client::send_msg { 3061sub cf::client::send_msg {
2874 my ($self, $channel, $msg, $color, @extra) = @_; 3062 my ($self, $channel, $msg, $color, @extra) = @_;
2875 3063
2876 $msg = $self->pl->expand_cfpod ($msg); 3064 $msg = $self->pl->expand_cfpod ($msg)
3065 unless $color & cf::NDI_VERBATIM;
2877 3066
2878 $color &= cf::NDI_CLIENT_MASK; # just in case... 3067 $color &= cf::NDI_CLIENT_MASK; # just in case...
2879 3068
2880 # check predefined channels, for the benefit of C 3069 # check predefined channels, for the benefit of C
2881 if ($CHANNEL{$channel}) { 3070 if ($CHANNEL{$channel}) {
2882 $channel = $CHANNEL{$channel}; 3071 $channel = $CHANNEL{$channel};
2883 3072
2884 $self->ext_msg (channel_info => $channel) 3073 $self->ext_msg (channel_info => $channel);
2885 if $self->can_msg;
2886
2887 $channel = $channel->{id}; 3074 $channel = $channel->{id};
2888 3075
2889 } elsif (ref $channel) { 3076 } elsif (ref $channel) {
2890 # send meta info to client, if not yet sent 3077 # send meta info to client, if not yet sent
2891 unless (exists $self->{channel}{$channel->{id}}) { 3078 unless (exists $self->{channel}{$channel->{id}}) {
2892 $self->{channel}{$channel->{id}} = $channel; 3079 $self->{channel}{$channel->{id}} = $channel;
2893 $self->ext_msg (channel_info => $channel) 3080 $self->ext_msg (channel_info => $channel);
2894 if $self->can_msg;
2895 } 3081 }
2896 3082
2897 $channel = $channel->{id}; 3083 $channel = $channel->{id};
2898 } 3084 }
2899 3085
2900 return unless @extra || length $msg; 3086 return unless @extra || length $msg;
2901 3087
2902 if ($self->can_msg) {
2903 # default colour, mask it out 3088 # default colour, mask it out
2904 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3089 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2905 if $color & cf::NDI_DEF; 3090 if $color & cf::NDI_DEF;
2906 3091
2907 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3092 my $pkt = "msg "
3093 . $self->{json_coder}->encode (
2908 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3094 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2909 } else { 3095 );
2910 if ($color >= 0) {
2911 # replace some tags by gcfclient-compatible ones
2912 for ($msg) {
2913 1 while
2914 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2915 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2916 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2917 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2918 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2919 }
2920 3096
2921 $color &= cf::NDI_COLOR_MASK; 3097 $self->send_big_packet ($pkt);
2922
2923 utf8::encode $msg;
2924
2925 if (0 && $msg =~ /\[/) {
2926 # COMMAND/INFO
2927 $self->send_packet ("drawextinfo $color 10 8 $msg")
2928 } else {
2929 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2930 $self->send_packet ("drawinfo $color $msg")
2931 }
2932 }
2933 }
2934} 3098}
2935 3099
2936=item $client->ext_msg ($type, @msg) 3100=item $client->ext_msg ($type, @msg)
2937 3101
2938Sends an ext event to the client. 3102Sends an ext event to the client.
… …
2941 3105
2942sub cf::client::ext_msg($$@) { 3106sub cf::client::ext_msg($$@) {
2943 my ($self, $type, @msg) = @_; 3107 my ($self, $type, @msg) = @_;
2944 3108
2945 if ($self->extcmd == 2) { 3109 if ($self->extcmd == 2) {
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3110 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2947 } elsif ($self->extcmd == 1) { # TODO: remove 3111 } elsif ($self->extcmd == 1) { # TODO: remove
2948 push @msg, msgtype => "event_$type"; 3112 push @msg, msgtype => "event_$type";
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3113 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3114 }
2951} 3115}
2952 3116
2953=item $client->ext_reply ($msgid, @msg) 3117=item $client->ext_reply ($msgid, @msg)
2954 3118
… …
2958 3122
2959sub cf::client::ext_reply($$@) { 3123sub cf::client::ext_reply($$@) {
2960 my ($self, $id, @msg) = @_; 3124 my ($self, $id, @msg) = @_;
2961 3125
2962 if ($self->extcmd == 2) { 3126 if ($self->extcmd == 2) {
2963 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2964 } elsif ($self->extcmd == 1) { 3128 } elsif ($self->extcmd == 1) {
2965 #TODO: version 1, remove 3129 #TODO: version 1, remove
2966 unshift @msg, msgtype => "reply", msgid => $id; 3130 unshift @msg, msgtype => "reply", msgid => $id;
2967 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2968 } 3132 }
2969} 3133}
2970 3134
2971=item $success = $client->query ($flags, "text", \&cb) 3135=item $success = $client->query ($flags, "text", \&cb)
2972 3136
… …
3043 3207
3044 $ns->ext_reply ($reply, @reply) 3208 $ns->ext_reply ($reply, @reply)
3045 if $reply; 3209 if $reply;
3046 3210
3047 } else { 3211 } else {
3048 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";
3049 } 3213 }
3050 3214
3051 cf::override; 3215 cf::override;
3052 }, 3216 },
3053); 3217);
… …
3073 3237
3074 $coro 3238 $coro
3075} 3239}
3076 3240
3077cf::client->attach ( 3241cf::client->attach (
3078 on_destroy => sub { 3242 on_client_destroy => sub {
3079 my ($ns) = @_; 3243 my ($ns) = @_;
3080 3244
3081 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3245 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3082 }, 3246 },
3083); 3247);
… …
3099our $safe_hole = new Safe::Hole; 3263our $safe_hole = new Safe::Hole;
3100 3264
3101$SIG{FPE} = 'IGNORE'; 3265$SIG{FPE} = 'IGNORE';
3102 3266
3103$safe->permit_only (Opcode::opset qw( 3267$safe->permit_only (Opcode::opset qw(
3104 :base_core :base_mem :base_orig :base_math 3268 :base_core :base_mem :base_orig :base_math :base_loop
3105 grepstart grepwhile mapstart mapwhile 3269 grepstart grepwhile mapstart mapwhile
3106 sort time 3270 sort time
3107)); 3271));
3108 3272
3109# here we export the classes and methods available to script code 3273# here we export the classes and methods available to script code
… …
3113The following functions and methods are available within a safe environment: 3277The following functions and methods are available within a safe environment:
3114 3278
3115 cf::object 3279 cf::object
3116 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
3117 insert remove name archname title slaying race decrease split 3281 insert remove name archname title slaying race decrease split
3282 value
3118 3283
3119 cf::object::player 3284 cf::object::player
3120 player 3285 player
3121 3286
3122 cf::player 3287 cf::player
… …
3128=cut 3293=cut
3129 3294
3130for ( 3295for (
3131 ["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
3132 insert remove inv nrof name archname title slaying race 3297 insert remove inv nrof name archname title slaying race
3133 decrease split destroy change_exp)], 3298 decrease split destroy change_exp value msg lore send_msg)],
3134 ["cf::object::player" => qw(player)], 3299 ["cf::object::player" => qw(player)],
3135 ["cf::player" => qw(peaceful)], 3300 ["cf::player" => qw(peaceful send_msg)],
3136 ["cf::map" => qw(trigger)], 3301 ["cf::map" => qw(trigger)],
3137) { 3302) {
3138 no strict 'refs';
3139 my ($pkg, @funs) = @$_; 3303 my ($pkg, @funs) = @$_;
3140 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3304 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3141 for @funs; 3305 for @funs;
3142} 3306}
3143 3307
… …
3158 3322
3159 my $qcode = $code; 3323 my $qcode = $code;
3160 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3324 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3161 $qcode =~ s/\n/\\n/g; 3325 $qcode =~ s/\n/\\n/g;
3162 3326
3327 %vars = (_dummy => 0) unless %vars;
3328
3329 my @res;
3163 local $_; 3330 local $_;
3164 local @safe::cf::_safe_eval_args = values %vars;
3165 3331
3166 my $eval = 3332 my $eval =
3167 "do {\n" 3333 "do {\n"
3168 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3334 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3169 . "#line 0 \"{$qcode}\"\n" 3335 . "#line 0 \"{$qcode}\"\n"
3170 . $code 3336 . $code
3171 . "\n}" 3337 . "\n}"
3172 ; 3338 ;
3173 3339
3340 if ($CFG{safe_eval}) {
3174 sub_generation_inc; 3341 sub_generation_inc;
3342 local @safe::cf::_safe_eval_args = values %vars;
3175 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3343 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3176 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 }
3177 3349
3178 if ($@) { 3350 if ($@) {
3179 warn "$@"; 3351 warn "$@",
3180 warn "while executing safe code '$code'\n"; 3352 "while executing safe code '$code'\n",
3181 warn "with arguments " . (join " ", %vars) . "\n"; 3353 "with arguments " . (join " ", %vars) . "\n";
3182 } 3354 }
3183 3355
3184 wantarray ? @res : $res[0] 3356 wantarray ? @res : $res[0]
3185} 3357}
3186 3358
… …
3200=cut 3372=cut
3201 3373
3202sub register_script_function { 3374sub register_script_function {
3203 my ($fun, $cb) = @_; 3375 my ($fun, $cb) = @_;
3204 3376
3205 no strict 'refs'; 3377 $fun = "safe::$fun" if $CFG{safe_eval};
3206 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3378 *$fun = $safe_hole->wrap ($cb);
3207} 3379}
3208 3380
3209=back 3381=back
3210 3382
3211=cut 3383=cut
… …
3220 # for this (global event?) 3392 # for this (global event?)
3221 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3222 3394
3223 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3395 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3224 3396
3225 warn "loading facedata from $path\n"; 3397 trace "loading facedata from $path\n";
3226 3398
3227 my $facedata;
3228 0 < aio_load $path, $facedata 3399 0 < aio_load $path, my $facedata
3229 or die "$path: $!"; 3400 or die "$path: $!";
3230 3401
3231 $facedata = Coro::Storable::thaw $facedata; 3402 $facedata = Coro::Storable::thaw $facedata;
3232 3403
3233 $facedata->{version} == 2 3404 $facedata->{version} == 2
3234 or cf::cleanup "$path: version mismatch, cannot proceed."; 3405 or cf::cleanup "$path: version mismatch, cannot proceed.";
3235 3406
3236 # 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]);
3237 $facedata->{resource}{"res/exp_table"} = { 3409 $facedata->{resource}{"res/exp_table"} = {
3238 type => FT_RSRC, 3410 type => FT_RSRC,
3239 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),
3240 }; 3413 };
3241 cf::cede_to_tick; 3414 cf::cede_to_tick;
3242 3415
3243 { 3416 {
3244 my $faces = $facedata->{faceinfo}; 3417 my $faces = $facedata->{faceinfo};
… …
3246 while (my ($face, $info) = each %$faces) { 3419 while (my ($face, $info) = each %$faces) {
3247 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3420 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3248 3421
3249 cf::face::set_visibility $idx, $info->{visibility}; 3422 cf::face::set_visibility $idx, $info->{visibility};
3250 cf::face::set_magicmap $idx, $info->{magicmap}; 3423 cf::face::set_magicmap $idx, $info->{magicmap};
3251 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3424 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3252 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3425 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3253 3426
3254 cf::cede_to_tick; 3427 cf::cede_to_tick;
3255 } 3428 }
3256 3429
3257 while (my ($face, $info) = each %$faces) { 3430 while (my ($face, $info) = each %$faces) {
… …
3262 3435
3263 if (my $smooth = cf::face::find $info->{smooth}) { 3436 if (my $smooth = cf::face::find $info->{smooth}) {
3264 cf::face::set_smooth $idx, $smooth; 3437 cf::face::set_smooth $idx, $smooth;
3265 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3438 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3266 } else { 3439 } else {
3267 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3440 error "smooth face '$info->{smooth}' not found for face '$face'";
3268 } 3441 }
3269 3442
3270 cf::cede_to_tick; 3443 cf::cede_to_tick;
3271 } 3444 }
3272 } 3445 }
… …
3281 3454
3282 cf::anim::invalidate_all; # d'oh 3455 cf::anim::invalidate_all; # d'oh
3283 } 3456 }
3284 3457
3285 { 3458 {
3286 # TODO: for gcfclient pleasure, we should give resources
3287 # that gcfclient doesn't grok a >10000 face index.
3288 my $res = $facedata->{resource}; 3459 my $res = $facedata->{resource};
3289 3460
3290 while (my ($name, $info) = each %$res) { 3461 while (my ($name, $info) = each %$res) {
3291 if (defined $info->{type}) { 3462 if (defined $info->{type}) {
3292 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3463 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3293 my $data;
3294 3464
3295 if ($info->{type} & 1) { 3465 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3296 # prepend meta info
3297
3298 my $meta = $enc->encode ({
3299 name => $name,
3300 %{ $info->{meta} || {} },
3301 });
3302
3303 $data = pack "(w/a*)*", $meta, $info->{data};
3304 } else {
3305 $data = $info->{data};
3306 }
3307
3308 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3309 cf::face::set_type $idx, $info->{type}; 3466 cf::face::set_type $idx, $info->{type};
3310 } else { 3467 } else {
3311 $RESOURCE{$name} = $info; 3468 $RESOURCE{$name} = $info; # unused
3312 } 3469 }
3313 3470
3314 cf::cede_to_tick; 3471 cf::cede_to_tick;
3315 } 3472 }
3316 } 3473 }
3317 3474
3318 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3475 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3319 3476
3320 1 3477 1
3321} 3478}
3322
3323cf::global->attach (on_resource_update => sub {
3324 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3325 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3326
3327 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3328 my $sound = $soundconf->{compat}[$_]
3329 or next;
3330
3331 my $face = cf::face::find "sound/$sound->[1]";
3332 cf::sound::set $sound->[0] => $face;
3333 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3334 }
3335
3336 while (my ($k, $v) = each %{$soundconf->{event}}) {
3337 my $face = cf::face::find "sound/$v";
3338 cf::sound::set $k => $face;
3339 }
3340 }
3341});
3342 3479
3343register_exticmd fx_want => sub { 3480register_exticmd fx_want => sub {
3344 my ($ns, $want) = @_; 3481 my ($ns, $want) = @_;
3345 3482
3346 while (my ($k, $v) = each %$want) { 3483 while (my ($k, $v) = each %$want) {
… …
3385sub reload_treasures { 3522sub reload_treasures {
3386 load_resource_file "$DATADIR/treasures" 3523 load_resource_file "$DATADIR/treasures"
3387 or die "unable to load treasurelists\n"; 3524 or die "unable to load treasurelists\n";
3388} 3525}
3389 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
3390sub reload_resources { 3550sub reload_resources {
3391 warn "reloading resource files...\n"; 3551 trace "reloading resource files...\n";
3392 3552
3553 reload_exp_table;
3554 reload_materials;
3393 reload_facedata; 3555 reload_facedata;
3556 reload_sound;
3394 reload_archetypes; 3557 reload_archetypes;
3395 reload_regions; 3558 reload_regions;
3396 reload_treasures; 3559 reload_treasures;
3397 3560
3398 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3399}
3400
3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3406 reload_resources;
3407} 3562}
3408 3563
3409sub reload_config { 3564sub reload_config {
3410 open my $fh, "<:utf8", "$CONFDIR/config" 3565 trace "reloading config file...\n";
3411 or return;
3412 3566
3413 local $/; 3567 0 < aio_load "$CONFDIR/config", my $config
3414 *CFG = YAML::Load <$fh>; 3568 or die "$CONFDIR/config: $!";
3415 3569
3570 utf8::decode $config;
3571 *CFG = yaml_load $config;
3572
3416 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3417 3574
3418 $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};
3419 $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};
3420 3577
3421 if (exists $CFG{mlockall}) { 3578 if (exists $CFG{mlockall}) {
… …
3425 }; 3582 };
3426 warn $@ if $@; 3583 warn $@ if $@;
3427 } 3584 }
3428} 3585}
3429 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
3430sub 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
3431 # we must not ever block the main coroutine 3625 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3626 local $Coro::idle = sub {
3433 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#
3434 (async { 3628 (async {
3435 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3629 $Coro::current->{desc} = "IDLE BUG HANDLER";
3436 EV::loop EV::LOOP_ONESHOT; 3630 EV::loop EV::LOOP_ONESHOT;
3437 })->prio (Coro::PRIO_MAX); 3631 })->prio (Coro::PRIO_MAX);
3438 }; 3632 };
3439 3633
3440 { 3634 evthread_start IO::AIO::poll_fileno;
3441 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;
3442 reload_config; 3646 reload_config;
3443 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
3444 load_extensions; 3657 load_extensions;
3445 3658
3446 $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;
3447 } 3666 };
3448 3667
3449 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;
3450} 3677}
3451 3678
3452############################################################################# 3679#############################################################################
3453# initialisation and cleanup 3680# initialisation and cleanup
3454 3681
3455# install some emergency cleanup handlers 3682# install some emergency cleanup handlers
3456BEGIN { 3683BEGIN {
3457 our %SIGWATCHER = (); 3684 our %SIGWATCHER = ();
3458 for my $signal (qw(INT HUP TERM)) { 3685 for my $signal (qw(INT HUP TERM)) {
3459 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3686 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3460 cf::cleanup "SIG$signal"; 3687 cf::cleanup "SIG$signal";
3461 }; 3688 };
3462 } 3689 }
3463} 3690}
3464 3691
3465sub write_runtime_sync { 3692sub write_runtime_sync {
3466 my $runtime = "$LOCALDIR/runtime"; 3693 my $t0 = AE::time;
3467 3694
3468 # first touch the runtime file to show we are still running: 3695 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3696 # the fsync below can take a very very long time.
3470 3697
3471 IO::AIO::aio_utime $runtime, undef, undef; 3698 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3699
3473 my $guard = cf::lock_acquire "write_runtime"; 3700 my $guard = cf::lock_acquire "write_runtime";
3474 3701
3475 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3702 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3476 or return; 3703 or return;
3477 3704
3478 my $value = $cf::RUNTIME + 90 + 10; 3705 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3706 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3707 # 60 allows for the watchdog to kill the server.
… …
3490 aio_utime $fh, undef, undef; 3717 aio_utime $fh, undef, undef;
3491 3718
3492 close $fh 3719 close $fh
3493 or return; 3720 or return;
3494 3721
3495 aio_rename "$runtime~", $runtime 3722 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3723 and return;
3497 3724
3498 warn "runtime file written.\n"; 3725 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3499 3726
3500 1 3727 1
3501} 3728}
3502 3729
3503our $uuid_lock; 3730our $uuid_lock;
… …
3512 my $uuid = "$LOCALDIR/uuid"; 3739 my $uuid = "$LOCALDIR/uuid";
3513 3740
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3741 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return; 3742 or return;
3516 3743
3517 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;
3518 $uuid_skip = 0; 3752 $uuid_skip = 0;
3519 3753
3520 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3754 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3521 and return; 3755 and return;
3522 3756
… …
3528 or return; 3762 or return;
3529 3763
3530 aio_rename "$uuid~", $uuid 3764 aio_rename "$uuid~", $uuid
3531 and return; 3765 and return;
3532 3766
3533 warn "uuid file written ($value).\n"; 3767 trace "uuid file written ($value).\n";
3534 3768
3535 1 3769 1
3536 3770
3537} 3771}
3538 3772
… …
3544} 3778}
3545 3779
3546sub emergency_save() { 3780sub emergency_save() {
3547 my $freeze_guard = cf::freeze_mainloop; 3781 my $freeze_guard = cf::freeze_mainloop;
3548 3782
3549 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;
3550 3789
3551 cf::sync_job { 3790 cf::sync_job {
3791 cf::write_runtime_sync; # external watchdog should not bark
3792
3552 # use a peculiar iteration method to avoid tripping on perl 3793 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 3794 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 3795 # and maps saved/destroyed asynchronously.
3555 warn "begin emergency player save\n"; 3796 info "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 3797 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 3798 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 3799 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3800 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 3801 $pl->save;
3561 } 3802 }
3562 warn "end emergency player save\n"; 3803 info "emergency_perl_save: end player save\n";
3563 3804
3564 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";
3565 for my $path (keys %cf::MAP) { 3808 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 3809 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 3810 $map->valid or next;
3568 $map->save; 3811 $map->save;
3569 } 3812 }
3570 warn "end emergency map save\n"; 3813 info "emergency_perl_save: end map save\n";
3571 3814
3572 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";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3818 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "end emergency database checkpoint\n"; 3819 info "emergency_perl_save: end database checkpoint\n";
3575 3820
3576 warn "begin write uuid\n"; 3821 info "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 3822 write_uuid_sync 1;
3578 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
3579 }; 3843 };
3580 3844
3581 warn "leave emergency perl save\n"; 3845 info "emergency_perl_save: leave\n";
3582} 3846}
3583 3847
3584sub post_cleanup { 3848sub post_cleanup {
3585 my ($make_core) = @_; 3849 my ($make_core) = @_;
3586 3850
3851 IO::AIO::flush;
3852
3587 warn Carp::longmess "post_cleanup backtrace" 3853 error Carp::longmess "post_cleanup backtrace"
3588 if $make_core; 3854 if $make_core;
3855
3856 my $fh = pidfile;
3857 unlink $PIDFILE if <$fh> == $$;
3858}
3859
3860# a safer delete_package, copied from Symbol
3861sub clear_package($) {
3862 my $pkg = shift;
3863
3864 # expand to full symbol table name if needed
3865 unless ($pkg =~ /^main::.*::$/) {
3866 $pkg = "main$pkg" if $pkg =~ /^::/;
3867 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3868 $pkg .= '::' unless $pkg =~ /::$/;
3869 }
3870
3871 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3872 my $stem_symtab = *{$stem}{HASH};
3873
3874 defined $stem_symtab and exists $stem_symtab->{$leaf}
3875 or return;
3876
3877 # clear all symbols
3878 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3879 for my $name (keys %$leaf_symtab) {
3880 _gv_clear *{"$pkg$name"};
3881# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3882 }
3589} 3883}
3590 3884
3591sub do_reload_perl() { 3885sub do_reload_perl() {
3592 # can/must only be called in main 3886 # can/must only be called in main
3593 if ($Coro::current != $Coro::main) { 3887 unless (in_main) {
3594 warn "can only reload from main coroutine"; 3888 error "can only reload from main coroutine";
3595 return; 3889 return;
3596 } 3890 }
3597 3891
3892 return if $RELOAD++;
3893
3894 my $t1 = AE::time;
3895
3896 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl";
3598 warn "reloading..."; 3898 info "reloading...";
3599 3899
3600 warn "entering sync_job"; 3900 trace "entering sync_job";
3601 3901
3602 cf::sync_job { 3902 cf::sync_job {
3603 cf::write_runtime_sync; # external watchdog should not bark
3604 cf::emergency_save; 3903 #cf::emergency_save;
3605 cf::write_runtime_sync; # external watchdog should not bark
3606 3904
3607 warn "syncing database to disk";
3608 BDB::db_env_txn_checkpoint $DB_ENV;
3609
3610 # if anything goes wrong in here, we should simply crash as we already saved
3611
3612 warn "flushing outstanding aio requests";
3613 for (;;) {
3614 BDB::flush;
3615 IO::AIO::flush;
3616 Coro::cede_notself;
3617 last unless IO::AIO::nreqs || BDB::nreqs;
3618 warn "iterate...";
3619 }
3620
3621 ++$RELOAD;
3622
3623 warn "cancelling all extension coros"; 3905 trace "cancelling all extension coros";
3624 $_->cancel for values %EXT_CORO; 3906 $_->cancel for values %EXT_CORO;
3625 %EXT_CORO = (); 3907 %EXT_CORO = ();
3626 3908
3627 warn "removing commands"; 3909 trace "removing commands";
3628 %COMMAND = (); 3910 %COMMAND = ();
3629 3911
3630 warn "removing ext/exti commands"; 3912 trace "removing ext/exti commands";
3631 %EXTCMD = (); 3913 %EXTCMD = ();
3632 %EXTICMD = (); 3914 %EXTICMD = ();
3633 3915
3634 warn "unloading/nuking all extensions"; 3916 trace "unloading/nuking all extensions";
3635 for my $pkg (@EXTS) { 3917 for my $pkg (@EXTS) {
3636 warn "... unloading $pkg"; 3918 trace "... unloading $pkg";
3637 3919
3638 if (my $cb = $pkg->can ("unload")) { 3920 if (my $cb = $pkg->can ("unload")) {
3639 eval { 3921 eval {
3640 $cb->($pkg); 3922 $cb->($pkg);
3641 1 3923 1
3642 } or warn "$pkg unloaded, but with errors: $@"; 3924 } or error "$pkg unloaded, but with errors: $@";
3925 }
3926
3927 trace "... clearing $pkg";
3928 clear_package $pkg;
3643 } 3929 }
3644 3930
3645 warn "... nuking $pkg";
3646 Symbol::delete_package $pkg;
3647 }
3648
3649 warn "unloading all perl modules loaded from $LIBDIR"; 3931 trace "unloading all perl modules loaded from $LIBDIR";
3650 while (my ($k, $v) = each %INC) { 3932 while (my ($k, $v) = each %INC) {
3651 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3652 3934
3653 warn "... unloading $k"; 3935 trace "... unloading $k";
3654 delete $INC{$k}; 3936 delete $INC{$k};
3655 3937
3656 $k =~ s/\.pm$//; 3938 $k =~ s/\.pm$//;
3657 $k =~ s/\//::/g; 3939 $k =~ s/\//::/g;
3658 3940
3659 if (my $cb = $k->can ("unload_module")) { 3941 if (my $cb = $k->can ("unload_module")) {
3660 $cb->(); 3942 $cb->();
3943 }
3944
3945 clear_package $k;
3661 } 3946 }
3662 3947
3663 Symbol::delete_package $k;
3664 }
3665
3666 warn "getting rid of safe::, as good as possible"; 3948 trace "getting rid of safe::, as good as possible";
3667 Symbol::delete_package "safe::$_" 3949 clear_package "safe::$_"
3668 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);
3669 3951
3670 warn "unloading cf.pm \"a bit\""; 3952 trace "unloading cf.pm \"a bit\"";
3671 delete $INC{"cf.pm"}; 3953 delete $INC{"cf.pm"};
3672 delete $INC{"cf/pod.pm"}; 3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3673 3955
3674 # don't, removes xs symbols, too, 3956 # don't, removes xs symbols, too,
3675 # and global variables created in xs 3957 # and global variables created in xs
3676 #Symbol::delete_package __PACKAGE__; 3958 #clear_package __PACKAGE__;
3677 3959
3678 warn "unload completed, starting to reload now"; 3960 info "unload completed, starting to reload now";
3679 3961
3680 warn "reloading cf.pm"; 3962 trace "reloading cf.pm";
3681 require cf; 3963 require cf;
3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3964 cf::_connect_to_perl_1;
3683 3965
3684 warn "loading config and database again"; 3966 trace "loading config and database again";
3685 cf::reload_config; 3967 cf::reload_config;
3686 3968
3687 warn "loading extensions"; 3969 trace "loading extensions";
3688 cf::load_extensions; 3970 cf::load_extensions;
3689 3971
3972 if ($REATTACH_ON_RELOAD) {
3690 warn "reattaching attachments to objects/players"; 3973 trace "reattaching attachments to objects/players";
3691 _global_reattach; # objects, sockets 3974 _global_reattach; # objects, sockets
3692 warn "reattaching attachments to maps"; 3975 trace "reattaching attachments to maps";
3693 reattach $_ for values %MAP; 3976 reattach $_ for values %MAP;
3694 warn "reattaching attachments to players"; 3977 trace "reattaching attachments to players";
3695 reattach $_ for values %PLAYER; 3978 reattach $_ for values %PLAYER;
3979 }
3696 3980
3981 trace "running post_init jobs";
3982 (pop @POST_INIT)->(1) while @POST_INIT;
3983
3697 warn "leaving sync_job"; 3984 trace "leaving sync_job";
3698 3985
3699 1 3986 1
3700 } or do { 3987 } or do {
3701 warn $@; 3988 error $@;
3702 cf::cleanup "error while reloading, exiting."; 3989 cf::cleanup "error while reloading, exiting.";
3990 };
3991
3992 info "reloaded";
3993 --$RELOAD;
3703 }; 3994 }
3704 3995
3705 warn "reloaded"; 3996 $t1 = AE::time - $t1;
3997 info "reload completed in ${t1}s\n";
3706}; 3998};
3707 3999
3708our $RELOAD_WATCHER; # used only during reload 4000our $RELOAD_WATCHER; # used only during reload
3709 4001
3710sub reload_perl() { 4002sub reload_perl() {
3711 # doing reload synchronously and two reloads happen back-to-back, 4003 # doing reload synchronously and two reloads happen back-to-back,
3712 # coro crashes during coro_state_free->destroy here. 4004 # coro crashes during coro_state_free->destroy here.
3713 4005
4006 $RELOAD_WATCHER ||= cf::async {
4007 Coro::AIO::aio_wait cache_extensions;
4008
3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4009 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3715 do_reload_perl; 4010 do_reload_perl;
3716 undef $RELOAD_WATCHER; 4011 undef $RELOAD_WATCHER;
4012 };
3717 }; 4013 };
3718} 4014}
3719 4015
3720register_command "reload" => sub { 4016register_command "reload" => sub {
3721 my ($who, $arg) = @_; 4017 my ($who, $arg) = @_;
… …
3727 reload_perl; 4023 reload_perl;
3728 }; 4024 };
3729 } 4025 }
3730}; 4026};
3731 4027
3732unshift @INC, $LIBDIR; 4028#############################################################################
3733 4029
3734my $bug_warning = 0; 4030my $bug_warning = 0;
3735 4031
3736our @WAIT_FOR_TICK; 4032our @WAIT_FOR_TICK;
3737our @WAIT_FOR_TICK_BEGIN; 4033our @WAIT_FOR_TICK_BEGIN;
3738 4034
3739sub wait_for_tick { 4035sub wait_for_tick() {
3740 return if tick_inhibit || $Coro::current == $Coro::main; 4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3741 4037
3742 my $signal = new Coro::Signal; 4038 my $signal = new Coro::Signal;
3743 push @WAIT_FOR_TICK, $signal; 4039 push @WAIT_FOR_TICK, $signal;
3744 $signal->wait; 4040 $signal->wait;
3745} 4041}
3746 4042
3747sub wait_for_tick_begin { 4043sub wait_for_tick_begin() {
3748 return if tick_inhibit || $Coro::current == $Coro::main; 4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3749 4045
3750 my $signal = new Coro::Signal; 4046 my $signal = new Coro::Signal;
3751 push @WAIT_FOR_TICK_BEGIN, $signal; 4047 push @WAIT_FOR_TICK_BEGIN, $signal;
3752 $signal->wait; 4048 $signal->wait;
3753} 4049}
… …
3759 return; 4055 return;
3760 } 4056 }
3761 4057
3762 cf::server_tick; # one server iteration 4058 cf::server_tick; # one server iteration
3763 4059
4060 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4061
3764 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4062 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3765 $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.;
3766 Coro::async_pool { 4064 Coro::async_pool {
3767 $Coro::current->{desc} = "runtime saver"; 4065 $Coro::current->{desc} = "runtime saver";
3768 write_runtime_sync 4066 write_runtime_sync
3769 or warn "ERROR: unable to write runtime file: $!"; 4067 or error "ERROR: unable to write runtime file: $!";
3770 }; 4068 };
3771 } 4069 }
3772 4070
3773 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3774 $sig->send; 4072 $sig->send;
… …
3782 4080
3783 if (0) { 4081 if (0) {
3784 if ($NEXT_TICK) { 4082 if ($NEXT_TICK) {
3785 my $jitter = $TICK_START - $NEXT_TICK; 4083 my $jitter = $TICK_START - $NEXT_TICK;
3786 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4084 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3787 warn "jitter $JITTER\n";#d# 4085 debug "jitter $JITTER\n";#d#
3788 } 4086 }
3789 } 4087 }
3790} 4088}
3791 4089
3792{ 4090{
3793 # configure BDB 4091 # configure BDB
3794 4092
3795 BDB::min_parallel 8; 4093 BDB::min_parallel 16;
3796 BDB::max_poll_reqs $TICK * 0.1; 4094 BDB::max_poll_reqs $TICK * 0.1;
3797 $AnyEvent::BDB::WATCHER->priority (1); 4095 $AnyEvent::BDB::WATCHER->priority (1);
3798 4096
3799 unless ($DB_ENV) { 4097 unless ($DB_ENV) {
3800 $DB_ENV = BDB::db_env_create; 4098 $DB_ENV = BDB::db_env_create;
… …
3847 $msg =~ s/\n//; 4145 $msg =~ s/\n//;
3848 4146
3849 # limit the # of concurrent backtraces 4147 # limit the # of concurrent backtraces
3850 if ($_log_backtrace < 2) { 4148 if ($_log_backtrace < 2) {
3851 ++$_log_backtrace; 4149 ++$_log_backtrace;
4150 my $perl_bt = Carp::longmess $msg;
3852 async { 4151 async {
3853 $Coro::current->{desc} = "abt $msg"; 4152 $Coro::current->{desc} = "abt $msg";
3854 4153
3855 my @bt = fork_call { 4154 my @bt = fork_call {
3856 @addr = map { sprintf "%x", $_ } @addr; 4155 @addr = map { sprintf "%x", $_ } @addr;
… …
3867 } 4166 }
3868 4167
3869 @funcs 4168 @funcs
3870 }; 4169 };
3871 4170
3872 LOG llevInfo, "[ABT] $msg\n"; 4171 LOG llevInfo, "[ABT] $perl_bt\n";
4172 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3873 LOG llevInfo, "[ABT] $_\n" for @bt; 4173 LOG llevInfo, "[ABT] $_\n" for @bt;
3874 --$_log_backtrace; 4174 --$_log_backtrace;
3875 }; 4175 };
3876 } else { 4176 } else {
3877 LOG llevInfo, "[ABT] $msg\n"; 4177 LOG llevInfo, "[ABT] $msg\n";
3878 LOG llevInfo, "[ABT] [suppressed]\n"; 4178 LOG llevInfo, "[ABT] [suppressed]\n";
3879 } 4179 }
3880} 4180}
3881 4181
3882# load additional modules 4182# load additional modules
3883use cf::pod; 4183require "cf/$_.pm" for @EXTRA_MODULES;
4184cf::_connect_to_perl_2;
3884 4185
3885END { cf::emergency_save } 4186END { cf::emergency_save }
3886 4187
38871 41881
3888 4189

Diff Legend

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