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.411 by root, Fri Feb 1 15:54:07 2008 UTC vs.
Revision 1.504 by root, Sat Jan 30 23:50:16 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use EV 1.86; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 4.32 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
18use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
23use Coro::BDB; 51use Coro::BDB 1.6;
24use Coro::Storable; 52use Coro::Storable;
25use Coro::Util (); 53use Coro::Util ();
26 54
27use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
28use BDB (); 56use BDB ();
29use Data::Dumper; 57use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 58use Fcntl;
32use YAML (); 59use YAML::XS ();
33use IO::AIO 2.51 (); 60use IO::AIO ();
34use Time::HiRes; 61use Time::HiRes;
35use Compress::LZF; 62use Compress::LZF;
36use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
37 66
38# configure various modules to our taste 67# configure various modules to our taste
39# 68#
40$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43 77
44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45 80
46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
47 82
48our %COMMAND = (); 83our %COMMAND = ();
49our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
52our %EXTCMD = (); 87our %EXTCMD = ();
53our %EXTICMD = (); 88our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
56 91
57our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
59 96
60our $CONFDIR = confdir; 97our $CONFDIR = confdir;
61our $DATADIR = datadir; 98our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
71our %RESOURCE; 111our %RESOURCE;
72 112
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 115our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
79 117
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 121our $DB_ENV;
85 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
86our %CFG; 125our %CFG;
87 126
88our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 128our $RUNTIME;
90our $NOW; 129our $NOW;
96# used to convert map paths into valid unix filenames by replacing / by ∕ 135# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 137
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
102 147
103binmode STDOUT; 148binmode STDOUT;
104binmode STDERR; 149binmode STDERR;
105 150
106# read virtual server time, if available 151# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
111} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
112 159
113mkdir $_ 160mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 162
116our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
117 164
118sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
119 177
120############################################################################# 178#############################################################################
121 179
122=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
123 181
170returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
171per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172 230
173=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
174 232
175This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call. 235that call.
178 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
179=back 243=back
180 244
181=cut 245=cut
182 246
183BEGIN { 247$Coro::State::WARNHOOK = sub {
184 *CORE::GLOBAL::warn = sub {
185 my $msg = join "", @_; 248 my $msg = join "", @_;
186 249
187 $msg .= "\n" 250 $msg .= "\n"
188 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
189 252
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 254
192 LOG llevError, $msg; 255 LOG llevError, $msg;
193 }; 256};
194}
195 257
196$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
197 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
198 262
199 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d# 265 return;#d#
202 }#d# 266 }#d#
203 267
204 # kill coroutine otherwise 268 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate 269 Coro::terminate
207}; 270};
208
209$SIG{__DIE__} = sub { }; #d#?
210 271
211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
221for my $pkg (qw( 282for my $pkg (qw(
222 cf::global cf::attachable 283 cf::global cf::attachable
223 cf::object cf::object::player 284 cf::object cf::object::player
224 cf::client cf::player 285 cf::client cf::player
225 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
226 cf::map cf::party cf::region 288 cf::party cf::region
227)) { 289)) {
228 no strict 'refs';
229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
230} 291}
231 292
232$EV::DIED = sub { 293$EV::DIED = sub {
233 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
234}; 295};
235 296
236############################################################################# 297#############################################################################
237 298
238=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
276 337
277sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
278sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
279 340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
354
280=item cf::lock_wait $string 355=item cf::lock_wait $string
281 356
282Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
283 358
284=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
285 360
286Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
287a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
288for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
289returned. 364returned.
290 365
291Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
292deadlocked coro. 367deadlocked coro.
298 373
299Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
300 375
301=cut 376=cut
302 377
303our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
304our %LOCKER;#d#
305 379
306sub lock_wait($) { 380sub lock_wait($) {
307 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
308
309 if ($LOCKER{$key} == $Coro::current) {#d#
310 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
311 return;#d#
312 }#d#
313
314 # wait for lock, if any
315 while ($LOCK{$key}) {
316 push @{ $LOCK{$key} }, $Coro::current;
317 Coro::schedule;
318 }
319} 382}
320 383
321sub lock_acquire($) { 384sub lock_acquire($) {
322 my ($key) = @_; 385 $LOCKS->guard ($_[0])
323
324 # wait, to be sure we are not locked
325 lock_wait $key;
326
327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
329
330 Coro::guard {
331 delete $LOCKER{$key};#d#
332 # wake up all waiters, to be on the safe side
333 $_->ready for @{ delete $LOCK{$key} };
334 }
335} 386}
336 387
337sub lock_active($) { 388sub lock_active($) {
338 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
339
340 ! ! $LOCK{$key}
341} 390}
342 391
343sub freeze_mainloop { 392sub freeze_mainloop {
344 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
345 394
346 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
347 $TICK_WATCHER->start;
348 };
349 $TICK_WATCHER->stop;
350 $guard
351} 396}
352 397
353=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
354 399
355Like EV::periodic, but randomly selects a starting point so that the actions 400Like EV::periodic, but randomly selects a starting point so that the actions
378 423
379=cut 424=cut
380 425
381our @SLOT_QUEUE; 426our @SLOT_QUEUE;
382our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
383 429
384$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
385$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
387 433
388 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
389 436
390 while () { 437 while () {
391 next_job: 438 next_job:
439
392 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
393 if ($avail > 0.01) { 441
394 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
395 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
396 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
397 $job->[2]->send; 446 $job->[2]->send;
398 Coro::cede; 447 Coro::cede;
399 goto next_job; 448 goto next_job;
400 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
401 } 451 }
402 } 452 }
403 453
404 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
405 # we do not use wait_for_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
406 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
407 $signal->wait; 457 $signal->wait;
408 } else { 458 } else {
459 $busy = 0;
409 Coro::schedule; 460 Coro::schedule;
410 } 461 }
411 } 462 }
412}; 463};
413 464
414sub get_slot($;$$) { 465sub get_slot($;$$) {
466 return if tick_inhibit || $Coro::current == $Coro::main;
467
415 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
416 469
417 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
418 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
419 473
420 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
421 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
422 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
456 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
457 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
458 512
459 LOG llevError, Carp::longmess "sync job";#d# 513 LOG llevError, Carp::longmess "sync job";#d#
460 514
461 # TODO: use suspend/resume instead
462 # (but this is cancel-safe)
463 my $freeze_guard = freeze_mainloop; 515 my $freeze_guard = freeze_mainloop;
464 516
465 my $busy = 1; 517 my $busy = 1;
466 my @res; 518 my @res;
467 519
478 } else { 530 } else {
479 EV::loop EV::LOOP_ONESHOT; 531 EV::loop EV::LOOP_ONESHOT;
480 } 532 }
481 } 533 }
482 534
483 $time = EV::time - $time; 535 my $time = EV::time - $time;
484 536
485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
487
488 $tick_start += $time; # do not account sync jobs to server load 537 $TICK_START += $time; # do not account sync jobs to server load
489 538
490 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
491 } else { 540 } else {
492 # we are in another coroutine, how wonderful, everything just works 541 # we are in another coroutine, how wonderful, everything just works
493 542
535 reset_signals; 584 reset_signals;
536 &$cb 585 &$cb
537 }, @args; 586 }, @args;
538 587
539 wantarray ? @res : $res[-1] 588 wantarray ? @res : $res[-1]
589}
590
591=item $coin = coin_from_name $name
592
593=cut
594
595our %coin_alias = (
596 "silver" => "silvercoin",
597 "silvercoin" => "silvercoin",
598 "silvercoins" => "silvercoin",
599 "gold" => "goldcoin",
600 "goldcoin" => "goldcoin",
601 "goldcoins" => "goldcoin",
602 "platinum" => "platinacoin",
603 "platinumcoin" => "platinacoin",
604 "platinumcoins" => "platinacoin",
605 "platina" => "platinacoin",
606 "platinacoin" => "platinacoin",
607 "platinacoins" => "platinacoin",
608 "royalty" => "royalty",
609 "royalties" => "royalty",
610);
611
612sub coin_from_name($) {
613 $coin_alias{$_[0]}
614 ? cf::arch::find $coin_alias{$_[0]}
615 : undef
540} 616}
541 617
542=item $value = cf::db_get $family => $key 618=item $value = cf::db_get $family => $key
543 619
544Returns a single value from the environment database. 620Returns a single value from the environment database.
683 759
684############################################################################# 760#############################################################################
685 761
686=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
687 763
688Many objects in crossfire are so-called attachable objects. That means you can 764Many objects in deliantra are so-called attachable objects. That means you can
689attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
690to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
691 767
692In the following description, CLASS can be any of C<global>, C<object> 768In the following description, CLASS can be any of C<global>, C<object>
693C<player>, C<client> or C<map> (i.e. the attachable objects in 769C<player>, C<client> or C<map> (i.e. the attachable objects in
743=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
744 820
745Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
746given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
747 823
748Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
749that are attached at load/instantiate time, thus the need for a name. 825that are attached at load/instantiate time, thus the need for a name.
750 826
751These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
752 828
753=over 4 829=over 4
1044 1120
1045sub reattach { 1121sub reattach {
1046 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
1047 my ($obj) = @_; 1123 my ($obj) = @_;
1048 1124
1125 # no longer needed after getting rid of delete_package?
1049 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1126 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1050 1127
1051 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
1052 1129
1053 @$registry = (); 1130 @$registry = ();
1054 1131
1100 utf8::decode (my $decname = $filename); 1177 utf8::decode (my $decname = $filename);
1101 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
1102 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1103 1180
1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1107 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 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;
1186 aio_fsync $fh;
1187 }
1108 close $fh; 1188 aio_close $fh;
1109 1189
1110 if (@$objs) { 1190 if (@$objs) {
1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1112 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1114 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1115 aio_fsync $fh if $cf::USE_FSYNC; 1195 if ($cf::USE_FSYNC) {
1196 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;
1197 aio_fsync $fh;
1198 }
1116 close $fh; 1199 aio_close $fh;
1117 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1118 } 1201 }
1119 } else { 1202 } else {
1120 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1121 } 1204 }
1122 1205
1123 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1124 } else { 1210 } else {
1125 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1126 } 1212 }
1127 } else { 1213 } else {
1128 aio_unlink $filename; 1214 aio_unlink $filename;
1129 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1130 } 1216 }
1221 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1222 1308
1223 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1224} 1310}
1225 1311
1312use File::Glob ();
1313
1226cf::player->attach ( 1314cf::player->attach (
1227 on_command => sub { 1315 on_command => sub {
1228 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1229 1317
1230 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1262 1350
1263 cf::override; 1351 cf::override;
1264 }, 1352 },
1265); 1353);
1266 1354
1355# "readahead" all extensions
1356sub cache_extensions {
1357 my $grp = IO::AIO::aio_group;
1358
1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1360 for (grep /\.ext$/, @{$_[0]}) {
1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1362 }
1363 };
1364
1365 $grp
1366}
1367
1267sub load_extensions { 1368sub load_extensions {
1268 cf::sync_job { 1369 cf::sync_job {
1269 my %todo; 1370 my %todo;
1270 1371
1271 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
1290 1391
1291 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1292 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1293 1394
1294 $ext{source} = 1395 $ext{source} =
1295 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1296 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1297 . $source 1398 . $source
1298 . "\n};\n1"; 1399 . "\n};\n1";
1299 1400
1300 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1340 1441
1341=back 1442=back
1342 1443
1343=head2 CORE EXTENSIONS 1444=head2 CORE EXTENSIONS
1344 1445
1345Functions and methods that extend core crossfire objects. 1446Functions and methods that extend core deliantra objects.
1346 1447
1347=cut 1448=cut
1348 1449
1349package cf::player; 1450package cf::player;
1350 1451
1393 1494
1394sub exists($) { 1495sub exists($) {
1395 my ($login) = @_; 1496 my ($login) = @_;
1396 1497
1397 $cf::PLAYER{$login} 1498 $cf::PLAYER{$login}
1398 or cf::sync_job { !aio_stat path $login } 1499 or !aio_stat path $login
1399} 1500}
1400 1501
1401sub find($) { 1502sub find($) {
1402 return $cf::PLAYER{$_[0]} || do { 1503 return $cf::PLAYER{$_[0]} || do {
1403 my $login = $_[0]; 1504 my $login = $_[0];
1415 my $f = new_from_file cf::object::thawer path $login 1516 my $f = new_from_file cf::object::thawer path $login
1416 or return; 1517 or return;
1417 1518
1418 my $pl = cf::player::load_pl $f 1519 my $pl = cf::player::load_pl $f
1419 or return; 1520 or return;
1521
1420 local $cf::PLAYER_LOADING{$login} = $pl; 1522 local $cf::PLAYER_LOADING{$login} = $pl;
1421 $f->resolve_delayed_derefs; 1523 $f->resolve_delayed_derefs;
1422 $cf::PLAYER{$login} = $pl 1524 $cf::PLAYER{$login} = $pl
1423 } 1525 }
1424 } 1526 }
1434 1536
1435 return if $pl->{deny_save}; 1537 return if $pl->{deny_save};
1436 1538
1437 aio_mkdir playerdir $pl, 0770; 1539 aio_mkdir playerdir $pl, 0770;
1438 $pl->{last_save} = $cf::RUNTIME; 1540 $pl->{last_save} = $cf::RUNTIME;
1541
1542 cf::get_slot 0.01;
1439 1543
1440 $pl->save_pl ($path); 1544 $pl->save_pl ($path);
1441 cf::cede_to_tick; 1545 cf::cede_to_tick;
1442} 1546}
1443 1547
1475 my ($pl) = @_; 1579 my ($pl) = @_;
1476 1580
1477 my $name = $pl->ob->name; 1581 my $name = $pl->ob->name;
1478 1582
1479 $pl->{deny_save} = 1; 1583 $pl->{deny_save} = 1;
1480 $pl->password ("*"); # this should lock out the player until we nuked the dir 1584 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1481 1585
1482 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1586 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1483 $pl->deactivate; 1587 $pl->deactivate;
1588 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1589 $pl->ob->check_score;
1484 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1590 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1485 $pl->ns->destroy if $pl->ns; 1591 $pl->ns->destroy if $pl->ns;
1486 1592
1487 my $path = playerdir $pl; 1593 my $path = playerdir $pl;
1488 my $temp = "$path~$cf::RUNTIME~deleting~"; 1594 my $temp = "$path~$cf::RUNTIME~deleting~";
1527 1633
1528 for my $login (@$dirs) { 1634 for my $login (@$dirs) {
1529 my $path = path $login; 1635 my $path = path $login;
1530 1636
1531 # a .pst is a dead give-away for a valid player 1637 # a .pst is a dead give-away for a valid player
1532 unless (-e "$path.pst") { 1638 # if no pst file found, open and chekc for blocked users
1639 if (aio_stat "$path.pst") {
1533 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1640 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1534 aio_read $fh, 0, 512, my $buf, 0 or next; 1641 aio_read $fh, 0, 512, my $buf, 0 or next;
1535 $buf !~ /^password -------------$/m or next; # official not-valid tag 1642 $buf !~ /^password -------------$/m or next; # official not-valid tag
1536 } 1643 }
1537 1644
1568 } 1675 }
1569 1676
1570 \@paths 1677 \@paths
1571} 1678}
1572 1679
1573=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1680=item $protocol_xml = $player->expand_cfpod ($cfpod)
1574 1681
1575Expand crossfire pod fragments into protocol xml. 1682Expand deliantra pod fragments into protocol xml.
1576
1577=cut
1578
1579use re 'eval';
1580
1581my $group;
1582my $interior; $interior = qr{
1583 # match a pod interior sequence sans C<< >>
1584 (?:
1585 \ (.*?)\ (?{ $group = $^N })
1586 | < (??{$interior}) >
1587 )
1588}x;
1589
1590sub expand_cfpod {
1591 my ($self, $pod) = @_;
1592
1593 my $xml;
1594
1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1598
1599 $group =~ s/&/&amp;/g;
1600 $group =~ s/</&lt;/g;
1601
1602 $xml .= $group;
1603 } elsif ($pod =~ m%\G
1604 ([BCGHITU])
1605 <
1606 (?:
1607 ([^<>]*) (?{ $group = $^N })
1608 | < $interior >
1609 )
1610 >
1611 %gcsx
1612 ) {
1613 my ($code, $data) = ($1, $group);
1614
1615 if ($code eq "B") {
1616 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1617 } elsif ($code eq "I") {
1618 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1619 } elsif ($code eq "U") {
1620 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1621 } elsif ($code eq "C") {
1622 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1623 } elsif ($code eq "T") {
1624 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1625 } elsif ($code eq "G") {
1626 my ($male, $female) = split /\|/, $data;
1627 $data = $self->gender ? $female : $male;
1628 $xml .= expand_cfpod ($self, $data);
1629 } elsif ($code eq "H") {
1630 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1632 "")
1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1642 }
1643 }
1644
1645 for ($xml) {
1646 # create single paragraphs (very hackish)
1647 s/(?<=\S)\n(?=\w)/ /g;
1648
1649 # compress some whitespace
1650 s/\s+\n/\n/g; # ws line-ends
1651 s/\n\n+/\n/g; # double lines
1652 s/^\n+//; # beginning lines
1653 s/\n+$//; # ending lines
1654 }
1655
1656 $xml
1657}
1658
1659no re 'eval';
1660
1661sub hintmode {
1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1663 $_[0]{hintmode}
1664}
1665 1683
1666=item $player->ext_reply ($msgid, @msg) 1684=item $player->ext_reply ($msgid, @msg)
1667 1685
1668Sends an ext reply to the player. 1686Sends an ext reply to the player.
1669 1687
1736our $MAX_RESET = 3600; 1754our $MAX_RESET = 3600;
1737our $DEFAULT_RESET = 3000; 1755our $DEFAULT_RESET = 3000;
1738 1756
1739sub generate_random_map { 1757sub generate_random_map {
1740 my ($self, $rmp) = @_; 1758 my ($self, $rmp) = @_;
1759
1760 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1761
1741 # mit "rum" bekleckern, nicht 1762 # mit "rum" bekleckern, nicht
1742 $self->_create_random_map ( 1763 $self->_create_random_map (
1743 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1764 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1744 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1765 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1745 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1766 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1867 1888
1868# the temporary/swap location 1889# the temporary/swap location
1869sub save_path { 1890sub save_path {
1870 my ($self) = @_; 1891 my ($self) = @_;
1871 1892
1872 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1893 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1873 "$TMPDIR/$path.map" 1894 "$TMPDIR/$path.map"
1874} 1895}
1875 1896
1876# the unique path, undef == no special unique path 1897# the unique path, undef == no special unique path
1877sub uniq_path { 1898sub uniq_path {
1878 my ($self) = @_; 1899 my ($self) = @_;
1879 1900
1880 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1901 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1881 "$UNIQUEDIR/$path" 1902 "$UNIQUEDIR/$path"
1882}
1883
1884# and all this just because we cannot iterate over
1885# all maps in C++...
1886sub change_all_map_light {
1887 my ($change) = @_;
1888
1889 $_->change_map_light ($change)
1890 for grep $_->outdoor, values %cf::MAP;
1891} 1903}
1892 1904
1893sub decay_objects { 1905sub decay_objects {
1894 my ($self) = @_; 1906 my ($self) = @_;
1895 1907
1979sub find { 1991sub find {
1980 my ($path, $origin) = @_; 1992 my ($path, $origin) = @_;
1981 1993
1982 $path = normalise $path, $origin && $origin->path; 1994 $path = normalise $path, $origin && $origin->path;
1983 1995
1984 cf::lock_wait "map_data:$path";#d#remove 1996 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1985 cf::lock_wait "map_find:$path"; 1997 my $guard2 = cf::lock_acquire "map_find:$path";
1986 1998
1987 $cf::MAP{$path} || do { 1999 $cf::MAP{$path} || do {
1988 my $guard1 = cf::lock_acquire "map_find:$path";
1989 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1990
1991 my $map = new_from_path cf::map $path 2000 my $map = new_from_path cf::map $path
1992 or return; 2001 or return;
1993 2002
1994 $map->{last_save} = $cf::RUNTIME; 2003 $map->{last_save} = $cf::RUNTIME;
1995 2004
1997 or return; 2006 or return;
1998 2007
1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2008 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2000 # doing this can freeze the server in a sync job, obviously 2009 # doing this can freeze the server in a sync job, obviously
2001 #$cf::WAIT_FOR_TICK->wait; 2010 #$cf::WAIT_FOR_TICK->wait;
2011 undef $guard2;
2002 undef $guard1; 2012 undef $guard1;
2003 undef $guard2;
2004 $map->reset; 2013 $map->reset;
2005 return find $path; 2014 return find $path;
2006 } 2015 }
2007 2016
2008 $cf::MAP{$path} = $map 2017 $cf::MAP{$path} = $map
2009 } 2018 }
2010} 2019}
2011 2020
2012sub pre_load { } 2021sub pre_load { }
2013sub post_load { } 2022#sub post_load { } # XS
2014 2023
2015sub load { 2024sub load {
2016 my ($self) = @_; 2025 my ($self) = @_;
2017 2026
2018 local $self->{deny_reset} = 1; # loading can take a long time 2027 local $self->{deny_reset} = 1; # loading can take a long time
2035 my $f = new_from_file cf::object::thawer $self->{load_path}; 2044 my $f = new_from_file cf::object::thawer $self->{load_path};
2036 $f->skip_block; 2045 $f->skip_block;
2037 $self->_load_objects ($f) 2046 $self->_load_objects ($f)
2038 or return; 2047 or return;
2039 2048
2040 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2049 $self->post_load_original
2041 if delete $self->{load_original}; 2050 if delete $self->{load_original};
2042 2051
2043 if (my $uniq = $self->uniq_path) { 2052 if (my $uniq = $self->uniq_path) {
2044 utf8::encode $uniq; 2053 utf8::encode $uniq;
2045 unless (aio_stat $uniq) { 2054 unless (aio_stat $uniq) {
2063 unless ($self->{deny_activate}) { 2072 unless ($self->{deny_activate}) {
2064 $self->decay_objects; 2073 $self->decay_objects;
2065 $self->fix_auto_apply; 2074 $self->fix_auto_apply;
2066 $self->update_buttons; 2075 $self->update_buttons;
2067 cf::cede_to_tick; 2076 cf::cede_to_tick;
2068 $self->set_darkness_map;
2069 cf::cede_to_tick;
2070 $self->activate; 2077 $self->activate;
2071 } 2078 }
2072 2079
2073 $self->{last_save} = $cf::RUNTIME; 2080 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME); 2081 $self->last_access ($cf::RUNTIME);
2075 2082
2076 $self->in_memory (cf::MAP_IN_MEMORY); 2083 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2084 }
2078 2085
2079 $self->post_load; 2086 $self->post_load;
2080} 2087}
2081 2088
2139 my ($path, $origin, $load) = @_; 2146 my ($path, $origin, $load) = @_;
2140 2147
2141 $path = normalise $path, $origin && $origin->{path}; 2148 $path = normalise $path, $origin && $origin->{path};
2142 2149
2143 if (my $map = $cf::MAP{$path}) { 2150 if (my $map = $cf::MAP{$path}) {
2144 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2151 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2145 } 2152 }
2146 2153
2147 $MAP_PREFETCH{$path} |= $load; 2154 $MAP_PREFETCH{$path} |= $load;
2148 2155
2149 $MAP_PREFETCHER ||= cf::async { 2156 $MAP_PREFETCHER ||= cf::async {
2186 cf::async { 2193 cf::async {
2187 $Coro::current->{desc} = "map player save"; 2194 $Coro::current->{desc} = "map player save";
2188 $_->contr->save for $self->players; 2195 $_->contr->save for $self->players;
2189 }; 2196 };
2190 2197
2198 cf::get_slot 0.02;
2199
2191 if ($uniq) { 2200 if ($uniq) {
2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2201 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2193 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2202 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2194 } else { 2203 } else {
2195 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2203 $self->save; 2212 $self->save;
2204 2213
2205 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2214 my $lock = cf::lock_acquire "map_data:$self->{path}";
2206 2215
2207 return if $self->players; 2216 return if $self->players;
2208 return if $self->in_memory != cf::MAP_IN_MEMORY; 2217 return if $self->in_memory != cf::MAP_ACTIVE;
2209 return if $self->{deny_save}; 2218 return if $self->{deny_save};
2210 2219
2211 $self->in_memory (cf::MAP_SWAPPED); 2220 $self->in_memory (cf::MAP_SWAPPED);
2212 2221
2213 $self->deactivate; 2222 $self->deactivate;
2238 2247
2239 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2248 my $lock = cf::lock_acquire "map_data:$self->{path}";
2240 2249
2241 return if $self->players; 2250 return if $self->players;
2242 2251
2243 warn "resetting map ", $self->path; 2252 warn "resetting map ", $self->path, "\n";
2244 2253
2245 $self->in_memory (cf::MAP_SWAPPED); 2254 $self->in_memory (cf::MAP_SWAPPED);
2246 2255
2247 # need to save uniques path 2256 # need to save uniques path
2248 unless ($self->{deny_save}) { 2257 unless ($self->{deny_save}) {
2331 2340
2332sub unique_maps() { 2341sub unique_maps() {
2333 [ 2342 [
2334 map { 2343 map {
2335 utf8::decode $_; 2344 utf8::decode $_;
2336 /\.map$/ 2345 s/\.map$//; # TODO future compatibility hack
2346 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2347 ? ()
2337 ? normalise $_ 2348 : normalise $_
2338 : ()
2339 } @{ aio_readdir $UNIQUEDIR or [] } 2349 } @{ aio_readdir $UNIQUEDIR or [] }
2340 ] 2350 ]
2341} 2351}
2342 2352
2343package cf; 2353=item cf::map::static_maps
2354
2355Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2356file in the shared directory excluding F</styles> and F</editor>). May
2357block.
2358
2359=cut
2360
2361sub static_maps() {
2362 my @dirs = "";
2363 my @maps;
2364
2365 while (@dirs) {
2366 my $dir = shift @dirs;
2367
2368 next if $dir eq "/styles" || $dir eq "/editor";
2369
2370 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2371 or return;
2372
2373 for (@$files) {
2374 s/\.map$// or next;
2375 utf8::decode $_;
2376 push @maps, "$dir/$_";
2377 }
2378
2379 push @dirs, map "$dir/$_", @$dirs;
2380 }
2381
2382 \@maps
2383}
2344 2384
2345=back 2385=back
2346 2386
2347=head3 cf::object 2387=head3 cf::object
2348 2388
2352 2392
2353=over 4 2393=over 4
2354 2394
2355=item $ob->inv_recursive 2395=item $ob->inv_recursive
2356 2396
2357Returns the inventory of the object _and_ their inventories, recursively. 2397Returns the inventory of the object I<and> their inventories, recursively,
2398but I<not> the object itself.
2358 2399
2359=cut 2400=cut
2360 2401
2361sub inv_recursive_; 2402sub inv_recursive_;
2362sub inv_recursive_ { 2403sub inv_recursive_ {
2367 inv_recursive_ inv $_[0] 2408 inv_recursive_ inv $_[0]
2368} 2409}
2369 2410
2370=item $ref = $ob->ref 2411=item $ref = $ob->ref
2371 2412
2372creates and returns a persistent reference to an objetc that can be stored as a string. 2413Creates and returns a persistent reference to an object that can be stored as a string.
2373 2414
2374=item $ob = cf::object::deref ($refstring) 2415=item $ob = cf::object::deref ($refstring)
2375 2416
2376returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2417returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2377even if the object actually exists. May block. 2418even if the object actually exists. May block.
2409can be C<undef>. Does the right thing when the player is currently in a 2450can be C<undef>. Does the right thing when the player is currently in a
2410dialogue with the given NPC character. 2451dialogue with the given NPC character.
2411 2452
2412=cut 2453=cut
2413 2454
2455our $SAY_CHANNEL = {
2456 id => "say",
2457 title => "Map",
2458 reply => "say ",
2459 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2460};
2461
2462our $CHAT_CHANNEL = {
2463 id => "chat",
2464 title => "Chat",
2465 reply => "chat ",
2466 tooltip => "Player chat and shouts, global to the server.",
2467};
2468
2414# rough implementation of a future "reply" method that works 2469# rough implementation of a future "reply" method that works
2415# with dialog boxes. 2470# with dialog boxes.
2416#TODO: the first argument must go, split into a $npc->reply_to ( method 2471#TODO: the first argument must go, split into a $npc->reply_to ( method
2417sub cf::object::player::reply($$$;$) { 2472sub cf::object::player::reply($$$;$) {
2418 my ($self, $npc, $msg, $flags) = @_; 2473 my ($self, $npc, $msg, $flags) = @_;
2429 my $dialog = $pl->{npc_dialog}; 2484 my $dialog = $pl->{npc_dialog};
2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2485 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2431 2486
2432 } else { 2487 } else {
2433 $msg = $npc->name . " says: $msg" if $npc; 2488 $msg = $npc->name . " says: $msg" if $npc;
2434 $self->message ($msg, $flags); 2489 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2435 } 2490 }
2436 } 2491 }
2437} 2492}
2438 2493
2439=item $object->send_msg ($channel, $msg, $color, [extra...]) 2494=item $object->send_msg ($channel, $msg, $color, [extra...])
2464 2519
2465=item $player_object->enter_link 2520=item $player_object->enter_link
2466 2521
2467Freezes the player and moves him/her to a special map (C<{link}>). 2522Freezes the player and moves him/her to a special map (C<{link}>).
2468 2523
2469The player should be reasonably safe there for short amounts of time. You 2524The player should be reasonably safe there for short amounts of time (e.g.
2470I<MUST> call C<leave_link> as soon as possible, though. 2525for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2526though, as the palyer cannot control the character while it is on the link
2527map.
2471 2528
2472Will never block. 2529Will never block.
2473 2530
2474=item $player_object->leave_link ($map, $x, $y) 2531=item $player_object->leave_link ($map, $x, $y)
2475 2532
2527 ($x, $y) = (-1, -1) 2584 ($x, $y) = (-1, -1)
2528 unless (defined $x) && (defined $y); 2585 unless (defined $x) && (defined $y);
2529 2586
2530 # use -1 or undef as default coordinates, not 0, 0 2587 # use -1 or undef as default coordinates, not 0, 0
2531 ($x, $y) = ($map->enter_x, $map->enter_y) 2588 ($x, $y) = ($map->enter_x, $map->enter_y)
2532 if $x <=0 && $y <= 0; 2589 if $x <= 0 && $y <= 0;
2533 2590
2534 $map->load; 2591 $map->load;
2535 $map->load_neighbours; 2592 $map->load_neighbours;
2536 2593
2537 return unless $self->contr->active; 2594 return unless $self->contr->active;
2538 $self->activate_recursive;
2539 2595
2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2596 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2541 $self->enter_map ($map, $x, $y); 2597 $self->enter_map ($map, $x, $y);
2598
2599 # only activate afterwards, to support waiting in hooks
2600 $self->activate_recursive;
2542} 2601}
2543 2602
2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2603=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2545 2604
2546Moves the player to the given map-path and coordinates by first freezing 2605Moves the player to the given map-path and coordinates by first freezing
2547her, loading and preparing them map, calling the provided $check callback 2606her, loading and preparing them map, calling the provided $check callback
2548that has to return the map if sucecssful, and then unfreezes the player on 2607that has to return the map if sucecssful, and then unfreezes the player on
2549the new (success) or old (failed) map position. In either case, $done will 2608the new (success) or old (failed) map position. In either case, $done will
2550be called at the end of this process. 2609be called at the end of this process.
2610
2611Note that $check will be called with a potentially non-loaded map, so if
2612it needs a loaded map it has to call C<< ->load >>.
2551 2613
2552=cut 2614=cut
2553 2615
2554our $GOTOGEN; 2616our $GOTOGEN;
2555 2617
2634} 2696}
2635 2697
2636sub prepare_random_map { 2698sub prepare_random_map {
2637 my ($exit) = @_; 2699 my ($exit) = @_;
2638 2700
2639 my $guard = cf::lock_acquire "exit_prepare:$exit";
2640
2641 # all this does is basically replace the /! path by 2701 # all this does is basically replace the /! path by
2642 # a new random map path (?random/...) with a seed 2702 # a new random map path (?random/...) with a seed
2643 # that depends on the exit object 2703 # that depends on the exit object
2644 2704
2645 my $rmp = parse_random_map_params $exit->msg; 2705 my $rmp = parse_random_map_params $exit->msg;
2647 if ($exit->map) { 2707 if ($exit->map) {
2648 $rmp->{region} = $exit->region->name; 2708 $rmp->{region} = $exit->region->name;
2649 $rmp->{origin_map} = $exit->map->path; 2709 $rmp->{origin_map} = $exit->map->path;
2650 $rmp->{origin_x} = $exit->x; 2710 $rmp->{origin_x} = $exit->x;
2651 $rmp->{origin_y} = $exit->y; 2711 $rmp->{origin_y} = $exit->y;
2712
2713 $exit->map->touch;
2652 } 2714 }
2653 2715
2654 $rmp->{random_seed} ||= $exit->random_seed; 2716 $rmp->{random_seed} ||= $exit->random_seed;
2655 2717
2656 my $data = cf::encode_json $rmp; 2718 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2657 my $md5 = Digest::MD5::md5_hex $data; 2719 my $md5 = Digest::MD5::md5_hex $data;
2658 my $meta = "$RANDOMDIR/$md5.meta"; 2720 my $meta = "$RANDOMDIR/$md5.meta";
2659 2721
2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2722 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2661 aio_write $fh, 0, (length $data), $data, 0; 2723 aio_write $fh, 0, (length $data), $data, 0;
2662 undef $fh; 2724 undef $fh;
2663 aio_rename "$meta~", $meta; 2725 aio_rename "$meta~", $meta;
2664 2726
2727 my $slaying = "?random/$md5";
2728
2729 if ($exit->valid) {
2665 $exit->slaying ("?random/$md5"); 2730 $exit->slaying ("?random/$md5");
2666 $exit->msg (undef); 2731 $exit->msg (undef);
2732 }
2667 } 2733 }
2668} 2734}
2669 2735
2670sub cf::object::player::enter_exit { 2736sub cf::object::player::enter_exit {
2671 my ($self, $exit) = @_; 2737 my ($self, $exit) = @_;
2672 2738
2673 return unless $self->type == cf::PLAYER; 2739 return unless $self->type == cf::PLAYER;
2674 2740
2675 if ($exit->slaying eq "/!") {
2676 #TODO: this should de-fi-ni-te-ly not be a sync-job
2677 # the problem is that $exit might not survive long enough
2678 # so it needs to be done right now, right here
2679 cf::sync_job { prepare_random_map $exit };
2680 }
2681
2682 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2683 my $hp = $exit->stats->hp;
2684 my $sp = $exit->stats->sp;
2685
2686 $self->enter_link; 2741 $self->enter_link;
2687 2742
2688 # if exit is damned, update players death & WoR home-position
2689 $self->contr->savebed ($slaying, $hp, $sp)
2690 if $exit->flag (FLAG_DAMNED);
2691
2692 (async { 2743 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2744 $Coro::current->{desc} = "enter_exit";
2694 2745
2695 $self->deactivate_recursive; # just to be sure
2696 unless (eval { 2746 unless (eval {
2747 $self->deactivate_recursive; # just to be sure
2748
2749 # random map handling
2750 {
2751 my $guard = cf::lock_acquire "exit_prepare:$exit";
2752
2753 prepare_random_map $exit
2754 if $exit->slaying eq "/!";
2755 }
2756
2757 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2758 my $x = $exit->stats->hp;
2759 my $y = $exit->stats->sp;
2760
2697 $self->goto ($slaying, $hp, $sp); 2761 $self->goto ($map, $x, $y);
2698 2762
2763 # if exit is damned, update players death & WoR home-position
2764 $self->contr->savebed ($map, $x, $y)
2765 if $exit->flag (cf::FLAG_DAMNED);
2766
2699 1; 2767 1
2700 }) { 2768 }) {
2701 $self->message ("Something went wrong deep within the crossfire server. " 2769 $self->message ("Something went wrong deep within the deliantra server. "
2702 . "I'll try to bring you back to the map you were before. " 2770 . "I'll try to bring you back to the map you were before. "
2703 . "Please report this to the dungeon master!", 2771 . "Please report this to the dungeon master!",
2704 cf::NDI_UNIQUE | cf::NDI_RED); 2772 cf::NDI_UNIQUE | cf::NDI_RED);
2705 2773
2706 warn "ERROR in enter_exit: $@"; 2774 warn "ERROR in enter_exit: $@";
2723sub cf::client::send_drawinfo { 2791sub cf::client::send_drawinfo {
2724 my ($self, $text, $flags) = @_; 2792 my ($self, $text, $flags) = @_;
2725 2793
2726 utf8::encode $text; 2794 utf8::encode $text;
2727 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2795 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2796}
2797
2798=item $client->send_big_packet ($pkt)
2799
2800Like C<send_packet>, but tries to compress large packets, and fragments
2801them as required.
2802
2803=cut
2804
2805our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2806
2807sub cf::client::send_big_packet {
2808 my ($self, $pkt) = @_;
2809
2810 # try lzf for large packets
2811 $pkt = "lzf " . Compress::LZF::compress $pkt
2812 if 1024 <= length $pkt and $self->{can_lzf};
2813
2814 # split very large packets
2815 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2816 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2817 $pkt = "frag";
2818 }
2819
2820 $self->send_packet ($pkt);
2728} 2821}
2729 2822
2730=item $client->send_msg ($channel, $msg, $color, [extra...]) 2823=item $client->send_msg ($channel, $msg, $color, [extra...])
2731 2824
2732Send a drawinfo or msg packet to the client, formatting the msg for the 2825Send a drawinfo or msg packet to the client, formatting the msg for the
2736 2829
2737=cut 2830=cut
2738 2831
2739# non-persistent channels (usually the info channel) 2832# non-persistent channels (usually the info channel)
2740our %CHANNEL = ( 2833our %CHANNEL = (
2834 "c/motd" => {
2835 id => "infobox",
2836 title => "MOTD",
2837 reply => undef,
2838 tooltip => "The message of the day",
2839 },
2741 "c/identify" => { 2840 "c/identify" => {
2742 id => "infobox", 2841 id => "infobox",
2743 title => "Identify", 2842 title => "Identify",
2744 reply => undef, 2843 reply => undef,
2745 tooltip => "Items recently identified", 2844 tooltip => "Items recently identified",
2747 "c/examine" => { 2846 "c/examine" => {
2748 id => "infobox", 2847 id => "infobox",
2749 title => "Examine", 2848 title => "Examine",
2750 reply => undef, 2849 reply => undef,
2751 tooltip => "Signs and other items you examined", 2850 tooltip => "Signs and other items you examined",
2851 },
2852 "c/shopinfo" => {
2853 id => "infobox",
2854 title => "Shop Info",
2855 reply => undef,
2856 tooltip => "What your bargaining skill tells you about the shop",
2752 }, 2857 },
2753 "c/book" => { 2858 "c/book" => {
2754 id => "infobox", 2859 id => "infobox",
2755 title => "Book", 2860 title => "Book",
2756 reply => undef, 2861 reply => undef,
2772 id => "infobox", 2877 id => "infobox",
2773 title => "Body Parts", 2878 title => "Body Parts",
2774 reply => undef, 2879 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available", 2880 tooltip => "Shows which body parts you posess and are available",
2776 }, 2881 },
2882 "c/statistics" => {
2883 id => "infobox",
2884 title => "Statistics",
2885 reply => undef,
2886 tooltip => "Shows your primary statistics",
2887 },
2888 "c/skills" => {
2889 id => "infobox",
2890 title => "Skills",
2891 reply => undef,
2892 tooltip => "Shows your experience per skill and item power",
2893 },
2894 "c/shopitems" => {
2895 id => "infobox",
2896 title => "Shop Items",
2897 reply => undef,
2898 tooltip => "Shows the items currently for sale in this shop",
2899 },
2900 "c/resistances" => {
2901 id => "infobox",
2902 title => "Resistances",
2903 reply => undef,
2904 tooltip => "Shows your resistances",
2905 },
2906 "c/pets" => {
2907 id => "infobox",
2908 title => "Pets",
2909 reply => undef,
2910 tooltip => "Shows information abotu your pets/a specific pet",
2911 },
2912 "c/perceiveself" => {
2913 id => "infobox",
2914 title => "Perceive Self",
2915 reply => undef,
2916 tooltip => "You gained detailed knowledge about yourself",
2917 },
2777 "c/uptime" => { 2918 "c/uptime" => {
2778 id => "infobox", 2919 id => "infobox",
2779 title => "Uptime", 2920 title => "Uptime",
2780 reply => undef, 2921 reply => undef,
2781 tooltip => "How long the server has been running since last restart", 2922 tooltip => "How long the server has been running since last restart",
2784 id => "infobox", 2925 id => "infobox",
2785 title => "Map Info", 2926 title => "Map Info",
2786 reply => undef, 2927 reply => undef,
2787 tooltip => "Information related to the maps", 2928 tooltip => "Information related to the maps",
2788 }, 2929 },
2930 "c/party" => {
2931 id => "party",
2932 title => "Party",
2933 reply => "gsay ",
2934 tooltip => "Messages and chat related to your party",
2935 },
2936 "c/death" => {
2937 id => "death",
2938 title => "Death",
2939 reply => undef,
2940 tooltip => "Reason for and more info about your most recent death",
2941 },
2942 "c/say" => $SAY_CHANNEL,
2943 "c/chat" => $CHAT_CHANNEL,
2789); 2944);
2790 2945
2791sub cf::client::send_msg { 2946sub cf::client::send_msg {
2792 my ($self, $channel, $msg, $color, @extra) = @_; 2947 my ($self, $channel, $msg, $color, @extra) = @_;
2793 2948
2794 $msg = $self->pl->expand_cfpod ($msg); 2949 $msg = $self->pl->expand_cfpod ($msg)
2950 unless $color & cf::NDI_VERBATIM;
2795 2951
2796 $color &= cf::NDI_CLIENT_MASK; # just in case... 2952 $color &= cf::NDI_CLIENT_MASK; # just in case...
2797 2953
2798 # check predefined channels, for the benefit of C 2954 # check predefined channels, for the benefit of C
2799 if ($CHANNEL{$channel}) { 2955 if ($CHANNEL{$channel}) {
2800 $channel = $CHANNEL{$channel}; 2956 $channel = $CHANNEL{$channel};
2801 2957
2802 $self->ext_msg (channel_info => $channel) 2958 $self->ext_msg (channel_info => $channel);
2803 if $self->can_msg;
2804
2805 $channel = $channel->{id}; 2959 $channel = $channel->{id};
2806 2960
2807 } elsif (ref $channel) { 2961 } elsif (ref $channel) {
2808 # send meta info to client, if not yet sent 2962 # send meta info to client, if not yet sent
2809 unless (exists $self->{channel}{$channel->{id}}) { 2963 unless (exists $self->{channel}{$channel->{id}}) {
2810 $self->{channel}{$channel->{id}} = $channel; 2964 $self->{channel}{$channel->{id}} = $channel;
2811 $self->ext_msg (channel_info => $channel) 2965 $self->ext_msg (channel_info => $channel);
2812 if $self->can_msg;
2813 } 2966 }
2814 2967
2815 $channel = $channel->{id}; 2968 $channel = $channel->{id};
2816 } 2969 }
2817 2970
2818 return unless @extra || length $msg; 2971 return unless @extra || length $msg;
2819 2972
2820 if ($self->can_msg) {
2821 # default colour, mask it out 2973 # default colour, mask it out
2822 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2974 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2823 if $color & cf::NDI_DEF; 2975 if $color & cf::NDI_DEF;
2824 2976
2825 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2977 my $pkt = "msg "
2978 . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2979 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2827 } else { 2980 );
2828 if ($color >= 0) {
2829 # replace some tags by gcfclient-compatible ones
2830 for ($msg) {
2831 1 while
2832 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2833 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2834 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2835 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2836 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2837 }
2838 2981
2839 $color &= cf::NDI_COLOR_MASK; 2982 $self->send_big_packet ($pkt);
2840
2841 utf8::encode $msg;
2842
2843 if (0 && $msg =~ /\[/) {
2844 # COMMAND/INFO
2845 $self->send_packet ("drawextinfo $color 10 8 $msg")
2846 } else {
2847 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2848 $self->send_packet ("drawinfo $color $msg")
2849 }
2850 }
2851 }
2852} 2983}
2853 2984
2854=item $client->ext_msg ($type, @msg) 2985=item $client->ext_msg ($type, @msg)
2855 2986
2856Sends an ext event to the client. 2987Sends an ext event to the client.
2859 2990
2860sub cf::client::ext_msg($$@) { 2991sub cf::client::ext_msg($$@) {
2861 my ($self, $type, @msg) = @_; 2992 my ($self, $type, @msg) = @_;
2862 2993
2863 if ($self->extcmd == 2) { 2994 if ($self->extcmd == 2) {
2864 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2995 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2865 } elsif ($self->extcmd == 1) { # TODO: remove 2996 } elsif ($self->extcmd == 1) { # TODO: remove
2866 push @msg, msgtype => "event_$type"; 2997 push @msg, msgtype => "event_$type";
2867 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2998 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2868 } 2999 }
2869} 3000}
2870 3001
2871=item $client->ext_reply ($msgid, @msg) 3002=item $client->ext_reply ($msgid, @msg)
2872 3003
2876 3007
2877sub cf::client::ext_reply($$@) { 3008sub cf::client::ext_reply($$@) {
2878 my ($self, $id, @msg) = @_; 3009 my ($self, $id, @msg) = @_;
2879 3010
2880 if ($self->extcmd == 2) { 3011 if ($self->extcmd == 2) {
2881 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3012 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2882 } elsif ($self->extcmd == 1) { 3013 } elsif ($self->extcmd == 1) {
2883 #TODO: version 1, remove 3014 #TODO: version 1, remove
2884 unshift @msg, msgtype => "reply", msgid => $id; 3015 unshift @msg, msgtype => "reply", msgid => $id;
2885 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3016 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2886 } 3017 }
2887} 3018}
2888 3019
2889=item $success = $client->query ($flags, "text", \&cb) 3020=item $success = $client->query ($flags, "text", \&cb)
2890 3021
3017our $safe_hole = new Safe::Hole; 3148our $safe_hole = new Safe::Hole;
3018 3149
3019$SIG{FPE} = 'IGNORE'; 3150$SIG{FPE} = 'IGNORE';
3020 3151
3021$safe->permit_only (Opcode::opset qw( 3152$safe->permit_only (Opcode::opset qw(
3022 :base_core :base_mem :base_orig :base_math 3153 :base_core :base_mem :base_orig :base_math :base_loop
3023 grepstart grepwhile mapstart mapwhile 3154 grepstart grepwhile mapstart mapwhile
3024 sort time 3155 sort time
3025)); 3156));
3026 3157
3027# here we export the classes and methods available to script code 3158# here we export the classes and methods available to script code
3030 3161
3031The following functions and methods are available within a safe environment: 3162The following functions and methods are available within a safe environment:
3032 3163
3033 cf::object 3164 cf::object
3034 contr pay_amount pay_player map x y force_find force_add destroy 3165 contr pay_amount pay_player map x y force_find force_add destroy
3035 insert remove name archname title slaying race decrease_ob_nr 3166 insert remove name archname title slaying race decrease split
3167 value
3036 3168
3037 cf::object::player 3169 cf::object::player
3038 player 3170 player
3039 3171
3040 cf::player 3172 cf::player
3045 3177
3046=cut 3178=cut
3047 3179
3048for ( 3180for (
3049 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3181 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3050 insert remove inv name archname title slaying race 3182 insert remove inv nrof name archname title slaying race
3051 decrease_ob_nr destroy)], 3183 decrease split destroy change_exp value msg lore send_msg)],
3052 ["cf::object::player" => qw(player)], 3184 ["cf::object::player" => qw(player)],
3053 ["cf::player" => qw(peaceful)], 3185 ["cf::player" => qw(peaceful send_msg)],
3054 ["cf::map" => qw(trigger)], 3186 ["cf::map" => qw(trigger)],
3055) { 3187) {
3056 no strict 'refs'; 3188 no strict 'refs';
3057 my ($pkg, @funs) = @$_; 3189 my ($pkg, @funs) = @$_;
3058 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3190 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3076 3208
3077 my $qcode = $code; 3209 my $qcode = $code;
3078 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3210 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3079 $qcode =~ s/\n/\\n/g; 3211 $qcode =~ s/\n/\\n/g;
3080 3212
3213 %vars = (_dummy => 0) unless %vars;
3214
3215 my @res;
3081 local $_; 3216 local $_;
3082 local @safe::cf::_safe_eval_args = values %vars;
3083 3217
3084 my $eval = 3218 my $eval =
3085 "do {\n" 3219 "do {\n"
3086 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3220 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3087 . "#line 0 \"{$qcode}\"\n" 3221 . "#line 0 \"{$qcode}\"\n"
3088 . $code 3222 . $code
3089 . "\n}" 3223 . "\n}"
3090 ; 3224 ;
3091 3225
3226 if ($CFG{safe_eval}) {
3092 sub_generation_inc; 3227 sub_generation_inc;
3228 local @safe::cf::_safe_eval_args = values %vars;
3093 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3229 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3094 sub_generation_inc; 3230 sub_generation_inc;
3231 } else {
3232 local @cf::_safe_eval_args = values %vars;
3233 @res = wantarray ? eval eval : scalar eval $eval;
3234 }
3095 3235
3096 if ($@) { 3236 if ($@) {
3097 warn "$@"; 3237 warn "$@";
3098 warn "while executing safe code '$code'\n"; 3238 warn "while executing safe code '$code'\n";
3099 warn "with arguments " . (join " ", %vars) . "\n"; 3239 warn "with arguments " . (join " ", %vars) . "\n";
3118=cut 3258=cut
3119 3259
3120sub register_script_function { 3260sub register_script_function {
3121 my ($fun, $cb) = @_; 3261 my ($fun, $cb) = @_;
3122 3262
3123 no strict 'refs'; 3263 $fun = "safe::$fun" if $CFG{safe_eval};
3124 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3264 *$fun = $safe_hole->wrap ($cb);
3125} 3265}
3126 3266
3127=back 3267=back
3128 3268
3129=cut 3269=cut
3150 3290
3151 $facedata->{version} == 2 3291 $facedata->{version} == 2
3152 or cf::cleanup "$path: version mismatch, cannot proceed."; 3292 or cf::cleanup "$path: version mismatch, cannot proceed.";
3153 3293
3154 # patch in the exptable 3294 # patch in the exptable
3295 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3155 $facedata->{resource}{"res/exp_table"} = { 3296 $facedata->{resource}{"res/exp_table"} = {
3156 type => FT_RSRC, 3297 type => FT_RSRC,
3157 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3298 data => $exp_table,
3299 hash => (Digest::MD5::md5 $exp_table),
3158 }; 3300 };
3159 cf::cede_to_tick; 3301 cf::cede_to_tick;
3160 3302
3161 { 3303 {
3162 my $faces = $facedata->{faceinfo}; 3304 my $faces = $facedata->{faceinfo};
3164 while (my ($face, $info) = each %$faces) { 3306 while (my ($face, $info) = each %$faces) {
3165 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3307 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166 3308
3167 cf::face::set_visibility $idx, $info->{visibility}; 3309 cf::face::set_visibility $idx, $info->{visibility};
3168 cf::face::set_magicmap $idx, $info->{magicmap}; 3310 cf::face::set_magicmap $idx, $info->{magicmap};
3169 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3311 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3170 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3312 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3171 3313
3172 cf::cede_to_tick; 3314 cf::cede_to_tick;
3173 } 3315 }
3174 3316
3175 while (my ($face, $info) = each %$faces) { 3317 while (my ($face, $info) = each %$faces) {
3199 3341
3200 cf::anim::invalidate_all; # d'oh 3342 cf::anim::invalidate_all; # d'oh
3201 } 3343 }
3202 3344
3203 { 3345 {
3204 # TODO: for gcfclient pleasure, we should give resources
3205 # that gcfclient doesn't grok a >10000 face index.
3206 my $res = $facedata->{resource}; 3346 my $res = $facedata->{resource};
3207 3347
3208 while (my ($name, $info) = each %$res) { 3348 while (my ($name, $info) = each %$res) {
3209 if (defined $info->{type}) { 3349 if (defined $info->{type}) {
3210 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3350 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3211 my $data;
3212 3351
3213 if ($info->{type} & 1) { 3352 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3214 # prepend meta info
3215
3216 my $meta = $enc->encode ({
3217 name => $name,
3218 %{ $info->{meta} || {} },
3219 });
3220
3221 $data = pack "(w/a*)*", $meta, $info->{data};
3222 } else {
3223 $data = $info->{data};
3224 }
3225
3226 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3227 cf::face::set_type $idx, $info->{type}; 3353 cf::face::set_type $idx, $info->{type};
3228 } else { 3354 } else {
3229 $RESOURCE{$name} = $info; 3355 $RESOURCE{$name} = $info;
3230 } 3356 }
3231 3357
3264 while (my ($k, $v) = each %$want) { 3390 while (my ($k, $v) = each %$want) {
3265 $ns->fx_want ($k, $v); 3391 $ns->fx_want ($k, $v);
3266 } 3392 }
3267}; 3393};
3268 3394
3395sub load_resource_file($) {
3396 my $guard = lock_acquire "load_resource_file";
3397
3398 my $status = load_resource_file_ $_[0];
3399 get_slot 0.1, 100;
3400 cf::arch::commit_load;
3401
3402 $status
3403}
3404
3269sub reload_regions { 3405sub reload_regions {
3270 # HACK to clear player env face cache, we need some signal framework 3406 # HACK to clear player env face cache, we need some signal framework
3271 # for this (global event?) 3407 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = (); 3408 %ext::player_env::MUSIC_FACE_CACHE = ();
3273 3409
3286} 3422}
3287 3423
3288sub reload_archetypes { 3424sub reload_archetypes {
3289 load_resource_file "$DATADIR/archetypes" 3425 load_resource_file "$DATADIR/archetypes"
3290 or die "unable to load archetypes\n"; 3426 or die "unable to load archetypes\n";
3291 #d# NEED to laod twice to resolve forward references
3292 # this really needs to be done in an extra post-pass
3293 # (which needs to be synchronous, so solve it differently)
3294 load_resource_file "$DATADIR/archetypes"
3295 or die "unable to load archetypes\n";
3296} 3427}
3297 3428
3298sub reload_treasures { 3429sub reload_treasures {
3299 load_resource_file "$DATADIR/treasures" 3430 load_resource_file "$DATADIR/treasures"
3300 or die "unable to load treasurelists\n"; 3431 or die "unable to load treasurelists\n";
3301} 3432}
3302 3433
3303sub reload_resources { 3434sub reload_resources {
3304 warn "reloading resource files...\n"; 3435 warn "reloading resource files...\n";
3305 3436
3437 reload_facedata;
3438 reload_archetypes;
3306 reload_regions; 3439 reload_regions;
3307 reload_facedata;
3308 #reload_archetypes;#d#
3309 reload_archetypes;
3310 reload_treasures; 3440 reload_treasures;
3311 3441
3312 warn "finished reloading resource files\n"; 3442 warn "finished reloading resource files\n";
3313} 3443}
3314 3444
3315sub init {
3316 reload_resources;
3317}
3318
3319sub reload_config { 3445sub reload_config {
3446 warn "reloading config file...\n";
3447
3320 open my $fh, "<:utf8", "$CONFDIR/config" 3448 open my $fh, "<:utf8", "$CONFDIR/config"
3321 or return; 3449 or return;
3322 3450
3323 local $/; 3451 local $/;
3324 *CFG = YAML::Load <$fh>; 3452 *CFG = YAML::XS::Load scalar <$fh>;
3325 3453
3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3454 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3327 3455
3328 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3456 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3329 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3457 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3333 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3461 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3334 and die "WARNING: m(un)lockall failed: $!\n"; 3462 and die "WARNING: m(un)lockall failed: $!\n";
3335 }; 3463 };
3336 warn $@ if $@; 3464 warn $@ if $@;
3337 } 3465 }
3466
3467 warn "finished reloading resource files\n";
3468}
3469
3470sub pidfile() {
3471 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3472 or die "$PIDFILE: $!";
3473 flock $fh, &Fcntl::LOCK_EX
3474 or die "$PIDFILE: flock: $!";
3475 $fh
3476}
3477
3478# make sure only one server instance is running at any one time
3479sub atomic {
3480 my $fh = pidfile;
3481
3482 my $pid = <$fh>;
3483 kill 9, $pid if $pid > 0;
3484
3485 seek $fh, 0, 0;
3486 print $fh $$;
3487}
3488
3489sub main_loop {
3490 warn "EV::loop starting\n";
3491 if (1) {
3492 EV::loop;
3493 }
3494 warn "EV::loop returned\n";
3495 goto &main_loop unless $REALLY_UNLOOP;
3338} 3496}
3339 3497
3340sub main { 3498sub main {
3499 cf::init_globals; # initialise logging
3500
3501 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3502 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3503 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3504 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3505
3506 cf::init_experience;
3507 cf::init_anim;
3508 cf::init_attackmess;
3509 cf::init_dynamic;
3510
3511 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3512
3341 # we must not ever block the main coroutine 3513 # we must not ever block the main coroutine
3342 local $Coro::idle = sub { 3514 local $Coro::idle = sub {
3343 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3515 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3344 (async { 3516 (async {
3345 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3517 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT; 3518 EV::loop EV::LOOP_ONESHOT;
3347 })->prio (Coro::PRIO_MAX); 3519 })->prio (Coro::PRIO_MAX);
3348 }; 3520 };
3349 3521
3522 evthread_start IO::AIO::poll_fileno;
3523
3524 cf::sync_job {
3525 cf::load_settings;
3526 cf::load_materials;
3527
3528 reload_resources;
3350 reload_config; 3529 reload_config;
3351 db_init; 3530 db_init;
3531
3532 cf::init_uuid;
3533 cf::init_signals;
3534 cf::init_commands;
3535 cf::init_skills;
3536
3537 cf::init_beforeplay;
3538
3539 atomic;
3540
3352 load_extensions; 3541 load_extensions;
3353 3542
3354 $TICK_WATCHER->start; 3543 utime time, time, $RUNTIMEFILE;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3544
3356 EV::loop; 3545 # no (long-running) fork's whatsoever before this point(!)
3546 use POSIX ();
3547 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3548
3549 (pop @POST_INIT)->(0) while @POST_INIT;
3550 };
3551
3552 main_loop;
3357} 3553}
3358 3554
3359############################################################################# 3555#############################################################################
3360# initialisation and cleanup 3556# initialisation and cleanup
3361 3557
3367 cf::cleanup "SIG$signal"; 3563 cf::cleanup "SIG$signal";
3368 }; 3564 };
3369 } 3565 }
3370} 3566}
3371 3567
3372sub write_runtime { 3568sub write_runtime_sync {
3373 my $runtime = "$LOCALDIR/runtime";
3374
3375 # first touch the runtime file to show we are still running: 3569 # first touch the runtime file to show we are still running:
3376 # the fsync below can take a very very long time. 3570 # the fsync below can take a very very long time.
3377 3571
3378 IO::AIO::aio_utime $runtime, undef, undef; 3572 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3379 3573
3380 my $guard = cf::lock_acquire "write_runtime"; 3574 my $guard = cf::lock_acquire "write_runtime";
3381 3575
3382 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3576 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3383 or return; 3577 or return;
3384 3578
3385 my $value = $cf::RUNTIME + 90 + 10; 3579 my $value = $cf::RUNTIME + 90 + 10;
3386 # 10 is the runtime save interval, for a monotonic clock 3580 # 10 is the runtime save interval, for a monotonic clock
3387 # 60 allows for the watchdog to kill the server. 3581 # 60 allows for the watchdog to kill the server.
3397 aio_utime $fh, undef, undef; 3591 aio_utime $fh, undef, undef;
3398 3592
3399 close $fh 3593 close $fh
3400 or return; 3594 or return;
3401 3595
3402 aio_rename "$runtime~", $runtime 3596 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3403 and return; 3597 and return;
3404 3598
3405 warn "runtime file written.\n"; 3599 warn "runtime file written.\n";
3406 3600
3407 1 3601 1
3602}
3603
3604our $uuid_lock;
3605our $uuid_skip;
3606
3607sub write_uuid_sync($) {
3608 $uuid_skip ||= $_[0];
3609
3610 return if $uuid_lock;
3611 local $uuid_lock = 1;
3612
3613 my $uuid = "$LOCALDIR/uuid";
3614
3615 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3616 or return;
3617
3618 my $value = uuid_seq uuid_cur;
3619
3620 unless ($value) {
3621 warn "cowardly refusing to write zero uuid value!\n";
3622 return;
3623 }
3624
3625 my $value = uuid_str $value + $uuid_skip;
3626 $uuid_skip = 0;
3627
3628 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3629 and return;
3630
3631 # always fsync - this file is important
3632 aio_fsync $fh
3633 and return;
3634
3635 close $fh
3636 or return;
3637
3638 aio_rename "$uuid~", $uuid
3639 and return;
3640
3641 warn "uuid file written ($value).\n";
3642
3643 1
3644
3645}
3646
3647sub write_uuid($$) {
3648 my ($skip, $sync) = @_;
3649
3650 $sync ? write_uuid_sync $skip
3651 : async { write_uuid_sync $skip };
3408} 3652}
3409 3653
3410sub emergency_save() { 3654sub emergency_save() {
3411 my $freeze_guard = cf::freeze_mainloop; 3655 my $freeze_guard = cf::freeze_mainloop;
3412 3656
3413 warn "enter emergency perl save\n"; 3657 warn "emergency_perl_save: enter\n";
3414 3658
3415 cf::sync_job { 3659 cf::sync_job {
3660 # this is a trade-off: we want to be very quick here, so
3661 # save all maps without fsync, and later call a global sync
3662 # (which in turn might be very very slow)
3663 local $USE_FSYNC = 0;
3664
3416 # use a peculiar iteration method to avoid tripping on perl 3665 # use a peculiar iteration method to avoid tripping on perl
3417 # refcount bugs in for. also avoids problems with players 3666 # refcount bugs in for. also avoids problems with players
3418 # and maps saved/destroyed asynchronously. 3667 # and maps saved/destroyed asynchronously.
3419 warn "begin emergency player save\n"; 3668 warn "emergency_perl_save: begin player save\n";
3420 for my $login (keys %cf::PLAYER) { 3669 for my $login (keys %cf::PLAYER) {
3421 my $pl = $cf::PLAYER{$login} or next; 3670 my $pl = $cf::PLAYER{$login} or next;
3422 $pl->valid or next; 3671 $pl->valid or next;
3423 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3672 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3424 $pl->save; 3673 $pl->save;
3425 } 3674 }
3426 warn "end emergency player save\n"; 3675 warn "emergency_perl_save: end player save\n";
3427 3676
3428 warn "begin emergency map save\n"; 3677 warn "emergency_perl_save: begin map save\n";
3429 for my $path (keys %cf::MAP) { 3678 for my $path (keys %cf::MAP) {
3430 my $map = $cf::MAP{$path} or next; 3679 my $map = $cf::MAP{$path} or next;
3431 $map->valid or next; 3680 $map->valid or next;
3432 $map->save; 3681 $map->save;
3433 } 3682 }
3434 warn "end emergency map save\n"; 3683 warn "emergency_perl_save: end map save\n";
3435 3684
3436 warn "begin emergency database checkpoint\n"; 3685 warn "emergency_perl_save: begin database checkpoint\n";
3437 BDB::db_env_txn_checkpoint $DB_ENV; 3686 BDB::db_env_txn_checkpoint $DB_ENV;
3438 warn "end emergency database checkpoint\n"; 3687 warn "emergency_perl_save: end database checkpoint\n";
3688
3689 warn "emergency_perl_save: begin write uuid\n";
3690 write_uuid_sync 1;
3691 warn "emergency_perl_save: end write uuid\n";
3439 }; 3692 };
3440 3693
3694 warn "emergency_perl_save: starting sync()\n";
3695 IO::AIO::aio_sync sub {
3696 warn "emergency_perl_save: finished sync()\n";
3697 };
3698
3441 warn "leave emergency perl save\n"; 3699 warn "emergency_perl_save: leave\n";
3442} 3700}
3443 3701
3444sub post_cleanup { 3702sub post_cleanup {
3445 my ($make_core) = @_; 3703 my ($make_core) = @_;
3446 3704
3447 warn Carp::longmess "post_cleanup backtrace" 3705 warn Carp::longmess "post_cleanup backtrace"
3448 if $make_core; 3706 if $make_core;
3707
3708 my $fh = pidfile;
3709 unlink $PIDFILE if <$fh> == $$;
3710}
3711
3712# a safer delete_package, copied from Symbol
3713sub clear_package($) {
3714 my $pkg = shift;
3715
3716 # expand to full symbol table name if needed
3717 unless ($pkg =~ /^main::.*::$/) {
3718 $pkg = "main$pkg" if $pkg =~ /^::/;
3719 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3720 $pkg .= '::' unless $pkg =~ /::$/;
3721 }
3722
3723 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3724 my $stem_symtab = *{$stem}{HASH};
3725
3726 defined $stem_symtab and exists $stem_symtab->{$leaf}
3727 or return;
3728
3729 # clear all symbols
3730 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3731 for my $name (keys %$leaf_symtab) {
3732 _gv_clear *{"$pkg$name"};
3733# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3734 }
3735 warn "cleared package $pkg\n";#d#
3449} 3736}
3450 3737
3451sub do_reload_perl() { 3738sub do_reload_perl() {
3452 # can/must only be called in main 3739 # can/must only be called in main
3453 if ($Coro::current != $Coro::main) { 3740 if ($Coro::current != $Coro::main) {
3454 warn "can only reload from main coroutine"; 3741 warn "can only reload from main coroutine";
3455 return; 3742 return;
3456 } 3743 }
3457 3744
3745 return if $RELOAD++;
3746
3747 my $t1 = EV::time;
3748
3749 while ($RELOAD) {
3458 warn "reloading..."; 3750 warn "reloading...";
3459 3751
3460 warn "entering sync_job"; 3752 warn "entering sync_job";
3461 3753
3462 cf::sync_job { 3754 cf::sync_job {
3463 cf::write_runtime; # external watchdog should not bark 3755 cf::write_runtime_sync; # external watchdog should not bark
3464 cf::emergency_save; 3756 cf::emergency_save;
3465 cf::write_runtime; # external watchdog should not bark 3757 cf::write_runtime_sync; # external watchdog should not bark
3466 3758
3467 warn "syncing database to disk"; 3759 warn "syncing database to disk";
3468 BDB::db_env_txn_checkpoint $DB_ENV; 3760 BDB::db_env_txn_checkpoint $DB_ENV;
3469 3761
3470 # if anything goes wrong in here, we should simply crash as we already saved 3762 # if anything goes wrong in here, we should simply crash as we already saved
3471 3763
3472 warn "flushing outstanding aio requests"; 3764 warn "flushing outstanding aio requests";
3473 for (;;) {
3474 BDB::flush;
3475 IO::AIO::flush;
3476 Coro::cede_notself;
3477 last unless IO::AIO::nreqs || BDB::nreqs; 3765 while (IO::AIO::nreqs || BDB::nreqs) {
3478 warn "iterate..."; 3766 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3479 }
3480
3481 ++$RELOAD;
3482
3483 warn "cancelling all extension coros";
3484 $_->cancel for values %EXT_CORO;
3485 %EXT_CORO = ();
3486
3487 warn "removing commands";
3488 %COMMAND = ();
3489
3490 warn "removing ext/exti commands";
3491 %EXTCMD = ();
3492 %EXTICMD = ();
3493
3494 warn "unloading/nuking all extensions";
3495 for my $pkg (@EXTS) {
3496 warn "... unloading $pkg";
3497
3498 if (my $cb = $pkg->can ("unload")) {
3499 eval {
3500 $cb->($pkg);
3501 1
3502 } or warn "$pkg unloaded, but with errors: $@";
3503 } 3767 }
3504 3768
3505 warn "... nuking $pkg"; 3769 warn "cancelling all extension coros";
3506 Symbol::delete_package $pkg; 3770 $_->cancel for values %EXT_CORO;
3507 } 3771 %EXT_CORO = ();
3508 3772
3509 warn "unloading all perl modules loaded from $LIBDIR"; 3773 warn "removing commands";
3510 while (my ($k, $v) = each %INC) { 3774 %COMMAND = ();
3511 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3512 3775
3776 warn "removing ext/exti commands";
3777 %EXTCMD = ();
3778 %EXTICMD = ();
3779
3780 warn "unloading/nuking all extensions";
3781 for my $pkg (@EXTS) {
3513 warn "... unloading $k"; 3782 warn "... unloading $pkg";
3514 delete $INC{$k};
3515 3783
3516 $k =~ s/\.pm$//;
3517 $k =~ s/\//::/g;
3518
3519 if (my $cb = $k->can ("unload_module")) { 3784 if (my $cb = $pkg->can ("unload")) {
3785 eval {
3520 $cb->(); 3786 $cb->($pkg);
3787 1
3788 } or warn "$pkg unloaded, but with errors: $@";
3789 }
3790
3791 warn "... clearing $pkg";
3792 clear_package $pkg;
3521 } 3793 }
3522 3794
3523 Symbol::delete_package $k; 3795 warn "unloading all perl modules loaded from $LIBDIR";
3796 while (my ($k, $v) = each %INC) {
3797 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3798
3799 warn "... unloading $k";
3800 delete $INC{$k};
3801
3802 $k =~ s/\.pm$//;
3803 $k =~ s/\//::/g;
3804
3805 if (my $cb = $k->can ("unload_module")) {
3806 $cb->();
3807 }
3808
3809 clear_package $k;
3524 } 3810 }
3525 3811
3526 warn "getting rid of safe::, as good as possible"; 3812 warn "getting rid of safe::, as good as possible";
3527 Symbol::delete_package "safe::$_" 3813 clear_package "safe::$_"
3528 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3814 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3529 3815
3530 warn "unloading cf.pm \"a bit\""; 3816 warn "unloading cf.pm \"a bit\"";
3531 delete $INC{"cf.pm"}; 3817 delete $INC{"cf.pm"};
3532 delete $INC{"cf/pod.pm"}; 3818 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3533 3819
3534 # don't, removes xs symbols, too, 3820 # don't, removes xs symbols, too,
3535 # and global variables created in xs 3821 # and global variables created in xs
3536 #Symbol::delete_package __PACKAGE__; 3822 #clear_package __PACKAGE__;
3537 3823
3538 warn "unload completed, starting to reload now"; 3824 warn "unload completed, starting to reload now";
3539 3825
3540 warn "reloading cf.pm"; 3826 warn "reloading cf.pm";
3541 require cf; 3827 require cf;
3542 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3828 cf::_connect_to_perl_1;
3543 3829
3544 warn "loading config and database again"; 3830 warn "loading config and database again";
3545 cf::reload_config; 3831 cf::reload_config;
3546 3832
3547 warn "loading extensions"; 3833 warn "loading extensions";
3548 cf::load_extensions; 3834 cf::load_extensions;
3549 3835
3836 if ($REATTACH_ON_RELOAD) {
3550 warn "reattaching attachments to objects/players"; 3837 warn "reattaching attachments to objects/players";
3551 _global_reattach; # objects, sockets 3838 _global_reattach; # objects, sockets
3552 warn "reattaching attachments to maps"; 3839 warn "reattaching attachments to maps";
3553 reattach $_ for values %MAP; 3840 reattach $_ for values %MAP;
3554 warn "reattaching attachments to players"; 3841 warn "reattaching attachments to players";
3555 reattach $_ for values %PLAYER; 3842 reattach $_ for values %PLAYER;
3843 }
3556 3844
3845 warn "running post_init jobs";
3846 (pop @POST_INIT)->(1) while @POST_INIT;
3847
3557 warn "leaving sync_job"; 3848 warn "leaving sync_job";
3558 3849
3559 1 3850 1
3560 } or do { 3851 } or do {
3561 warn $@; 3852 warn $@;
3562 cf::cleanup "error while reloading, exiting."; 3853 cf::cleanup "error while reloading, exiting.";
3563 }; 3854 };
3564 3855
3565 warn "reloaded"; 3856 warn "reloaded";
3857 --$RELOAD;
3858 }
3859
3860 $t1 = EV::time - $t1;
3861 warn "reload completed in ${t1}s\n";
3566}; 3862};
3567 3863
3568our $RELOAD_WATCHER; # used only during reload 3864our $RELOAD_WATCHER; # used only during reload
3569 3865
3570sub reload_perl() { 3866sub reload_perl() {
3571 # doing reload synchronously and two reloads happen back-to-back, 3867 # doing reload synchronously and two reloads happen back-to-back,
3572 # coro crashes during coro_state_free->destroy here. 3868 # coro crashes during coro_state_free->destroy here.
3573 3869
3870 $RELOAD_WATCHER ||= cf::async {
3871 Coro::AIO::aio_wait cache_extensions;
3872
3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3873 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3575 do_reload_perl; 3874 do_reload_perl;
3576 undef $RELOAD_WATCHER; 3875 undef $RELOAD_WATCHER;
3876 };
3577 }; 3877 };
3578} 3878}
3579 3879
3580register_command "reload" => sub { 3880register_command "reload" => sub {
3581 my ($who, $arg) = @_; 3881 my ($who, $arg) = @_;
3595 3895
3596our @WAIT_FOR_TICK; 3896our @WAIT_FOR_TICK;
3597our @WAIT_FOR_TICK_BEGIN; 3897our @WAIT_FOR_TICK_BEGIN;
3598 3898
3599sub wait_for_tick { 3899sub wait_for_tick {
3600 return unless $TICK_WATCHER->is_active;
3601 return if $Coro::current == $Coro::main; 3900 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3602 3901
3603 my $signal = new Coro::Signal; 3902 my $signal = new Coro::Signal;
3604 push @WAIT_FOR_TICK, $signal; 3903 push @WAIT_FOR_TICK, $signal;
3605 $signal->wait; 3904 $signal->wait;
3606} 3905}
3607 3906
3608sub wait_for_tick_begin { 3907sub wait_for_tick_begin {
3609 return unless $TICK_WATCHER->is_active;
3610 return if $Coro::current == $Coro::main; 3908 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3611 3909
3612 my $signal = new Coro::Signal; 3910 my $signal = new Coro::Signal;
3613 push @WAIT_FOR_TICK_BEGIN, $signal; 3911 push @WAIT_FOR_TICK_BEGIN, $signal;
3614 $signal->wait; 3912 $signal->wait;
3615} 3913}
3616 3914
3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3915sub tick {
3618 if ($Coro::current != $Coro::main) { 3916 if ($Coro::current != $Coro::main) {
3619 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3917 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3620 unless ++$bug_warning > 10; 3918 unless ++$bug_warning > 10;
3621 return; 3919 return;
3622 } 3920 }
3623 3921
3624 $NOW = $tick_start = EV::now;
3625
3626 cf::server_tick; # one server iteration 3922 cf::server_tick; # one server iteration
3627 3923
3628 $RUNTIME += $TICK; 3924 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3629 $NEXT_TICK = $_[0]->at;
3630 3925
3631 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3926 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3927 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3633 Coro::async_pool { 3928 Coro::async_pool {
3634 $Coro::current->{desc} = "runtime saver"; 3929 $Coro::current->{desc} = "runtime saver";
3635 write_runtime 3930 write_runtime_sync
3636 or warn "ERROR: unable to write runtime file: $!"; 3931 or warn "ERROR: unable to write runtime file: $!";
3637 }; 3932 };
3638 } 3933 }
3639 3934
3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3935 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3642 } 3937 }
3643 while (my $sig = shift @WAIT_FOR_TICK) { 3938 while (my $sig = shift @WAIT_FOR_TICK) {
3644 $sig->send; 3939 $sig->send;
3645 } 3940 }
3646 3941
3647 $LOAD = ($NOW - $tick_start) / $TICK; 3942 $LOAD = ($NOW - $TICK_START) / $TICK;
3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3943 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3649 3944
3650 _post_tick; 3945 if (0) {
3651}; 3946 if ($NEXT_TICK) {
3652$TICK_WATCHER->priority (EV::MAXPRI); 3947 my $jitter = $TICK_START - $NEXT_TICK;
3948 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3949 warn "jitter $JITTER\n";#d#
3950 }
3951 }
3952}
3653 3953
3654{ 3954{
3655 # configure BDB 3955 # configure BDB
3656 3956
3657 BDB::min_parallel 8; 3957 BDB::min_parallel 16;
3658 BDB::max_poll_reqs $TICK * 0.1; 3958 BDB::max_poll_reqs $TICK * 0.1;
3659 $Coro::BDB::WATCHER->priority (1); 3959 $AnyEvent::BDB::WATCHER->priority (1);
3660 3960
3661 unless ($DB_ENV) { 3961 unless ($DB_ENV) {
3662 $DB_ENV = BDB::db_env_create; 3962 $DB_ENV = BDB::db_env_create;
3663 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3963 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3664 | BDB::LOG_AUTOREMOVE, 1); 3964 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3965 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3665 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3966 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3666 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3967 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3667 3968
3668 cf::sync_job { 3969 cf::sync_job {
3669 eval { 3970 eval {
3695{ 3996{
3696 # configure IO::AIO 3997 # configure IO::AIO
3697 3998
3698 IO::AIO::min_parallel 8; 3999 IO::AIO::min_parallel 8;
3699 IO::AIO::max_poll_time $TICK * 0.1; 4000 IO::AIO::max_poll_time $TICK * 0.1;
3700 $Coro::AIO::WATCHER->priority (1); 4001 undef $AnyEvent::AIO::WATCHER;
3701} 4002}
3702 4003
3703my $_log_backtrace; 4004my $_log_backtrace;
3704 4005
3705sub _log_backtrace { 4006sub _log_backtrace {
3708 $msg =~ s/\n//; 4009 $msg =~ s/\n//;
3709 4010
3710 # limit the # of concurrent backtraces 4011 # limit the # of concurrent backtraces
3711 if ($_log_backtrace < 2) { 4012 if ($_log_backtrace < 2) {
3712 ++$_log_backtrace; 4013 ++$_log_backtrace;
4014 my $perl_bt = Carp::longmess $msg;
3713 async { 4015 async {
3714 $Coro::current->{desc} = "abt $msg"; 4016 $Coro::current->{desc} = "abt $msg";
3715 4017
3716 my @bt = fork_call { 4018 my @bt = fork_call {
3717 @addr = map { sprintf "%x", $_ } @addr; 4019 @addr = map { sprintf "%x", $_ } @addr;
3728 } 4030 }
3729 4031
3730 @funcs 4032 @funcs
3731 }; 4033 };
3732 4034
3733 LOG llevInfo, "[ABT] $msg\n"; 4035 LOG llevInfo, "[ABT] $perl_bt\n";
4036 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3734 LOG llevInfo, "[ABT] $_\n" for @bt; 4037 LOG llevInfo, "[ABT] $_\n" for @bt;
3735 --$_log_backtrace; 4038 --$_log_backtrace;
3736 }; 4039 };
3737 } else { 4040 } else {
3738 LOG llevInfo, "[ABT] $msg\n"; 4041 LOG llevInfo, "[ABT] $msg\n";
3739 LOG llevInfo, "[ABT] [suppressed]\n"; 4042 LOG llevInfo, "[ABT] [suppressed]\n";
3740 } 4043 }
3741} 4044}
3742 4045
3743# load additional modules 4046# load additional modules
3744use cf::pod; 4047require "cf/$_.pm" for @EXTRA_MODULES;
4048cf::_connect_to_perl_2;
3745 4049
3746END { cf::emergency_save } 4050END { cf::emergency_save }
3747 4051
37481 40521
3749 4053

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines