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.548 by root, Mon May 10 21:40:22 2010 UTC

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

Diff Legend

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