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.421 by root, Tue Apr 15 18:43:11 2008 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 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 3.2; 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 4.50 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
39use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
43use Coro::AIO; 48use Coro::AIO;
44use Coro::BDB; 49use Coro::BDB 1.6;
45use Coro::Storable; 50use Coro::Storable;
46use Coro::Util (); 51use Coro::Util ();
47 52
48use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
49use BDB (); 54use BDB ();
50use Data::Dumper; 55use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 56use Fcntl;
53use YAML (); 57use YAML::XS ();
54use IO::AIO 2.51 (); 58use IO::AIO ();
55use Time::HiRes; 59use Time::HiRes;
56use Compress::LZF; 60use Compress::LZF;
57use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
58 64
59# configure various modules to our taste 65# configure various modules to our taste
60# 66#
61$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
62Coro::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";
63Compress::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
64 75
65$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" };
66 78
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
71 85
72our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
82our $DATADIR = datadir; 98our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
92our %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;
93 118
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 121our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
99 123
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 127our $DB_ENV;
105 128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
106our %CFG; 131our %CFG;
107 132
108our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 134our $RUNTIME;
110our $NOW; 135our $NOW;
… …
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 146our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
123 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
124binmode STDOUT; 154binmode STDOUT;
125binmode STDERR; 155binmode STDERR;
126 156
127# read virtual server time, if available 157# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
132} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
133 165
134mkdir $_ 166mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 168
137our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
138 170
139sub 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::"} };
140 187
141############################################################################# 188#############################################################################
142 189
143=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
144 191
… …
186from wherever your confdir points to. 233from wherever your confdir points to.
187 234
188=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
189 236
190These 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
191returns 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
192per 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.
193 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
194=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
195 247
196This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
197C<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
198that call. 250that call.
199 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
200=back 258=back
201 259
202=cut 260=cut
203 261
204BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
205 *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 {
206 my $msg = join "", @_; 269 my $msg = join "", @_;
207 270
208 $msg .= "\n" 271 $msg .= "\n"
209 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
210 273
211 $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;
212 275
213 LOG llevError, $msg; 276 LOG llevWarn, $msg;
214 }; 277};
215}
216 278
217$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
219 281
220 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 286 return;#d#
223 }#d# 287 }#d#
224 288
225 # kill coroutine otherwise 289 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 290 Coro::terminate
228}; 291};
229
230$SIG{__DIE__} = sub { }; #d#?
231 292
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
242for my $pkg (qw( 303for my $pkg (qw(
243 cf::global cf::attachable 304 cf::global cf::attachable
244 cf::object cf::object::player 305 cf::object cf::object::player
245 cf::client cf::player 306 cf::client cf::player
246 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
247 cf::map cf::party cf::region 309 cf::party cf::region
248)) { 310)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 312}
252 313
253$EV::DIED = sub { 314$EV::DIED = sub {
254 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
255}; 316};
256 317
257############################################################################# 318#############################################################################
258 319
259=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
… …
296our $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
297 358
298sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
300 361
362=item cf::post_init { BLOCK }
363
364Execute the given codeblock, I<after> all extensions have been (re-)loaded,
365but I<before> the server starts ticking again.
366
367The cdoeblock will have a single boolean argument to indicate whether this
368is a reload or not.
369
370=cut
371
372sub post_init(&) {
373 push @POST_INIT, shift;
374}
375
301=item cf::lock_wait $string 376=item cf::lock_wait $string
302 377
303Wait until the given lock is available. See cf::lock_acquire. 378Wait until the given lock is available. See cf::lock_acquire.
304 379
305=item my $lock = cf::lock_acquire $string 380=item my $lock = cf::lock_acquire $string
306 381
307Wait until the given lock is available and then acquires it and returns 382Wait until the given lock is available and then acquires it and returns
308a Coro::guard object. If the guard object gets destroyed (goes out of scope, 383a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 384for example when the coroutine gets canceled), the lock is automatically
310returned. 385returned.
311 386
312Locks are *not* recursive, locking from the same coro twice results in a 387Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 388deadlocked coro.
… …
319 394
320Return true if the lock is currently active, i.e. somebody has locked it. 395Return true if the lock is currently active, i.e. somebody has locked it.
321 396
322=cut 397=cut
323 398
324our %LOCK; 399our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 400
327sub lock_wait($) { 401sub lock_wait($) {
328 my ($key) = @_; 402 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 403}
341 404
342sub lock_acquire($) { 405sub lock_acquire($) {
343 my ($key) = @_; 406 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 407}
357 408
358sub lock_active($) { 409sub lock_active($) {
359 my ($key) = @_; 410 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 411}
363 412
364sub freeze_mainloop { 413sub freeze_mainloop {
365 tick_inhibit_inc; 414 tick_inhibit_inc;
366 415
367 Coro::guard \&tick_inhibit_dec; 416 &Guard::guard (\&tick_inhibit_dec);
368} 417}
369 418
370=item cf::periodic $interval, $cb 419=item cf::periodic $interval, $cb
371 420
372Like EV::periodic, but randomly selects a starting point so that the actions 421Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 422get spread over time.
374 423
375=cut 424=cut
376 425
377sub periodic($$) { 426sub periodic($$) {
378 my ($interval, $cb) = @_; 427 my ($interval, $cb) = @_;
… …
395 444
396=cut 445=cut
397 446
398our @SLOT_QUEUE; 447our @SLOT_QUEUE;
399our $SLOT_QUEUE; 448our $SLOT_QUEUE;
449our $SLOT_DECAY = 0.9;
400 450
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 451$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 452$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 453 $Coro::current->desc ("timeslot manager");
404 454
405 my $signal = new Coro::Signal; 455 my $signal = new Coro::Signal;
456 my $busy;
406 457
407 while () { 458 while () {
408 next_job: 459 next_job:
460
409 my $avail = cf::till_tick; 461 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 462
411 for (0 .. $#SLOT_QUEUE) { 463 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 464 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 466 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 467 $job->[2]->send;
415 Coro::cede; 468 Coro::cede;
416 goto next_job; 469 goto next_job;
417 } 470 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 472 }
419 } 473 }
420 474
421 if (@SLOT_QUEUE) { 475 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 476 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 477 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 478 $signal->wait;
425 } else { 479 } else {
480 $busy = 0;
426 Coro::schedule; 481 Coro::schedule;
427 } 482 }
428 } 483 }
429}; 484};
430 485
431sub get_slot($;$$) { 486sub get_slot($;$$) {
432 return if tick_inhibit; 487 return if tick_inhibit || $Coro::current == $Coro::main;
433 488
434 my ($time, $pri, $name) = @_; 489 my ($time, $pri, $name) = @_;
435 490
436 $time = $TICK * .6 if $time > $TICK * .6; 491 $time = clamp $time, 0.01, $TICK * .6;
492
437 my $sig = new Coro::Signal; 493 my $sig = new Coro::Signal;
438 494
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 495 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 496 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready; 497 $SLOT_QUEUE->ready;
… …
467=cut 523=cut
468 524
469sub sync_job(&) { 525sub sync_job(&) {
470 my ($job) = @_; 526 my ($job) = @_;
471 527
472 if ($Coro::current == $Coro::main) { 528 if (in_main) {
473 my $time = EV::time; 529 my $time = AE::time;
474 530
475 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
476 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
477 533
478 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
479 535
480 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
481 537
482 my $busy = 1; 538 my $busy = 1;
483 my @res; 539 my @res;
484 540
485 (async { 541 (async {
486 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
487 @res = eval { $job->() }; 543 @res = eval { $job->() };
488 warn $@ if $@; 544 error $@ if $@;
489 undef $busy; 545 undef $busy;
490 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
491 547
492 while ($busy) { 548 while ($busy) {
493 if (Coro::nready) { 549 if (Coro::nready) {
… …
495 } else { 551 } else {
496 EV::loop EV::LOOP_ONESHOT; 552 EV::loop EV::LOOP_ONESHOT;
497 } 553 }
498 } 554 }
499 555
500 my $time = EV::time - $time; 556 my $time = AE::time - $time;
501 557
502 $TICK_START += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
503 559
504 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
505 } else { 561 } else {
… …
536Coro::Storable. May, of course, block. Note that the executed sub may 592Coro::Storable. May, of course, block. Note that the executed sub may
537never block itself or use any form of event handling. 593never block itself or use any form of event handling.
538 594
539=cut 595=cut
540 596
597sub post_fork {
598 reset_signals;
599}
600
541sub fork_call(&@) { 601sub fork_call(&@) {
542 my ($cb, @args) = @_; 602 my ($cb, @args) = @_;
543 603
544 # we seemingly have to make a local copy of the whole thing, 604 # we seemingly have to make a local copy of the whole thing,
545 # otherwise perl prematurely frees the stuff :/ 605 # otherwise perl prematurely frees the stuff :/
546 # TODO: investigate and fix (likely this will be rather laborious) 606 # TODO: investigate and fix (likely this will be rather laborious)
547 607
548 my @res = Coro::Util::fork_eval { 608 my @res = Coro::Util::fork_eval {
549 reset_signals; 609 cf::post_fork;
550 &$cb 610 &$cb
551 }, @args; 611 }, @args;
552 612
553 wantarray ? @res : $res[-1] 613 wantarray ? @res : $res[-1]
614}
615
616sub objinfo {
617 (
618 "counter value" => cf::object::object_count,
619 "objects created" => cf::object::create_count,
620 "objects destroyed" => cf::object::destroy_count,
621 "freelist size" => cf::object::free_count,
622 "allocated objects" => cf::object::objects_size,
623 "active objects" => cf::object::actives_size,
624 )
554} 625}
555 626
556=item $coin = coin_from_name $name 627=item $coin = coin_from_name $name
557 628
558=cut 629=cut
… …
595within each server. 666within each server.
596 667
597=cut 668=cut
598 669
599sub db_table($) { 670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
600 my ($name) = @_; 674 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV; 675 my $db = BDB::db_create $DB_ENV;
602 676
603 eval { 677 eval {
604 $db->set_flags (BDB::CHKSUM); 678 $db->set_flags (BDB::CHKSUM);
… …
614} 688}
615 689
616our $DB; 690our $DB;
617 691
618sub db_init { 692sub db_init {
619 cf::sync_job {
620 $DB ||= db_table "db"; 693 $DB ||= db_table "db";
621 };
622} 694}
623 695
624sub db_get($$) { 696sub db_get($$) {
625 my $key = "$_[0]/$_[1]"; 697 my $key = "$_[0]/$_[1]";
626 698
627 cf::sync_job { 699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
628 BDB::db_get $DB, undef, $key, my $data; 702 BDB::db_get $DB, undef, $key, my $data;
629 703
630 $! ? () 704 $! ? ()
631 : $data 705 : $data
632 }
633} 706}
634 707
635sub db_put($$$) { 708sub db_put($$$) {
636 BDB::dbreq_pri 4; 709 BDB::dbreq_pri 4;
637 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
693 766
694 my $t1 = Time::HiRes::time; 767 my $t1 = Time::HiRes::time;
695 my $data = $process->(\@data); 768 my $data = $process->(\@data);
696 my $t2 = Time::HiRes::time; 769 my $t2 = Time::HiRes::time;
697 770
698 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
699 772
700 db_put cache => "$id/data", $data; 773 db_put cache => "$id/data", $data;
701 db_put cache => "$id/md5" , $md5; 774 db_put cache => "$id/md5" , $md5;
702 db_put cache => "$id/meta", $meta; 775 db_put cache => "$id/meta", $meta;
703 776
… …
713 786
714=cut 787=cut
715 788
716sub datalog($@) { 789sub datalog($@) {
717 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
718 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
719} 792}
720 793
721=back 794=back
722 795
723=cut 796=cut
724 797
725############################################################################# 798#############################################################################
726 799
727=head2 ATTACHABLE OBJECTS 800=head2 ATTACHABLE OBJECTS
728 801
729Many objects in crossfire are so-called attachable objects. That means you can 802Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 803attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 804to it. All such attachable objects support the following methods.
732 805
733In the following description, CLASS can be any of C<global>, C<object> 806In the following description, CLASS can be any of C<global>, C<object>
734C<player>, C<client> or C<map> (i.e. the attachable objects in 807C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
784=item cf::CLASS::attachment $name, ... 857=item cf::CLASS::attachment $name, ...
785 858
786Register an attachment by C<$name> through which attachable objects of the 859Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 860given CLASS can refer to this attachment.
788 861
789Some classes such as crossfire maps and objects can specify attachments 862Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 863that are attached at load/instantiate time, thus the need for a name.
791 864
792These calls expect any number of the following handler/hook descriptions: 865These calls expect any number of the following handler/hook descriptions:
793 866
794=over 4 867=over 4
… …
918 991
919 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
920 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
921 994
922 } elsif (ref $type) { 995 } elsif (ref $type) {
923 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
924 997
925 } else { 998 } else {
926 shift @arg; 999 shift @arg;
927 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
928 } 1001 }
929 } 1002 }
930} 1003}
931 1004
932sub _object_attach { 1005sub _object_attach {
… …
942 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
943 } 1016 }
944 1017
945 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
946 } else { 1019 } else {
947 warn "object uses attachment '$name' which is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
948 } 1021 }
949 1022
950 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
951} 1024}
952 1025
… …
1011 1084
1012 for (@$callbacks) { 1085 for (@$callbacks) {
1013 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
1014 1087
1015 if ($@) { 1088 if ($@) {
1016 warn "$@";
1017 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1018 override; 1090 override;
1019 } 1091 }
1020 1092
1021 return 1 if $override; 1093 return 1 if $override;
1022 } 1094 }
… …
1085 1157
1086sub reattach { 1158sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1159 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1160 my ($obj) = @_;
1089 1161
1162 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1163 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1164
1092 my $registry = $obj->registry; 1165 my $registry = $obj->registry;
1093 1166
1094 @$registry = (); 1167 @$registry = ();
1095 1168
… …
1100 for (@$attach) { 1173 for (@$attach) {
1101 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
1102 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
1103 } 1176 }
1104 } else { 1177 } else {
1105 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
1106 } 1179 }
1107 } 1180 }
1108} 1181}
1109 1182
1110cf::attachable->attach ( 1183cf::attachable->attach (
… …
1137 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
1138 1211
1139 sync_job { 1212 sync_job {
1140 if (length $$rdata) { 1213 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename); 1214 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
1144 1218
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1220 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 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;
1224 aio_fsync $fh;
1225 }
1149 close $fh; 1226 aio_close $fh;
1150 1227
1151 if (@$objs) { 1228 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1229 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 chmod SAVE_MODE, $fh; 1230 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1231 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1232 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1233 if ($cf::USE_FSYNC) {
1234 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;
1235 aio_fsync $fh;
1236 }
1157 close $fh; 1237 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1238 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1239 }
1160 } else { 1240 } else {
1161 aio_unlink "$filename.pst"; 1241 aio_unlink "$filename.pst";
1162 } 1242 }
1163 1243
1164 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1245
1246 $filename =~ s%/[^/]+$%%;
1247 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1248 } else {
1166 warn "FATAL: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
1167 } 1250 }
1168 } else { 1251 } else {
1169 aio_unlink $filename; 1252 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1171 } 1254 }
… …
1195 my $st = eval { Coro::Storable::thaw $av }; 1278 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs}; 1279 $av = $st->{objs};
1197 } 1280 }
1198 1281
1199 utf8::decode (my $decname = $filename); 1282 utf8::decode (my $decname = $filename);
1200 warn sprintf "loading %s (%d,%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
1201 $decname, length $data, scalar @{$av || []}; 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1202 1286
1203 ($data, $av) 1287 ($data, $av)
1204} 1288}
1205 1289
1206=head2 COMMAND CALLBACKS 1290=head2 COMMAND CALLBACKS
… …
1262 my ($name, $cb) = @_; 1346 my ($name, $cb) = @_;
1263 1347
1264 $EXTICMD{$name} = $cb; 1348 $EXTICMD{$name} = $cb;
1265} 1349}
1266 1350
1351use File::Glob ();
1352
1267cf::player->attach ( 1353cf::player->attach (
1268 on_command => sub { 1354 on_unknown_command => sub {
1269 my ($pl, $name, $params) = @_; 1355 my ($pl, $name, $params) = @_;
1270 1356
1271 my $cb = $COMMAND{$name} 1357 my $cb = $COMMAND{$name}
1272 or return; 1358 or return;
1273 1359
… …
1296 1382
1297 $pl->ext_reply ($reply, @reply) 1383 $pl->ext_reply ($reply, @reply)
1298 if $reply; 1384 if $reply;
1299 1385
1300 } else { 1386 } else {
1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1302 } 1388 }
1303 1389
1304 cf::override; 1390 cf::override;
1305 }, 1391 },
1306); 1392);
1307 1393
1394# "readahead" all extensions
1395sub cache_extensions {
1396 my $grp = IO::AIO::aio_group;
1397
1398 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1399 for (grep /\.ext$/, @{$_[0]}) {
1400 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1401 }
1402 };
1403
1404 $grp
1405}
1406
1308sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1309 cf::sync_job { 1410 cf::sync_job {
1310 my %todo; 1411 my %todo;
1311 1412
1312 for my $path (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
1313 next unless -r $path; 1414 next unless -r $path;
… …
1331 1432
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1435
1335 $ext{source} = 1436 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1437 "package $pkg; use common::sense;\n"
1337 . "#line 1 \"$path\"\n{\n" 1438 . "#line 1 \"$path\"\n{\n"
1338 . $source 1439 . $source
1339 . "\n};\n1"; 1440 . "\n};\n1";
1340 1441
1341 $todo{$base} = \%ext; 1442 $todo{$base} = \%ext;
1342 } 1443 }
1343 1444
1445 my $pass = 0;
1344 my %done; 1446 my %done;
1345 while (%todo) { 1447 while (%todo) {
1346 my $progress; 1448 my $progress;
1347 1449
1450 ++$pass;
1451
1452 ext:
1348 while (my ($k, $v) = each %todo) { 1453 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) { 1454 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip 1455 next ext
1351 unless exists $done{$_}; 1456 unless exists $done{$_};
1352 } 1457 }
1353 1458
1354 warn "... loading '$k' into '$v->{pkg}'\n"; 1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355 1460
1356 unless (eval $v->{source}) { 1461 my $active = eval $v->{source};
1462
1463 if (length $@) {
1357 my $msg = $@ ? "$v->{path}: $@\n" 1464 error "$v->{path}: $@\n";
1358 : "$v->{base}: extension inactive.\n";
1359 1465
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1467 if exists $v->{meta}{mandatory};
1364 1468
1365 warn $msg; 1469 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1470 delete $todo{$k};
1471 } else {
1472 $done{$k} = delete $todo{$k};
1473 push @EXTS, $v->{pkg};
1474 $progress = 1;
1475
1476 info "$v->{base}: extension inactive.\n"
1477 unless $active;
1366 } 1478 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1479 }
1372 1480
1373 skip: 1481 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1482 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 unless $progress; 1483
1484 while (my ($k, $v) = each %todo) {
1485 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486 if exists $v->{meta}{mandatory};
1487 }
1488 }
1376 } 1489 }
1377 }; 1490 };
1378} 1491}
1379 1492
1380############################################################################# 1493#############################################################################
1381 1494
1382=back 1495=back
1383 1496
1384=head2 CORE EXTENSIONS 1497=head2 CORE EXTENSIONS
1385 1498
1386Functions and methods that extend core crossfire objects. 1499Functions and methods that extend core deliantra objects.
1387 1500
1388=cut 1501=cut
1389 1502
1390package cf::player; 1503package cf::player;
1391 1504
… …
1434 1547
1435sub exists($) { 1548sub exists($) {
1436 my ($login) = @_; 1549 my ($login) = @_;
1437 1550
1438 $cf::PLAYER{$login} 1551 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1552 or !aio_stat path $login
1440} 1553}
1441 1554
1442sub find($) { 1555sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1556 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1557 my $login = $_[0];
… …
1456 my $f = new_from_file cf::object::thawer path $login 1569 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1570 or return;
1458 1571
1459 my $pl = cf::player::load_pl $f 1572 my $pl = cf::player::load_pl $f
1460 or return; 1573 or return;
1574
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1575 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1576 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1577 $cf::PLAYER{$login} = $pl
1464 } 1578 }
1465 } 1579 }
1466} 1580}
1467 1581
1582cf::player->attach (
1583 on_load => sub {
1584 my ($pl, $path) = @_;
1585
1586 # restore slots saved in save, below
1587 my $slots = delete $pl->{_slots};
1588
1589 $pl->ob->current_weapon ($slots->[0]);
1590 $pl->combat_ob ($slots->[1]);
1591 $pl->ranged_ob ($slots->[2]);
1592 },
1593);
1594
1468sub save($) { 1595sub save($) {
1469 my ($pl) = @_; 1596 my ($pl) = @_;
1470 1597
1471 return if $pl->{deny_save}; 1598 return if $pl->{deny_save};
1472 1599
… …
1477 1604
1478 aio_mkdir playerdir $pl, 0770; 1605 aio_mkdir playerdir $pl, 0770;
1479 $pl->{last_save} = $cf::RUNTIME; 1606 $pl->{last_save} = $cf::RUNTIME;
1480 1607
1481 cf::get_slot 0.01; 1608 cf::get_slot 0.01;
1609
1610 # save slots, to be restored later
1611 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1482 1612
1483 $pl->save_pl ($path); 1613 $pl->save_pl ($path);
1484 cf::cede_to_tick; 1614 cf::cede_to_tick;
1485} 1615}
1486 1616
… …
1518 my ($pl) = @_; 1648 my ($pl) = @_;
1519 1649
1520 my $name = $pl->ob->name; 1650 my $name = $pl->ob->name;
1521 1651
1522 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1523 $pl->password ("*"); # this should lock out the player until we nuked the dir 1653 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1524 1654
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1656 $pl->deactivate;
1657
1658 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1659 ext::highscore::check ($pl->ob);
1660
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1529 1663
1530 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1570 1704
1571 for my $login (@$dirs) { 1705 for my $login (@$dirs) {
1572 my $path = path $login; 1706 my $path = path $login;
1573 1707
1574 # a .pst is a dead give-away for a valid player 1708 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1709 # if no pst file found, open and chekc for blocked users
1710 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1711 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1712 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1713 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1714 }
1580 1715
… …
1584 1719
1585 \@logins 1720 \@logins
1586} 1721}
1587 1722
1588=item $player->maps 1723=item $player->maps
1724
1725=item cf::player::maps $login
1589 1726
1590Returns an arrayref of map paths that are private for this 1727Returns an arrayref of map paths that are private for this
1591player. May block. 1728player. May block.
1592 1729
1593=cut 1730=cut
… …
1611 } 1748 }
1612 1749
1613 \@paths 1750 \@paths
1614} 1751}
1615 1752
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1753=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1754
1618Expand crossfire pod fragments into protocol xml. 1755Expand deliantra pod fragments into protocol xml.
1619
1620=cut
1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1633sub expand_cfpod {
1634 my ($self, $pod) = @_;
1635
1636 my $xml;
1637
1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1641
1642 $group =~ s/&/&amp;/g;
1643 $group =~ s/</&lt;/g;
1644
1645 $xml .= $group;
1646 } elsif ($pod =~ m%\G
1647 ([BCGHITU])
1648 <
1649 (?:
1650 ([^<>]*) (?{ $group = $^N })
1651 | < $interior >
1652 )
1653 >
1654 %gcsx
1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675 "")
1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1687
1688 for ($xml) {
1689 # create single paragraphs (very hackish)
1690 s/(?<=\S)\n(?=\w)/ /g;
1691
1692 # compress some whitespace
1693 s/\s+\n/\n/g; # ws line-ends
1694 s/\n\n+/\n/g; # double lines
1695 s/^\n+//; # beginning lines
1696 s/\n+$//; # ending lines
1697 }
1698
1699 $xml
1700}
1701
1702no re 'eval';
1703
1704sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode}
1707}
1708 1756
1709=item $player->ext_reply ($msgid, @msg) 1757=item $player->ext_reply ($msgid, @msg)
1710 1758
1711Sends an ext reply to the player. 1759Sends an ext reply to the player.
1712 1760
… …
1744 1792
1745=cut 1793=cut
1746 1794
1747sub find_by_path($) { 1795sub find_by_path($) {
1748 my ($path) = @_; 1796 my ($path) = @_;
1797
1798 $path =~ s/^~[^\/]*//; # skip ~login
1749 1799
1750 my ($match, $specificity); 1800 my ($match, $specificity);
1751 1801
1752 for my $region (list) { 1802 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1803 if ($region->{match} && $path =~ $region->{match}) {
… …
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1835 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786 1836
1787 # mit "rum" bekleckern, nicht 1837 # mit "rum" bekleckern, nicht
1788 $self->_create_random_map ( 1838 $self->_create_random_map (
1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1792 $rmp->{exit_on_final_map}, 1842 $rmp->{exit_on_final_map},
1793 $rmp->{xsize}, $rmp->{ysize}, 1843 $rmp->{xsize}, $rmp->{ysize},
1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1810 1860
1811sub register { 1861sub register {
1812 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 1863 my $pkg = caller;
1814 1864
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 1866
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1868}
1820 1869
1821# also paths starting with '/' 1870# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1872
1824sub thawer_merge { 1873sub thawer_merge {
1825 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1826 1875
1827 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
… …
1832} 1881}
1833 1882
1834sub normalise { 1883sub normalise {
1835 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1836 1885
1837 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1838 1887
1839 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1840 1889
1841 # map plan: 1890 # map plan:
1842 # 1891 #
… …
1881 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1882 return $self; 1931 return $self;
1883 } 1932 }
1884 } 1933 }
1885 1934
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 1936 ()
1888} 1937}
1889 1938
1890sub init { 1939sub init {
1891 my ($self) = @_; 1940 my ($self) = @_;
… …
1923sub uniq_path { 1972sub uniq_path {
1924 my ($self) = @_; 1973 my ($self) = @_;
1925 1974
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1975 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 1976 "$UNIQUEDIR/$path"
1928}
1929
1930# and all this just because we cannot iterate over
1931# all maps in C++...
1932sub change_all_map_light {
1933 my ($change) = @_;
1934
1935 $_->change_map_light ($change)
1936 for grep $_->outdoor, values %cf::MAP;
1937} 1977}
1938 1978
1939sub decay_objects { 1979sub decay_objects {
1940 my ($self) = @_; 1980 my ($self) = @_;
1941 1981
… …
2023 2063
2024sub find; 2064sub find;
2025sub find { 2065sub find {
2026 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
2027 2067
2068 cf::cede_to_tick;
2069
2028 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
2029 2071
2030 cf::lock_wait "map_data:$path";#d#remove 2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
2032 2074
2033 $cf::MAP{$path} || do { 2075 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
2037 my $map = new_from_path cf::map $path 2076 my $map = new_from_path cf::map $path
2038 or return; 2077 or return;
2039 2078
2040 $map->{last_save} = $cf::RUNTIME; 2079 $map->{last_save} = $cf::RUNTIME;
2041 2080
… …
2043 or return; 2082 or return;
2044 2083
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2084 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 2085 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 2086 #$cf::WAIT_FOR_TICK->wait;
2087 undef $guard2;
2048 undef $guard1; 2088 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 2089 $map->reset;
2051 return find $path; 2090 return find $path;
2052 } 2091 }
2053 2092
2054 $cf::MAP{$path} = $map 2093 $cf::MAP{$path} = $map
2055 } 2094 }
2056} 2095}
2057 2096
2058sub pre_load { } 2097sub pre_load { }
2059sub post_load { } 2098#sub post_load { } # XS
2060 2099
2061sub load { 2100sub load {
2062 my ($self) = @_; 2101 my ($self) = @_;
2063 2102
2064 local $self->{deny_reset} = 1; # loading can take a long time 2103 local $self->{deny_reset} = 1; # loading can take a long time
… …
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2120 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2121 $f->skip_block;
2083 $self->_load_objects ($f) 2122 $self->_load_objects ($f)
2084 or return; 2123 or return;
2085 2124
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2125 $self->post_load_original
2087 if delete $self->{load_original}; 2126 if delete $self->{load_original};
2088 2127
2089 if (my $uniq = $self->uniq_path) { 2128 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2129 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2130 unless (aio_stat $uniq) {
… …
2109 unless ($self->{deny_activate}) { 2148 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2149 $self->decay_objects;
2111 $self->fix_auto_apply; 2150 $self->fix_auto_apply;
2112 $self->update_buttons; 2151 $self->update_buttons;
2113 cf::cede_to_tick; 2152 cf::cede_to_tick;
2114 $self->set_darkness_map;
2115 cf::cede_to_tick;
2116 $self->activate; 2153 $self->activate;
2117 } 2154 }
2118 2155
2119 $self->{last_save} = $cf::RUNTIME; 2156 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2157 $self->last_access ($cf::RUNTIME);
… …
2123 } 2160 }
2124 2161
2125 $self->post_load; 2162 $self->post_load;
2126} 2163}
2127 2164
2165# customize the map for a given player, i.e.
2166# return the _real_ map. used by e.g. per-player
2167# maps to change the path to ~playername/mappath
2128sub customise_for { 2168sub customise_for {
2129 my ($self, $ob) = @_; 2169 my ($self, $ob) = @_;
2130 2170
2131 return find "~" . $ob->name . "/" . $self->{path} 2171 return find "~" . $ob->name . "/" . $self->{path}
2132 if $self->per_player; 2172 if $self->per_player;
… …
2148 or next; 2188 or next;
2149 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
2150 or next; 2190 or next;
2151 $neigh->load; 2191 $neigh->load;
2152 2192
2193 # now find the diagonal neighbours
2153 push @neigh, 2194 push @neigh,
2154 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2155 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2156 } 2197 }
2157 2198
… …
2164} 2205}
2165 2206
2166sub find_sync { 2207sub find_sync {
2167 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
2168 2209
2169 cf::sync_job { find $path, $origin } 2210 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211 if $Coro::current == $Coro::main;
2212
2213 find $path, $origin
2170} 2214}
2171 2215
2172sub do_load_sync { 2216sub do_load_sync {
2173 my ($map) = @_; 2217 my ($map) = @_;
2174 2218
2175 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2176 if $Coro::current == $Coro::main; 2220 if $Coro::current == $Coro::main;
2177 2221
2178 cf::sync_job { $map->load }; 2222 $map->load;
2179} 2223}
2180 2224
2181our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
2182our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
2183 2227
… …
2209 $MAP_PREFETCHER->prio (6); 2253 $MAP_PREFETCHER->prio (6);
2210 2254
2211 () 2255 ()
2212} 2256}
2213 2257
2258# common code, used by both ->save and ->swapout
2214sub save { 2259sub _save {
2215 my ($self) = @_; 2260 my ($self) = @_;
2216
2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2261
2219 $self->{last_save} = $cf::RUNTIME; 2262 $self->{last_save} = $cf::RUNTIME;
2220 2263
2221 return unless $self->dirty; 2264 return unless $self->dirty;
2222 2265
… …
2242 } else { 2285 } else {
2243 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2286 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2244 } 2287 }
2245} 2288}
2246 2289
2290sub save {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 $self->_save;
2296}
2297
2247sub swap_out { 2298sub swap_out {
2248 my ($self) = @_; 2299 my ($self) = @_;
2249 2300
2250 # save first because save cedes
2251 $self->save;
2252
2253 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2301 my $lock = cf::lock_acquire "map_data:$self->{path}";
2254 2302
2255 return if $self->players;
2256 return if $self->in_memory != cf::MAP_ACTIVE; 2303 return if $self->in_memory != cf::MAP_ACTIVE;
2257 return if $self->{deny_save}; 2304 return if $self->{deny_save};
2305 return if $self->players;
2258 2306
2307 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2259 $self->in_memory (cf::MAP_SWAPPED); 2310 $self->in_memory (cf::MAP_SWAPPED);
2311
2312 # then atomically save
2313 $self->_save;
2314
2315 # then free the map
2316 $self->clear;
2317}
2318
2319sub reset_at {
2320 my ($self) = @_;
2321
2322 # TODO: safety, remove and allow resettable per-player maps
2323 return 1e99 if $self->{deny_reset};
2324
2325 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2326 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2327
2328 $time + $to
2329}
2330
2331sub should_reset {
2332 my ($self) = @_;
2333
2334 $self->reset_at <= $cf::RUNTIME
2335}
2336
2337sub reset {
2338 my ($self) = @_;
2339
2340 my $lock = cf::lock_acquire "map_data:$self->{path}";
2341
2342 return if $self->players;
2343
2344 cf::trace "resetting map ", $self->path, "\n";
2345
2346 $self->in_memory (cf::MAP_SWAPPED);
2347
2348 # need to save uniques path
2349 unless ($self->{deny_save}) {
2350 my $uniq = $self->uniq_path; utf8::encode $uniq;
2351
2352 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2353 if $uniq;
2354 }
2355
2356 delete $cf::MAP{$self->path};
2260 2357
2261 $self->deactivate; 2358 $self->deactivate;
2262 $_->clear_links_to ($self) for values %cf::MAP; 2359 $_->clear_links_to ($self) for values %cf::MAP;
2263 $self->clear; 2360 $self->clear;
2264}
2265
2266sub reset_at {
2267 my ($self) = @_;
2268
2269 # TODO: safety, remove and allow resettable per-player maps
2270 return 1e99 if $self->{deny_reset};
2271
2272 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2273 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2274
2275 $time + $to
2276}
2277
2278sub should_reset {
2279 my ($self) = @_;
2280
2281 $self->reset_at <= $cf::RUNTIME
2282}
2283
2284sub reset {
2285 my ($self) = @_;
2286
2287 my $lock = cf::lock_acquire "map_data:$self->{path}";
2288
2289 return if $self->players;
2290
2291 warn "resetting map ", $self->path;
2292
2293 $self->in_memory (cf::MAP_SWAPPED);
2294
2295 # need to save uniques path
2296 unless ($self->{deny_save}) {
2297 my $uniq = $self->uniq_path; utf8::encode $uniq;
2298
2299 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2300 if $uniq;
2301 }
2302
2303 delete $cf::MAP{$self->path};
2304
2305 $self->deactivate;
2306 $_->clear_links_to ($self) for values %cf::MAP;
2307 $self->clear;
2308 2361
2309 $self->unlink_save; 2362 $self->unlink_save;
2310 $self->destroy; 2363 $self->destroy;
2311} 2364}
2312 2365
… …
2320 2373
2321 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
2322 2375
2323 $self->unlink_save; 2376 $self->unlink_save;
2324 2377
2325 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
2326 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
2327 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
2328 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
2329 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2330 2383
… …
2387 : normalise $_ 2440 : normalise $_
2388 } @{ aio_readdir $UNIQUEDIR or [] } 2441 } @{ aio_readdir $UNIQUEDIR or [] }
2389 ] 2442 ]
2390} 2443}
2391 2444
2445=item cf::map::static_maps
2446
2447Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2448file in the shared directory excluding F</styles> and F</editor>). May
2449block.
2450
2451=cut
2452
2453sub static_maps() {
2454 my @dirs = "";
2455 my @maps;
2456
2457 while (@dirs) {
2458 my $dir = shift @dirs;
2459
2460 next if $dir eq "/styles" || $dir eq "/editor";
2461
2462 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2463 or return;
2464
2465 for (@$files) {
2466 s/\.map$// or next;
2467 utf8::decode $_;
2468 push @maps, "$dir/$_";
2469 }
2470
2471 push @dirs, map "$dir/$_", @$dirs;
2472 }
2473
2474 \@maps
2475}
2476
2392=back 2477=back
2393 2478
2394=head3 cf::object 2479=head3 cf::object
2395 2480
2396=cut 2481=cut
… …
2457can be C<undef>. Does the right thing when the player is currently in a 2542can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2543dialogue with the given NPC character.
2459 2544
2460=cut 2545=cut
2461 2546
2547our $SAY_CHANNEL = {
2548 id => "say",
2549 title => "Map",
2550 reply => "say ",
2551 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2552};
2553
2554our $CHAT_CHANNEL = {
2555 id => "chat",
2556 title => "Chat",
2557 reply => "chat ",
2558 tooltip => "Player chat and shouts, global to the server.",
2559};
2560
2462# rough implementation of a future "reply" method that works 2561# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2562# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2563#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2564sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2565 my ($self, $npc, $msg, $flags) = @_;
… …
2477 my $dialog = $pl->{npc_dialog}; 2576 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2577 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2578
2480 } else { 2579 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2580 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2581 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2582 }
2484 } 2583 }
2485} 2584}
2486 2585
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2586=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2512 2611
2513=item $player_object->enter_link 2612=item $player_object->enter_link
2514 2613
2515Freezes the player and moves him/her to a special map (C<{link}>). 2614Freezes the player and moves him/her to a special map (C<{link}>).
2516 2615
2517The player should be reasonably safe there for short amounts of time. You 2616The player should be reasonably safe there for short amounts of time (e.g.
2518I<MUST> call C<leave_link> as soon as possible, though. 2617for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2618though, as the player cannot control the character while it is on the link
2619map.
2519 2620
2520Will never block. 2621Will never block.
2521 2622
2522=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
2523 2624
… …
2543sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
2544 my ($self) = @_; 2645 my ($self) = @_;
2545 2646
2546 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
2547 2648
2649 ++$self->{_link_recursion};
2650
2548 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
2549 2652
2550 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2551 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
2552 2655
2553 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2656 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2554} 2657}
2555 2658
2556sub cf::object::player::leave_link { 2659sub cf::object::player::leave_link {
2557 my ($self, $map, $x, $y) = @_; 2660 my ($self, $map, $x, $y) = @_;
2558 2661
… …
2575 ($x, $y) = (-1, -1) 2678 ($x, $y) = (-1, -1)
2576 unless (defined $x) && (defined $y); 2679 unless (defined $x) && (defined $y);
2577 2680
2578 # use -1 or undef as default coordinates, not 0, 0 2681 # use -1 or undef as default coordinates, not 0, 0
2579 ($x, $y) = ($map->enter_x, $map->enter_y) 2682 ($x, $y) = ($map->enter_x, $map->enter_y)
2580 if $x <=0 && $y <= 0; 2683 if $x <= 0 && $y <= 0;
2581 2684
2582 $map->load; 2685 $map->load;
2583 $map->load_neighbours; 2686 $map->load_neighbours;
2584 2687
2585 return unless $self->contr->active; 2688 return unless $self->contr->active;
2586 $self->activate_recursive;
2587 2689
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
2590} 2692 # entering was successful
2693 delete $self->{_link_recursion};
2694 # only activate afterwards, to support waiting in hooks
2695 $self->activate_recursive;
2696 }
2591 2697
2698}
2699
2592=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2700=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2593 2701
2594Moves the player to the given map-path and coordinates by first freezing 2702Moves the player to the given map-path and coordinates by first freezing
2595her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2704that has to return the map if sucecssful, and then unfreezes the player on
2597the new (success) or old (failed) map position. In either case, $done will 2705the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2706be called at the end of this process.
2599 2707
2708Note that $check will be called with a potentially non-loaded map, so if
2709it needs a loaded map it has to call C<< ->load >>.
2710
2600=cut 2711=cut
2601 2712
2602our $GOTOGEN; 2713our $GOTOGEN;
2603 2714
2604sub cf::object::player::goto { 2715sub cf::object::player::goto {
2605 my ($self, $path, $x, $y, $check, $done) = @_; 2716 my ($self, $path, $x, $y, $check, $done) = @_;
2717
2718 if ($self->{_link_recursion} >= $MAX_LINKS) {
2719 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2720 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2721 ($path, $x, $y) = @$EMERGENCY_POSITION;
2722 }
2606 2723
2607 # do generation counting so two concurrent goto's will be executed in-order 2724 # do generation counting so two concurrent goto's will be executed in-order
2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2609 2726
2610 $self->enter_link; 2727 $self->enter_link;
… …
2634 my $map = eval { 2751 my $map = eval {
2635 my $map = defined $path ? cf::map::find $path : undef; 2752 my $map = defined $path ? cf::map::find $path : undef;
2636 2753
2637 if ($map) { 2754 if ($map) {
2638 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
2639 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
2640 } else { 2757 } else {
2641 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2758 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2642 } 2759 }
2643 2760
2644 $map 2761 $map
… …
2652 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
2653 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
2654 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
2655 } 2772 }
2656 2773
2657 $done->() if $done; 2774 $done->($self) if $done;
2658 })->prio (1); 2775 })->prio (1);
2659} 2776}
2660 2777
2661=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
2662 2779
… …
2682} 2799}
2683 2800
2684sub prepare_random_map { 2801sub prepare_random_map {
2685 my ($exit) = @_; 2802 my ($exit) = @_;
2686 2803
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2804 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2805 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2806 # that depends on the exit object
2692 2807
2693 my $rmp = parse_random_map_params $exit->msg; 2808 my $rmp = parse_random_map_params $exit->msg;
… …
2695 if ($exit->map) { 2810 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2811 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2812 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2813 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2814 $rmp->{origin_y} = $exit->y;
2815
2816 $exit->map->touch;
2700 } 2817 }
2701 2818
2702 $rmp->{random_seed} ||= $exit->random_seed; 2819 $rmp->{random_seed} ||= $exit->random_seed;
2703 2820
2704 my $data = JSON::XS->new->utf8->pretty->canolicalize->encode ($rmp); 2821 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2705 my $md5 = Digest::MD5::md5_hex $data; 2822 my $md5 = Digest::MD5::md5_hex $data;
2706 my $meta = "$RANDOMDIR/$md5.meta"; 2823 my $meta = "$RANDOMDIR/$md5.meta";
2707 2824
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2825 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2826 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2827 undef $fh;
2711 aio_rename "$meta~", $meta; 2828 aio_rename "$meta~", $meta;
2712 2829
2830 my $slaying = "?random/$md5";
2831
2832 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2833 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2834 $exit->msg (undef);
2835 }
2715 } 2836 }
2716} 2837}
2717 2838
2718sub cf::object::player::enter_exit { 2839sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2840 my ($self, $exit) = @_;
2720 2841
2721 return unless $self->type == cf::PLAYER; 2842 return unless $self->type == cf::PLAYER;
2722 2843
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 2844 $self->enter_link;
2735 2845
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 2846 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2847 $Coro::current->{desc} = "enter_exit";
2742 2848
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2849 unless (eval {
2850 $self->deactivate_recursive; # just to be sure
2851
2852 # random map handling
2853 {
2854 my $guard = cf::lock_acquire "exit_prepare:$exit";
2855
2856 prepare_random_map $exit
2857 if $exit->slaying eq "/!";
2858 }
2859
2860 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2861 my $x = $exit->stats->hp;
2862 my $y = $exit->stats->sp;
2863
2745 $self->goto ($slaying, $hp, $sp); 2864 $self->goto ($map, $x, $y);
2746 2865
2866 # if exit is damned, update players death & WoR home-position
2867 $self->contr->savebed ($map, $x, $y)
2868 if $exit->flag (cf::FLAG_DAMNED);
2869
2747 1; 2870 1
2748 }) { 2871 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "I'll try to bring you back to the map you were before. " 2873 . "I'll try to bring you back to the map you were before. "
2751 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2876
2754 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2755 $self->leave_link; 2878 $self->leave_link;
2756 } 2879 }
2757 })->prio (1); 2880 })->prio (1);
2758} 2881}
2759 2882
… …
2771sub cf::client::send_drawinfo { 2894sub cf::client::send_drawinfo {
2772 my ($self, $text, $flags) = @_; 2895 my ($self, $text, $flags) = @_;
2773 2896
2774 utf8::encode $text; 2897 utf8::encode $text;
2775 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2898 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2899}
2900
2901=item $client->send_big_packet ($pkt)
2902
2903Like C<send_packet>, but tries to compress large packets, and fragments
2904them as required.
2905
2906=cut
2907
2908our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2909
2910sub cf::client::send_big_packet {
2911 my ($self, $pkt) = @_;
2912
2913 # try lzf for large packets
2914 $pkt = "lzf " . Compress::LZF::compress $pkt
2915 if 1024 <= length $pkt and $self->{can_lzf};
2916
2917 # split very large packets
2918 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2919 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2920 $pkt = "frag";
2921 }
2922
2923 $self->send_packet ($pkt);
2776} 2924}
2777 2925
2778=item $client->send_msg ($channel, $msg, $color, [extra...]) 2926=item $client->send_msg ($channel, $msg, $color, [extra...])
2779 2927
2780Send a drawinfo or msg packet to the client, formatting the msg for the 2928Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2784 2932
2785=cut 2933=cut
2786 2934
2787# non-persistent channels (usually the info channel) 2935# non-persistent channels (usually the info channel)
2788our %CHANNEL = ( 2936our %CHANNEL = (
2937 "c/motd" => {
2938 id => "infobox",
2939 title => "MOTD",
2940 reply => undef,
2941 tooltip => "The message of the day",
2942 },
2789 "c/identify" => { 2943 "c/identify" => {
2790 id => "infobox", 2944 id => "infobox",
2791 title => "Identify", 2945 title => "Identify",
2792 reply => undef, 2946 reply => undef,
2793 tooltip => "Items recently identified", 2947 tooltip => "Items recently identified",
… …
2795 "c/examine" => { 2949 "c/examine" => {
2796 id => "infobox", 2950 id => "infobox",
2797 title => "Examine", 2951 title => "Examine",
2798 reply => undef, 2952 reply => undef,
2799 tooltip => "Signs and other items you examined", 2953 tooltip => "Signs and other items you examined",
2954 },
2955 "c/shopinfo" => {
2956 id => "infobox",
2957 title => "Shop Info",
2958 reply => undef,
2959 tooltip => "What your bargaining skill tells you about the shop",
2800 }, 2960 },
2801 "c/book" => { 2961 "c/book" => {
2802 id => "infobox", 2962 id => "infobox",
2803 title => "Book", 2963 title => "Book",
2804 reply => undef, 2964 reply => undef,
… …
2820 id => "infobox", 2980 id => "infobox",
2821 title => "Body Parts", 2981 title => "Body Parts",
2822 reply => undef, 2982 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 2983 tooltip => "Shows which body parts you posess and are available",
2824 }, 2984 },
2985 "c/statistics" => {
2986 id => "infobox",
2987 title => "Statistics",
2988 reply => undef,
2989 tooltip => "Shows your primary statistics",
2990 },
2991 "c/skills" => {
2992 id => "infobox",
2993 title => "Skills",
2994 reply => undef,
2995 tooltip => "Shows your experience per skill and item power",
2996 },
2997 "c/shopitems" => {
2998 id => "infobox",
2999 title => "Shop Items",
3000 reply => undef,
3001 tooltip => "Shows the items currently for sale in this shop",
3002 },
3003 "c/resistances" => {
3004 id => "infobox",
3005 title => "Resistances",
3006 reply => undef,
3007 tooltip => "Shows your resistances",
3008 },
3009 "c/pets" => {
3010 id => "infobox",
3011 title => "Pets",
3012 reply => undef,
3013 tooltip => "Shows information abotu your pets/a specific pet",
3014 },
3015 "c/perceiveself" => {
3016 id => "infobox",
3017 title => "Perceive Self",
3018 reply => undef,
3019 tooltip => "You gained detailed knowledge about yourself",
3020 },
2825 "c/uptime" => { 3021 "c/uptime" => {
2826 id => "infobox", 3022 id => "infobox",
2827 title => "Uptime", 3023 title => "Uptime",
2828 reply => undef, 3024 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 3025 tooltip => "How long the server has been running since last restart",
… …
2832 id => "infobox", 3028 id => "infobox",
2833 title => "Map Info", 3029 title => "Map Info",
2834 reply => undef, 3030 reply => undef,
2835 tooltip => "Information related to the maps", 3031 tooltip => "Information related to the maps",
2836 }, 3032 },
3033 "c/party" => {
3034 id => "party",
3035 title => "Party",
3036 reply => "gsay ",
3037 tooltip => "Messages and chat related to your party",
3038 },
3039 "c/death" => {
3040 id => "death",
3041 title => "Death",
3042 reply => undef,
3043 tooltip => "Reason for and more info about your most recent death",
3044 },
3045 "c/say" => $SAY_CHANNEL,
3046 "c/chat" => $CHAT_CHANNEL,
2837); 3047);
2838 3048
2839sub cf::client::send_msg { 3049sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 3050 my ($self, $channel, $msg, $color, @extra) = @_;
2841 3051
2842 $msg = $self->pl->expand_cfpod ($msg); 3052 $msg = $self->pl->expand_cfpod ($msg)
3053 unless $color & cf::NDI_VERBATIM;
2843 3054
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 3055 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 3056
2846 # check predefined channels, for the benefit of C 3057 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 3058 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel}; 3059 $channel = $CHANNEL{$channel};
2849 3060
2850 $self->ext_msg (channel_info => $channel) 3061 $self->ext_msg (channel_info => $channel);
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id}; 3062 $channel = $channel->{id};
2854 3063
2855 } elsif (ref $channel) { 3064 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent 3065 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) { 3066 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel; 3067 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel) 3068 $self->ext_msg (channel_info => $channel);
2860 if $self->can_msg;
2861 } 3069 }
2862 3070
2863 $channel = $channel->{id}; 3071 $channel = $channel->{id};
2864 } 3072 }
2865 3073
2866 return unless @extra || length $msg; 3074 return unless @extra || length $msg;
2867 3075
2868 if ($self->can_msg) {
2869 # default colour, mask it out 3076 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3077 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 3078 if $color & cf::NDI_DEF;
2872 3079
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3080 my $pkt = "msg "
3081 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3082 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2875 } else { 3083 );
2876 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones
2878 for ($msg) {
2879 1 while
2880 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2881 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2882 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2883 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2884 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2885 }
2886 3084
2887 $color &= cf::NDI_COLOR_MASK; 3085 $self->send_big_packet ($pkt);
2888
2889 utf8::encode $msg;
2890
2891 if (0 && $msg =~ /\[/) {
2892 # COMMAND/INFO
2893 $self->send_packet ("drawextinfo $color 10 8 $msg")
2894 } else {
2895 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2896 $self->send_packet ("drawinfo $color $msg")
2897 }
2898 }
2899 }
2900} 3086}
2901 3087
2902=item $client->ext_msg ($type, @msg) 3088=item $client->ext_msg ($type, @msg)
2903 3089
2904Sends an ext event to the client. 3090Sends an ext event to the client.
… …
2907 3093
2908sub cf::client::ext_msg($$@) { 3094sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 3095 my ($self, $type, @msg) = @_;
2910 3096
2911 if ($self->extcmd == 2) { 3097 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3098 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove 3099 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type"; 3100 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 } 3102 }
2917} 3103}
2918 3104
2919=item $client->ext_reply ($msgid, @msg) 3105=item $client->ext_reply ($msgid, @msg)
2920 3106
… …
2924 3110
2925sub cf::client::ext_reply($$@) { 3111sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_; 3112 my ($self, $id, @msg) = @_;
2927 3113
2928 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) { 3116 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove 3117 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id; 3118 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 } 3120 }
2935} 3121}
2936 3122
2937=item $success = $client->query ($flags, "text", \&cb) 3123=item $success = $client->query ($flags, "text", \&cb)
2938 3124
… …
3009 3195
3010 $ns->ext_reply ($reply, @reply) 3196 $ns->ext_reply ($reply, @reply)
3011 if $reply; 3197 if $reply;
3012 3198
3013 } else { 3199 } else {
3014 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3200 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3015 } 3201 }
3016 3202
3017 cf::override; 3203 cf::override;
3018 }, 3204 },
3019); 3205);
… …
3039 3225
3040 $coro 3226 $coro
3041} 3227}
3042 3228
3043cf::client->attach ( 3229cf::client->attach (
3044 on_destroy => sub { 3230 on_client_destroy => sub {
3045 my ($ns) = @_; 3231 my ($ns) = @_;
3046 3232
3047 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3233 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3048 }, 3234 },
3049); 3235);
… …
3065our $safe_hole = new Safe::Hole; 3251our $safe_hole = new Safe::Hole;
3066 3252
3067$SIG{FPE} = 'IGNORE'; 3253$SIG{FPE} = 'IGNORE';
3068 3254
3069$safe->permit_only (Opcode::opset qw( 3255$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3256 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3257 grepstart grepwhile mapstart mapwhile
3072 sort time 3258 sort time
3073)); 3259));
3074 3260
3075# here we export the classes and methods available to script code 3261# here we export the classes and methods available to script code
… …
3078 3264
3079The following functions and methods are available within a safe environment: 3265The following functions and methods are available within a safe environment:
3080 3266
3081 cf::object 3267 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3268 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3269 insert remove name archname title slaying race decrease split
3270 value
3084 3271
3085 cf::object::player 3272 cf::object::player
3086 player 3273 player
3087 3274
3088 cf::player 3275 cf::player
… …
3093 3280
3094=cut 3281=cut
3095 3282
3096for ( 3283for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3284 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3285 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3286 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3288 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
3103) { 3290) {
3104 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3107 for @funs; 3293 for @funs;
3108} 3294}
3109 3295
… …
3124 3310
3125 my $qcode = $code; 3311 my $qcode = $code;
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3312 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3313 $qcode =~ s/\n/\\n/g;
3128 3314
3315 %vars = (_dummy => 0) unless %vars;
3316
3317 my @res;
3129 local $_; 3318 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3319
3132 my $eval = 3320 my $eval =
3133 "do {\n" 3321 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3322 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3323 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3324 . $code
3137 . "\n}" 3325 . "\n}"
3138 ; 3326 ;
3139 3327
3328 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3329 sub_generation_inc;
3330 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3331 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 sub_generation_inc; 3332 sub_generation_inc;
3333 } else {
3334 local @cf::_safe_eval_args = values %vars;
3335 @res = wantarray ? eval eval : scalar eval $eval;
3336 }
3143 3337
3144 if ($@) { 3338 if ($@) {
3145 warn "$@"; 3339 warn "$@",
3146 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
3148 } 3342 }
3149 3343
3150 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
3151} 3345}
3152 3346
… …
3166=cut 3360=cut
3167 3361
3168sub register_script_function { 3362sub register_script_function {
3169 my ($fun, $cb) = @_; 3363 my ($fun, $cb) = @_;
3170 3364
3171 no strict 'refs'; 3365 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3366 *$fun = $safe_hole->wrap ($cb);
3173} 3367}
3174 3368
3175=back 3369=back
3176 3370
3177=cut 3371=cut
… …
3186 # for this (global event?) 3380 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = (); 3381 %ext::player_env::MUSIC_FACE_CACHE = ();
3188 3382
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190 3384
3191 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
3192 3386
3193 my $facedata;
3194 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
3195 or die "$path: $!"; 3388 or die "$path: $!";
3196 3389
3197 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
3198 3391
3199 $facedata->{version} == 2 3392 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3393 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3394
3202 # patch in the exptable 3395 # patch in the exptable
3396 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3203 $facedata->{resource}{"res/exp_table"} = { 3397 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3398 type => FT_RSRC,
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3399 data => $exp_table,
3400 hash => (Digest::MD5::md5 $exp_table),
3206 }; 3401 };
3207 cf::cede_to_tick; 3402 cf::cede_to_tick;
3208 3403
3209 { 3404 {
3210 my $faces = $facedata->{faceinfo}; 3405 my $faces = $facedata->{faceinfo};
… …
3212 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3408 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3409
3215 cf::face::set_visibility $idx, $info->{visibility}; 3410 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3411 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3412 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3413 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3219 3414
3220 cf::cede_to_tick; 3415 cf::cede_to_tick;
3221 } 3416 }
3222 3417
3223 while (my ($face, $info) = each %$faces) { 3418 while (my ($face, $info) = each %$faces) {
… …
3228 3423
3229 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3230 cf::face::set_smooth $idx, $smooth; 3425 cf::face::set_smooth $idx, $smooth;
3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232 } else { 3427 } else {
3233 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
3234 } 3429 }
3235 3430
3236 cf::cede_to_tick; 3431 cf::cede_to_tick;
3237 } 3432 }
3238 } 3433 }
… …
3247 3442
3248 cf::anim::invalidate_all; # d'oh 3443 cf::anim::invalidate_all; # d'oh
3249 } 3444 }
3250 3445
3251 { 3446 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3447 my $res = $facedata->{resource};
3255 3448
3256 while (my ($name, $info) = each %$res) { 3449 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3450 if (defined $info->{type}) {
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3451 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3452
3261 if ($info->{type} & 1) { 3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type}; 3454 cf::face::set_type $idx, $info->{type};
3276 } else { 3455 } else {
3277 $RESOURCE{$name} = $info; 3456 $RESOURCE{$name} = $info; # unused
3278 } 3457 }
3279 3458
3280 cf::cede_to_tick; 3459 cf::cede_to_tick;
3281 } 3460 }
3282 } 3461 }
3283 3462
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3463 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285 3464
3286 1 3465 1
3287} 3466}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3308 3467
3309register_exticmd fx_want => sub { 3468register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_; 3469 my ($ns, $want) = @_;
3311 3470
3312 while (my ($k, $v) = each %$want) { 3471 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v); 3472 $ns->fx_want ($k, $v);
3314 } 3473 }
3315}; 3474};
3475
3476sub load_resource_file($) {
3477 my $guard = lock_acquire "load_resource_file";
3478
3479 my $status = load_resource_file_ $_[0];
3480 get_slot 0.1, 100;
3481 cf::arch::commit_load;
3482
3483 $status
3484}
3316 3485
3317sub reload_regions { 3486sub reload_regions {
3318 # HACK to clear player env face cache, we need some signal framework 3487 # HACK to clear player env face cache, we need some signal framework
3319 # for this (global event?) 3488 # for this (global event?)
3320 %ext::player_env::MUSIC_FACE_CACHE = (); 3489 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3334} 3503}
3335 3504
3336sub reload_archetypes { 3505sub reload_archetypes {
3337 load_resource_file "$DATADIR/archetypes" 3506 load_resource_file "$DATADIR/archetypes"
3338 or die "unable to load archetypes\n"; 3507 or die "unable to load archetypes\n";
3339 #d# NEED to laod twice to resolve forward references
3340 # this really needs to be done in an extra post-pass
3341 # (which needs to be synchronous, so solve it differently)
3342 load_resource_file "$DATADIR/archetypes"
3343 or die "unable to load archetypes\n";
3344} 3508}
3345 3509
3346sub reload_treasures { 3510sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
3349} 3513}
3350 3514
3515sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n";
3517
3518 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519 or die "$DATADIR/sound $!";
3520
3521 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3522
3523 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524 my $sound = $soundconf->{compat}[$_]
3525 or next;
3526
3527 my $face = cf::face::find "sound/$sound->[1]";
3528 cf::sound::set $sound->[0] => $face;
3529 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3530 }
3531
3532 while (my ($k, $v) = each %{$soundconf->{event}}) {
3533 my $face = cf::face::find "sound/$v";
3534 cf::sound::set $k => $face;
3535 }
3536}
3537
3351sub reload_resources { 3538sub reload_resources {
3352 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
3353 3540
3541 reload_exp_table;
3542 reload_materials;
3543 reload_facedata;
3544 reload_sound;
3545 reload_archetypes;
3354 reload_regions; 3546 reload_regions;
3355 reload_facedata;
3356 #reload_archetypes;#d#
3357 reload_archetypes;
3358 reload_treasures; 3547 reload_treasures;
3359 3548
3360 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
3361}
3362
3363sub init {
3364 reload_resources;
3365} 3550}
3366 3551
3367sub reload_config { 3552sub reload_config {
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3553 trace "reloading config file...\n";
3369 or return;
3370 3554
3371 local $/; 3555 0 < aio_load "$CONFDIR/config", my $config
3556 or die "$CONFDIR/config: $!";
3557
3558 utf8::decode $config;
3559
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3372 *CFG = YAML::Load <$fh>; 3561 *CFG = YAML::XS::Load $config;
3373 3562
3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3375 3564
3376 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3565 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3377 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3566 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3378 3567
3379 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
… …
3383 }; 3572 };
3384 warn $@ if $@; 3573 warn $@ if $@;
3385 } 3574 }
3386} 3575}
3387 3576
3577sub pidfile() {
3578 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3579 or die "$PIDFILE: $!";
3580 flock $fh, &Fcntl::LOCK_EX
3581 or die "$PIDFILE: flock: $!";
3582 $fh
3583}
3584
3585# make sure only one server instance is running at any one time
3586sub atomic {
3587 my $fh = pidfile;
3588
3589 my $pid = <$fh>;
3590 kill 9, $pid if $pid > 0;
3591
3592 seek $fh, 0, 0;
3593 print $fh $$;
3594}
3595
3596sub main_loop {
3597 trace "EV::loop starting\n";
3598 if (1) {
3599 EV::loop;
3600 }
3601 trace "EV::loop returned\n";
3602 goto &main_loop unless $REALLY_UNLOOP;
3603}
3604
3388sub main { 3605sub main {
3606 cf::init_globals; # initialise logging
3607
3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3609 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3612
3613 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3614
3389 # we must not ever block the main coroutine 3615 # we must not ever block the main coroutine
3390 local $Coro::idle = sub { 3616 local $Coro::idle = sub {
3391 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3617 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3392 (async { 3618 (async {
3393 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3619 $Coro::current->{desc} = "IDLE BUG HANDLER";
3394 EV::loop EV::LOOP_ONESHOT; 3620 EV::loop EV::LOOP_ONESHOT;
3395 })->prio (Coro::PRIO_MAX); 3621 })->prio (Coro::PRIO_MAX);
3396 }; 3622 };
3397 3623
3398 reload_config;
3399 db_init;
3400 load_extensions;
3401
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 evthread_start IO::AIO::poll_fileno; 3624 evthread_start IO::AIO::poll_fileno;
3404 EV::loop; 3625
3626 cf::sync_job {
3627 cf::incloader::init ();
3628
3629 cf::init_anim;
3630 cf::init_attackmess;
3631 cf::init_dynamic;
3632
3633 cf::load_settings;
3634
3635 reload_resources;
3636 reload_config;
3637 db_init;
3638
3639 cf::init_uuid;
3640 cf::init_signals;
3641 cf::init_skills;
3642
3643 cf::init_beforeplay;
3644
3645 atomic;
3646
3647 load_extensions;
3648
3649 utime time, time, $RUNTIMEFILE;
3650
3651 # no (long-running) fork's whatsoever before this point(!)
3652 use POSIX ();
3653 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3654
3655 (pop @POST_INIT)->(0) while @POST_INIT;
3656 };
3657
3658 cf::object::thawer::errors_are_fatal 0;
3659 info "parse errors in files are no longer fatal from this point on.\n";
3660
3661 my $free_main; $free_main = EV::idle sub {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :)
3664 };
3665
3666 goto &main_loop;
3405} 3667}
3406 3668
3407############################################################################# 3669#############################################################################
3408# initialisation and cleanup 3670# initialisation and cleanup
3409 3671
3410# install some emergency cleanup handlers 3672# install some emergency cleanup handlers
3411BEGIN { 3673BEGIN {
3412 our %SIGWATCHER = (); 3674 our %SIGWATCHER = ();
3413 for my $signal (qw(INT HUP TERM)) { 3675 for my $signal (qw(INT HUP TERM)) {
3414 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3676 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3415 cf::cleanup "SIG$signal"; 3677 cf::cleanup "SIG$signal";
3416 }; 3678 };
3417 } 3679 }
3418} 3680}
3419 3681
3420sub write_runtime_sync { 3682sub write_runtime_sync {
3421 my $runtime = "$LOCALDIR/runtime"; 3683 my $t0 = AE::time;
3422 3684
3423 # first touch the runtime file to show we are still running: 3685 # first touch the runtime file to show we are still running:
3424 # the fsync below can take a very very long time. 3686 # the fsync below can take a very very long time.
3425 3687
3426 IO::AIO::aio_utime $runtime, undef, undef; 3688 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427 3689
3428 my $guard = cf::lock_acquire "write_runtime"; 3690 my $guard = cf::lock_acquire "write_runtime";
3429 3691
3430 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3692 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3431 or return; 3693 or return;
3432 3694
3433 my $value = $cf::RUNTIME + 90 + 10; 3695 my $value = $cf::RUNTIME + 90 + 10;
3434 # 10 is the runtime save interval, for a monotonic clock 3696 # 10 is the runtime save interval, for a monotonic clock
3435 # 60 allows for the watchdog to kill the server. 3697 # 60 allows for the watchdog to kill the server.
… …
3445 aio_utime $fh, undef, undef; 3707 aio_utime $fh, undef, undef;
3446 3708
3447 close $fh 3709 close $fh
3448 or return; 3710 or return;
3449 3711
3450 aio_rename "$runtime~", $runtime 3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451 and return; 3713 and return;
3452 3714
3453 warn "runtime file written.\n"; 3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3454 3716
3455 1 3717 1
3456} 3718}
3457 3719
3458our $uuid_lock; 3720our $uuid_lock;
… …
3467 my $uuid = "$LOCALDIR/uuid"; 3729 my $uuid = "$LOCALDIR/uuid";
3468 3730
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3731 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3732 or return;
3471 3733
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3734 my $value = uuid_seq uuid_cur;
3735
3736 unless ($value) {
3737 info "cowardly refusing to write zero uuid value!\n";
3738 return;
3739 }
3740
3741 my $value = uuid_str $value + $uuid_skip;
3473 $uuid_skip = 0; 3742 $uuid_skip = 0;
3474 3743
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3744 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3745 and return;
3477 3746
… …
3483 or return; 3752 or return;
3484 3753
3485 aio_rename "$uuid~", $uuid 3754 aio_rename "$uuid~", $uuid
3486 and return; 3755 and return;
3487 3756
3488 warn "uuid file written ($value).\n"; 3757 trace "uuid file written ($value).\n";
3489 3758
3490 1 3759 1
3491 3760
3492} 3761}
3493 3762
… …
3499} 3768}
3500 3769
3501sub emergency_save() { 3770sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
3503 3772
3504 warn "enter emergency perl save\n"; 3773 info "emergency_perl_save: enter\n";
3774
3775 # this is a trade-off: we want to be very quick here, so
3776 # save all maps without fsync, and later call a global sync
3777 # (which in turn might be very very slow)
3778 local $USE_FSYNC = 0;
3505 3779
3506 cf::sync_job { 3780 cf::sync_job {
3781 cf::write_runtime_sync; # external watchdog should not bark
3782
3507 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3786 info "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3789 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3791 $pl->save;
3516 } 3792 }
3517 warn "end emergency player save\n"; 3793 info "emergency_perl_save: end player save\n";
3518 3794
3519 warn "begin emergency map save\n"; 3795 cf::write_runtime_sync; # external watchdog should not bark
3796
3797 info "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3800 $map->valid or next;
3523 $map->save; 3801 $map->save;
3524 } 3802 }
3525 warn "end emergency map save\n"; 3803 info "emergency_perl_save: end map save\n";
3526 3804
3527 warn "begin emergency database checkpoint\n"; 3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3807 info "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3530 3810
3531 warn "begin write uuid\n"; 3811 info "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3812 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3813 info "emergency_perl_save: end write uuid\n";
3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 trace "emergency_perl_save: syncing database to disk";
3818 BDB::db_env_txn_checkpoint $DB_ENV;
3819
3820 info "emergency_perl_save: starting sync\n";
3821 IO::AIO::aio_sync sub {
3822 info "emergency_perl_save: finished sync\n";
3823 };
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: flushing outstanding aio requests";
3828 while (IO::AIO::nreqs || BDB::nreqs) {
3829 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3830 }
3831
3832 cf::write_runtime_sync; # external watchdog should not bark
3534 }; 3833 };
3535 3834
3536 warn "leave emergency perl save\n"; 3835 info "emergency_perl_save: leave\n";
3537} 3836}
3538 3837
3539sub post_cleanup { 3838sub post_cleanup {
3540 my ($make_core) = @_; 3839 my ($make_core) = @_;
3541 3840
3841 IO::AIO::flush;
3842
3542 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
3543 if $make_core; 3844 if $make_core;
3845
3846 my $fh = pidfile;
3847 unlink $PIDFILE if <$fh> == $$;
3848}
3849
3850# a safer delete_package, copied from Symbol
3851sub clear_package($) {
3852 my $pkg = shift;
3853
3854 # expand to full symbol table name if needed
3855 unless ($pkg =~ /^main::.*::$/) {
3856 $pkg = "main$pkg" if $pkg =~ /^::/;
3857 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3858 $pkg .= '::' unless $pkg =~ /::$/;
3859 }
3860
3861 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3862 my $stem_symtab = *{$stem}{HASH};
3863
3864 defined $stem_symtab and exists $stem_symtab->{$leaf}
3865 or return;
3866
3867 # clear all symbols
3868 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3869 for my $name (keys %$leaf_symtab) {
3870 _gv_clear *{"$pkg$name"};
3871# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3872 }
3544} 3873}
3545 3874
3546sub do_reload_perl() { 3875sub do_reload_perl() {
3547 # can/must only be called in main 3876 # can/must only be called in main
3548 if ($Coro::current != $Coro::main) { 3877 unless (in_main) {
3549 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
3550 return; 3879 return;
3551 } 3880 }
3552 3881
3882 return if $RELOAD++;
3883
3884 my $t1 = AE::time;
3885
3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
3553 warn "reloading..."; 3888 info "reloading...";
3554 3889
3555 warn "entering sync_job"; 3890 trace "entering sync_job";
3556 3891
3557 cf::sync_job { 3892 cf::sync_job {
3558 cf::write_runtime_sync; # external watchdog should not bark
3559 cf::emergency_save; 3893 #cf::emergency_save;
3560 cf::write_runtime_sync; # external watchdog should not bark
3561 3894
3562 warn "syncing database to disk";
3563 BDB::db_env_txn_checkpoint $DB_ENV;
3564
3565 # if anything goes wrong in here, we should simply crash as we already saved
3566
3567 warn "flushing outstanding aio requests";
3568 for (;;) {
3569 BDB::flush;
3570 IO::AIO::flush;
3571 Coro::cede_notself;
3572 last unless IO::AIO::nreqs || BDB::nreqs;
3573 warn "iterate...";
3574 }
3575
3576 ++$RELOAD;
3577
3578 warn "cancelling all extension coros"; 3895 trace "cancelling all extension coros";
3579 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
3580 %EXT_CORO = (); 3897 %EXT_CORO = ();
3581 3898
3582 warn "removing commands"; 3899 trace "removing commands";
3583 %COMMAND = (); 3900 %COMMAND = ();
3584 3901
3585 warn "removing ext/exti commands"; 3902 trace "removing ext/exti commands";
3586 %EXTCMD = (); 3903 %EXTCMD = ();
3587 %EXTICMD = (); 3904 %EXTICMD = ();
3588 3905
3589 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
3590 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
3591 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
3592 3909
3593 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
3594 eval { 3911 eval {
3595 $cb->($pkg); 3912 $cb->($pkg);
3596 1 3913 1
3597 } or warn "$pkg unloaded, but with errors: $@"; 3914 } or error "$pkg unloaded, but with errors: $@";
3915 }
3916
3917 trace "... clearing $pkg";
3918 clear_package $pkg;
3598 } 3919 }
3599 3920
3600 warn "... nuking $pkg";
3601 Symbol::delete_package $pkg;
3602 }
3603
3604 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
3605 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
3606 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3607 3924
3608 warn "... unloading $k"; 3925 trace "... unloading $k";
3609 delete $INC{$k}; 3926 delete $INC{$k};
3610 3927
3611 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
3612 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
3613 3930
3614 if (my $cb = $k->can ("unload_module")) { 3931 if (my $cb = $k->can ("unload_module")) {
3615 $cb->(); 3932 $cb->();
3933 }
3934
3935 clear_package $k;
3616 } 3936 }
3617 3937
3618 Symbol::delete_package $k;
3619 }
3620
3621 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
3622 Symbol::delete_package "safe::$_" 3939 clear_package "safe::$_"
3623 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3940 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3624 3941
3625 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
3626 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
3627 delete $INC{"cf/pod.pm"}; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3628 3945
3629 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
3630 # and global variables created in xs 3947 # and global variables created in xs
3631 #Symbol::delete_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
3632 3949
3633 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
3634 3951
3635 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
3636 require cf; 3953 require cf;
3637 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3954 cf::_connect_to_perl_1;
3638 3955
3639 warn "loading config and database again"; 3956 trace "loading config and database again";
3640 cf::reload_config; 3957 cf::reload_config;
3641 3958
3642 warn "loading extensions"; 3959 trace "loading extensions";
3643 cf::load_extensions; 3960 cf::load_extensions;
3644 3961
3962 if ($REATTACH_ON_RELOAD) {
3645 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
3646 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
3647 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
3648 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
3649 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
3650 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3969 }
3651 3970
3971 trace "running post_init jobs";
3972 (pop @POST_INIT)->(1) while @POST_INIT;
3973
3652 warn "leaving sync_job"; 3974 trace "leaving sync_job";
3653 3975
3654 1 3976 1
3655 } or do { 3977 } or do {
3656 warn $@; 3978 error $@;
3657 cf::cleanup "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
3980 };
3981
3982 info "reloaded";
3983 --$RELOAD;
3658 }; 3984 }
3659 3985
3660 warn "reloaded"; 3986 $t1 = AE::time - $t1;
3987 info "reload completed in ${t1}s\n";
3661}; 3988};
3662 3989
3663our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
3664 3991
3665sub reload_perl() { 3992sub reload_perl() {
3666 # doing reload synchronously and two reloads happen back-to-back, 3993 # doing reload synchronously and two reloads happen back-to-back,
3667 # coro crashes during coro_state_free->destroy here. 3994 # coro crashes during coro_state_free->destroy here.
3668 3995
3996 $RELOAD_WATCHER ||= cf::async {
3997 Coro::AIO::aio_wait cache_extensions;
3998
3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3999 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3670 do_reload_perl; 4000 do_reload_perl;
3671 undef $RELOAD_WATCHER; 4001 undef $RELOAD_WATCHER;
4002 };
3672 }; 4003 };
3673} 4004}
3674 4005
3675register_command "reload" => sub { 4006register_command "reload" => sub {
3676 my ($who, $arg) = @_; 4007 my ($who, $arg) = @_;
… …
3682 reload_perl; 4013 reload_perl;
3683 }; 4014 };
3684 } 4015 }
3685}; 4016};
3686 4017
3687unshift @INC, $LIBDIR; 4018#############################################################################
3688 4019
3689my $bug_warning = 0; 4020my $bug_warning = 0;
3690 4021
3691our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
3693 4024
3694sub wait_for_tick { 4025sub wait_for_tick() {
3695 return if tick_inhibit;
3696 return if $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3697 4027
3698 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
3699 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
3700 $signal->wait; 4030 $signal->wait;
3701} 4031}
3702 4032
3703sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
3704 return if tick_inhibit;
3705 return if $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3706 4035
3707 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
3708 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
3709 $signal->wait; 4038 $signal->wait;
3710} 4039}
… …
3716 return; 4045 return;
3717 } 4046 }
3718 4047
3719 cf::server_tick; # one server iteration 4048 cf::server_tick; # one server iteration
3720 4049
4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4051
3721 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3722 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4053 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3723 Coro::async_pool { 4054 Coro::async_pool {
3724 $Coro::current->{desc} = "runtime saver"; 4055 $Coro::current->{desc} = "runtime saver";
3725 write_runtime_sync 4056 write_runtime_sync
3726 or warn "ERROR: unable to write runtime file: $!"; 4057 or error "ERROR: unable to write runtime file: $!";
3727 }; 4058 };
3728 } 4059 }
3729 4060
3730 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3731 $sig->send; 4062 $sig->send;
… …
3739 4070
3740 if (0) { 4071 if (0) {
3741 if ($NEXT_TICK) { 4072 if ($NEXT_TICK) {
3742 my $jitter = $TICK_START - $NEXT_TICK; 4073 my $jitter = $TICK_START - $NEXT_TICK;
3743 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3744 warn "jitter $JITTER\n";#d# 4075 debug "jitter $JITTER\n";#d#
3745 } 4076 }
3746 } 4077 }
3747} 4078}
3748 4079
3749{ 4080{
3750 # configure BDB 4081 # configure BDB
3751 4082
3752 BDB::min_parallel 8; 4083 BDB::min_parallel 16;
3753 BDB::max_poll_reqs $TICK * 0.1; 4084 BDB::max_poll_reqs $TICK * 0.1;
3754 $Coro::BDB::WATCHER->priority (1); 4085 $AnyEvent::BDB::WATCHER->priority (1);
3755 4086
3756 unless ($DB_ENV) { 4087 unless ($DB_ENV) {
3757 $DB_ENV = BDB::db_env_create; 4088 $DB_ENV = BDB::db_env_create;
3758 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4089 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3759 | BDB::LOG_AUTOREMOVE, 1); 4090 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4091 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3760 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4092 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3761 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4093 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3762 4094
3763 cf::sync_job { 4095 cf::sync_job {
3764 eval { 4096 eval {
… …
3790{ 4122{
3791 # configure IO::AIO 4123 # configure IO::AIO
3792 4124
3793 IO::AIO::min_parallel 8; 4125 IO::AIO::min_parallel 8;
3794 IO::AIO::max_poll_time $TICK * 0.1; 4126 IO::AIO::max_poll_time $TICK * 0.1;
3795 $Coro::AIO::WATCHER->priority (1); 4127 undef $AnyEvent::AIO::WATCHER;
3796} 4128}
3797 4129
3798my $_log_backtrace; 4130my $_log_backtrace;
3799 4131
3800sub _log_backtrace { 4132sub _log_backtrace {
… …
3803 $msg =~ s/\n//; 4135 $msg =~ s/\n//;
3804 4136
3805 # limit the # of concurrent backtraces 4137 # limit the # of concurrent backtraces
3806 if ($_log_backtrace < 2) { 4138 if ($_log_backtrace < 2) {
3807 ++$_log_backtrace; 4139 ++$_log_backtrace;
4140 my $perl_bt = Carp::longmess $msg;
3808 async { 4141 async {
3809 $Coro::current->{desc} = "abt $msg"; 4142 $Coro::current->{desc} = "abt $msg";
3810 4143
3811 my @bt = fork_call { 4144 my @bt = fork_call {
3812 @addr = map { sprintf "%x", $_ } @addr; 4145 @addr = map { sprintf "%x", $_ } @addr;
… …
3823 } 4156 }
3824 4157
3825 @funcs 4158 @funcs
3826 }; 4159 };
3827 4160
3828 LOG llevInfo, "[ABT] $msg\n"; 4161 LOG llevInfo, "[ABT] $perl_bt\n";
4162 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3829 LOG llevInfo, "[ABT] $_\n" for @bt; 4163 LOG llevInfo, "[ABT] $_\n" for @bt;
3830 --$_log_backtrace; 4164 --$_log_backtrace;
3831 }; 4165 };
3832 } else { 4166 } else {
3833 LOG llevInfo, "[ABT] $msg\n"; 4167 LOG llevInfo, "[ABT] $msg\n";
3834 LOG llevInfo, "[ABT] [suppressed]\n"; 4168 LOG llevInfo, "[ABT] [suppressed]\n";
3835 } 4169 }
3836} 4170}
3837 4171
3838# load additional modules 4172# load additional modules
3839use cf::pod; 4173require "cf/$_.pm" for @EXTRA_MODULES;
4174cf::_connect_to_perl_2;
3840 4175
3841END { cf::emergency_save } 4176END { cf::emergency_save }
3842 4177
38431 41781
3844 4179

Diff Legend

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