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.408 by root, Mon Jan 14 10:12:12 2008 UTC vs.
Revision 1.503 by root, Sat Jan 30 23:46:39 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 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 {
259 return unless $^S eq 0; # "eq", not "=="
260
197 warn Carp::longmess $_[0]; 261 warn Carp::longmess $_[0];
262
263 if ($Coro::current == $Coro::main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d#
266 }#d#
267
268 # kill coroutine otherwise
198 Coro::terminate; 269 Coro::terminate
199}; 270};
200 271
201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
211for my $pkg (qw( 282for my $pkg (qw(
212 cf::global cf::attachable 283 cf::global cf::attachable
213 cf::object cf::object::player 284 cf::object cf::object::player
214 cf::client cf::player 285 cf::client cf::player
215 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
216 cf::map cf::party cf::region 288 cf::party cf::region
217)) { 289)) {
218 no strict 'refs';
219 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
220} 291}
221 292
222$EV::DIED = sub { 293$EV::DIED = sub {
223 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
224}; 295};
225 296
226############################################################################# 297#############################################################################
227 298
228=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
265our $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
266 337
267sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
268sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
269 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
270=item cf::lock_wait $string 355=item cf::lock_wait $string
271 356
272Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
273 358
274=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
275 360
276Wait 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
277a 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,
278for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
279returned. 364returned.
280 365
281Locks 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
282deadlocked coro. 367deadlocked coro.
288 373
289Return 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.
290 375
291=cut 376=cut
292 377
293our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
294our %LOCKER;#d#
295 379
296sub lock_wait($) { 380sub lock_wait($) {
297 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
298
299 if ($LOCKER{$key} == $Coro::current) {#d#
300 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
301 return;#d#
302 }#d#
303
304 # wait for lock, if any
305 while ($LOCK{$key}) {
306 push @{ $LOCK{$key} }, $Coro::current;
307 Coro::schedule;
308 }
309} 382}
310 383
311sub lock_acquire($) { 384sub lock_acquire($) {
312 my ($key) = @_; 385 $LOCKS->guard ($_[0])
313
314 # wait, to be sure we are not locked
315 lock_wait $key;
316
317 $LOCK{$key} = [];
318 $LOCKER{$key} = $Coro::current;#d#
319
320 Coro::guard {
321 delete $LOCKER{$key};#d#
322 # wake up all waiters, to be on the safe side
323 $_->ready for @{ delete $LOCK{$key} };
324 }
325} 386}
326 387
327sub lock_active($) { 388sub lock_active($) {
328 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
329
330 ! ! $LOCK{$key}
331} 390}
332 391
333sub freeze_mainloop { 392sub freeze_mainloop {
334 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
335 394
336 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
337 $TICK_WATCHER->start;
338 };
339 $TICK_WATCHER->stop;
340 $guard
341} 396}
342 397
343=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
344 399
345Like 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
368 423
369=cut 424=cut
370 425
371our @SLOT_QUEUE; 426our @SLOT_QUEUE;
372our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
373 429
374$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
375$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
376 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
377 433
378 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
379 436
380 while () { 437 while () {
381 next_job: 438 next_job:
439
382 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
383 if ($avail > 0.01) { 441
384 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
385 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
386 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
387 $job->[2]->send; 446 $job->[2]->send;
388 Coro::cede; 447 Coro::cede;
389 goto next_job; 448 goto next_job;
390 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
391 } 451 }
392 } 452 }
393 453
394 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
395 # 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
396 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
397 $signal->wait; 457 $signal->wait;
398 } else { 458 } else {
459 $busy = 0;
399 Coro::schedule; 460 Coro::schedule;
400 } 461 }
401 } 462 }
402}; 463};
403 464
404sub get_slot($;$$) { 465sub get_slot($;$$) {
466 return if tick_inhibit || $Coro::current == $Coro::main;
467
405 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
406 469
407 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
408 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
409 473
410 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
411 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
412 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
446 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
447 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
448 512
449 LOG llevError, Carp::longmess "sync job";#d# 513 LOG llevError, Carp::longmess "sync job";#d#
450 514
451 # TODO: use suspend/resume instead
452 # (but this is cancel-safe)
453 my $freeze_guard = freeze_mainloop; 515 my $freeze_guard = freeze_mainloop;
454 516
455 my $busy = 1; 517 my $busy = 1;
456 my @res; 518 my @res;
457 519
468 } else { 530 } else {
469 EV::loop EV::LOOP_ONESHOT; 531 EV::loop EV::LOOP_ONESHOT;
470 } 532 }
471 } 533 }
472 534
473 $time = EV::time - $time; 535 my $time = EV::time - $time;
474 536
475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
477
478 $tick_start += $time; # do not account sync jobs to server load 537 $TICK_START += $time; # do not account sync jobs to server load
479 538
480 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
481 } else { 540 } else {
482 # we are in another coroutine, how wonderful, everything just works 541 # we are in another coroutine, how wonderful, everything just works
483 542
525 reset_signals; 584 reset_signals;
526 &$cb 585 &$cb
527 }, @args; 586 }, @args;
528 587
529 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
530} 616}
531 617
532=item $value = cf::db_get $family => $key 618=item $value = cf::db_get $family => $key
533 619
534Returns a single value from the environment database. 620Returns a single value from the environment database.
673 759
674############################################################################# 760#############################################################################
675 761
676=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
677 763
678Many 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
679attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
680to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
681 767
682In 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>
683C<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
733=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
734 820
735Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
736given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
737 823
738Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
739that 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.
740 826
741These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
742 828
743=over 4 829=over 4
1034 1120
1035sub reattach { 1121sub reattach {
1036 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
1037 my ($obj) = @_; 1123 my ($obj) = @_;
1038 1124
1125 # no longer needed after getting rid of delete_package?
1039 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
1040 1127
1041 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
1042 1129
1043 @$registry = (); 1130 @$registry = ();
1044 1131
1090 utf8::decode (my $decname = $filename); 1177 utf8::decode (my $decname = $filename);
1091 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
1092 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1093 1180
1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1095 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1097 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 }
1098 close $fh; 1188 aio_close $fh;
1099 1189
1100 if (@$objs) { 1190 if (@$objs) {
1101 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) {
1102 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1104 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1105 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 }
1106 close $fh; 1199 aio_close $fh;
1107 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1108 } 1201 }
1109 } else { 1202 } else {
1110 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1111 } 1204 }
1112 1205
1113 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1114 } else { 1210 } else {
1115 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1116 } 1212 }
1117 } else { 1213 } else {
1118 aio_unlink $filename; 1214 aio_unlink $filename;
1119 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1120 } 1216 }
1211 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1212 1308
1213 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1214} 1310}
1215 1311
1312use File::Glob ();
1313
1216cf::player->attach ( 1314cf::player->attach (
1217 on_command => sub { 1315 on_command => sub {
1218 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1219 1317
1220 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1252 1350
1253 cf::override; 1351 cf::override;
1254 }, 1352 },
1255); 1353);
1256 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
1257sub load_extensions { 1368sub load_extensions {
1258 cf::sync_job { 1369 cf::sync_job {
1259 my %todo; 1370 my %todo;
1260 1371
1261 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
1280 1391
1281 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1282 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1283 1394
1284 $ext{source} = 1395 $ext{source} =
1285 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1286 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1287 . $source 1398 . $source
1288 . "\n};\n1"; 1399 . "\n};\n1";
1289 1400
1290 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1306 my $msg = $@ ? "$v->{path}: $@\n" 1417 my $msg = $@ ? "$v->{path}: $@\n"
1307 : "$v->{base}: extension inactive.\n"; 1418 : "$v->{base}: extension inactive.\n";
1308 1419
1309 if (exists $v->{meta}{mandatory}) { 1420 if (exists $v->{meta}{mandatory}) {
1310 warn $msg; 1421 warn $msg;
1311 warn "mandatory extension failed to load, exiting.\n"; 1422 cf::cleanup "mandatory extension failed to load, exiting.";
1312 exit 1;
1313 } 1423 }
1314 1424
1315 warn $msg; 1425 warn $msg;
1316 } 1426 }
1317 1427
1331 1441
1332=back 1442=back
1333 1443
1334=head2 CORE EXTENSIONS 1444=head2 CORE EXTENSIONS
1335 1445
1336Functions and methods that extend core crossfire objects. 1446Functions and methods that extend core deliantra objects.
1337 1447
1338=cut 1448=cut
1339 1449
1340package cf::player; 1450package cf::player;
1341 1451
1384 1494
1385sub exists($) { 1495sub exists($) {
1386 my ($login) = @_; 1496 my ($login) = @_;
1387 1497
1388 $cf::PLAYER{$login} 1498 $cf::PLAYER{$login}
1389 or cf::sync_job { !aio_stat path $login } 1499 or !aio_stat path $login
1390} 1500}
1391 1501
1392sub find($) { 1502sub find($) {
1393 return $cf::PLAYER{$_[0]} || do { 1503 return $cf::PLAYER{$_[0]} || do {
1394 my $login = $_[0]; 1504 my $login = $_[0];
1406 my $f = new_from_file cf::object::thawer path $login 1516 my $f = new_from_file cf::object::thawer path $login
1407 or return; 1517 or return;
1408 1518
1409 my $pl = cf::player::load_pl $f 1519 my $pl = cf::player::load_pl $f
1410 or return; 1520 or return;
1521
1411 local $cf::PLAYER_LOADING{$login} = $pl; 1522 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs; 1523 $f->resolve_delayed_derefs;
1413 $cf::PLAYER{$login} = $pl 1524 $cf::PLAYER{$login} = $pl
1414 } 1525 }
1415 } 1526 }
1425 1536
1426 return if $pl->{deny_save}; 1537 return if $pl->{deny_save};
1427 1538
1428 aio_mkdir playerdir $pl, 0770; 1539 aio_mkdir playerdir $pl, 0770;
1429 $pl->{last_save} = $cf::RUNTIME; 1540 $pl->{last_save} = $cf::RUNTIME;
1541
1542 cf::get_slot 0.01;
1430 1543
1431 $pl->save_pl ($path); 1544 $pl->save_pl ($path);
1432 cf::cede_to_tick; 1545 cf::cede_to_tick;
1433} 1546}
1434 1547
1466 my ($pl) = @_; 1579 my ($pl) = @_;
1467 1580
1468 my $name = $pl->ob->name; 1581 my $name = $pl->ob->name;
1469 1582
1470 $pl->{deny_save} = 1; 1583 $pl->{deny_save} = 1;
1471 $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
1472 1585
1473 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1586 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1474 $pl->deactivate; 1587 $pl->deactivate;
1588 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1589 $pl->ob->check_score;
1475 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1590 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1476 $pl->ns->destroy if $pl->ns; 1591 $pl->ns->destroy if $pl->ns;
1477 1592
1478 my $path = playerdir $pl; 1593 my $path = playerdir $pl;
1479 my $temp = "$path~$cf::RUNTIME~deleting~"; 1594 my $temp = "$path~$cf::RUNTIME~deleting~";
1518 1633
1519 for my $login (@$dirs) { 1634 for my $login (@$dirs) {
1520 my $path = path $login; 1635 my $path = path $login;
1521 1636
1522 # a .pst is a dead give-away for a valid player 1637 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") { 1638 # if no pst file found, open and chekc for blocked users
1639 if (aio_stat "$path.pst") {
1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1640 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1525 aio_read $fh, 0, 512, my $buf, 0 or next; 1641 aio_read $fh, 0, 512, my $buf, 0 or next;
1526 $buf !~ /^password -------------$/m or next; # official not-valid tag 1642 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 } 1643 }
1528 1644
1559 } 1675 }
1560 1676
1561 \@paths 1677 \@paths
1562} 1678}
1563 1679
1564=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1680=item $protocol_xml = $player->expand_cfpod ($cfpod)
1565 1681
1566Expand crossfire pod fragments into protocol xml. 1682Expand deliantra pod fragments into protocol xml.
1567
1568=cut
1569
1570use re 'eval';
1571
1572my $group;
1573my $interior; $interior = qr{
1574 # match a pod interior sequence sans C<< >>
1575 (?:
1576 \ (.*?)\ (?{ $group = $^N })
1577 | < (??{$interior}) >
1578 )
1579}x;
1580
1581sub expand_cfpod {
1582 my ($self, $pod) = @_;
1583
1584 my $xml;
1585
1586 while () {
1587 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1588 $group = $1;
1589
1590 $group =~ s/&/&amp;/g;
1591 $group =~ s/</&lt;/g;
1592
1593 $xml .= $group;
1594 } elsif ($pod =~ m%\G
1595 ([BCGHITU])
1596 <
1597 (?:
1598 ([^<>]*) (?{ $group = $^N })
1599 | < $interior >
1600 )
1601 >
1602 %gcsx
1603 ) {
1604 my ($code, $data) = ($1, $group);
1605
1606 if ($code eq "B") {
1607 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1608 } elsif ($code eq "I") {
1609 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1610 } elsif ($code eq "U") {
1611 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1612 } elsif ($code eq "C") {
1613 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1614 } elsif ($code eq "T") {
1615 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1616 } elsif ($code eq "G") {
1617 my ($male, $female) = split /\|/, $data;
1618 $data = $self->gender ? $female : $male;
1619 $xml .= expand_cfpod ($self, $data);
1620 } elsif ($code eq "H") {
1621 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1622 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1623 "")
1624 [$self->{hintmode}];
1625 } else {
1626 $xml .= "error processing '$code($data)' directive";
1627 }
1628 } else {
1629 if ($pod =~ /\G(.+)/) {
1630 warn "parse error while expanding $pod (at $1)";
1631 }
1632 last;
1633 }
1634 }
1635
1636 for ($xml) {
1637 # create single paragraphs (very hackish)
1638 s/(?<=\S)\n(?=\w)/ /g;
1639
1640 # compress some whitespace
1641 s/\s+\n/\n/g; # ws line-ends
1642 s/\n\n+/\n/g; # double lines
1643 s/^\n+//; # beginning lines
1644 s/\n+$//; # ending lines
1645 }
1646
1647 $xml
1648}
1649
1650no re 'eval';
1651
1652sub hintmode {
1653 $_[0]{hintmode} = $_[1] if @_ > 1;
1654 $_[0]{hintmode}
1655}
1656 1683
1657=item $player->ext_reply ($msgid, @msg) 1684=item $player->ext_reply ($msgid, @msg)
1658 1685
1659Sends an ext reply to the player. 1686Sends an ext reply to the player.
1660 1687
1727our $MAX_RESET = 3600; 1754our $MAX_RESET = 3600;
1728our $DEFAULT_RESET = 3000; 1755our $DEFAULT_RESET = 3000;
1729 1756
1730sub generate_random_map { 1757sub generate_random_map {
1731 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
1732 # mit "rum" bekleckern, nicht 1762 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1763 $self->_create_random_map (
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1764 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1765 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1766 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1858 1888
1859# the temporary/swap location 1889# the temporary/swap location
1860sub save_path { 1890sub save_path {
1861 my ($self) = @_; 1891 my ($self) = @_;
1862 1892
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1893 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$TMPDIR/$path.map" 1894 "$TMPDIR/$path.map"
1865} 1895}
1866 1896
1867# the unique path, undef == no special unique path 1897# the unique path, undef == no special unique path
1868sub uniq_path { 1898sub uniq_path {
1869 my ($self) = @_; 1899 my ($self) = @_;
1870 1900
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1901 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1902 "$UNIQUEDIR/$path"
1873}
1874
1875# and all this just because we cannot iterate over
1876# all maps in C++...
1877sub change_all_map_light {
1878 my ($change) = @_;
1879
1880 $_->change_map_light ($change)
1881 for grep $_->outdoor, values %cf::MAP;
1882} 1903}
1883 1904
1884sub decay_objects { 1905sub decay_objects {
1885 my ($self) = @_; 1906 my ($self) = @_;
1886 1907
1970sub find { 1991sub find {
1971 my ($path, $origin) = @_; 1992 my ($path, $origin) = @_;
1972 1993
1973 $path = normalise $path, $origin && $origin->path; 1994 $path = normalise $path, $origin && $origin->path;
1974 1995
1975 cf::lock_wait "map_data:$path";#d#remove 1996 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 1997 my $guard2 = cf::lock_acquire "map_find:$path";
1977 1998
1978 $cf::MAP{$path} || do { 1999 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_find:$path";
1980 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1981
1982 my $map = new_from_path cf::map $path 2000 my $map = new_from_path cf::map $path
1983 or return; 2001 or return;
1984 2002
1985 $map->{last_save} = $cf::RUNTIME; 2003 $map->{last_save} = $cf::RUNTIME;
1986 2004
1988 or return; 2006 or return;
1989 2007
1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2008 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1991 # doing this can freeze the server in a sync job, obviously 2009 # doing this can freeze the server in a sync job, obviously
1992 #$cf::WAIT_FOR_TICK->wait; 2010 #$cf::WAIT_FOR_TICK->wait;
2011 undef $guard2;
1993 undef $guard1; 2012 undef $guard1;
1994 undef $guard2;
1995 $map->reset; 2013 $map->reset;
1996 return find $path; 2014 return find $path;
1997 } 2015 }
1998 2016
1999 $cf::MAP{$path} = $map 2017 $cf::MAP{$path} = $map
2000 } 2018 }
2001} 2019}
2002 2020
2003sub pre_load { } 2021sub pre_load { }
2004sub post_load { } 2022#sub post_load { } # XS
2005 2023
2006sub load { 2024sub load {
2007 my ($self) = @_; 2025 my ($self) = @_;
2008 2026
2009 local $self->{deny_reset} = 1; # loading can take a long time 2027 local $self->{deny_reset} = 1; # loading can take a long time
2026 my $f = new_from_file cf::object::thawer $self->{load_path}; 2044 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block; 2045 $f->skip_block;
2028 $self->_load_objects ($f) 2046 $self->_load_objects ($f)
2029 or return; 2047 or return;
2030 2048
2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2049 $self->post_load_original
2032 if delete $self->{load_original}; 2050 if delete $self->{load_original};
2033 2051
2034 if (my $uniq = $self->uniq_path) { 2052 if (my $uniq = $self->uniq_path) {
2035 utf8::encode $uniq; 2053 utf8::encode $uniq;
2036 unless (aio_stat $uniq) { 2054 unless (aio_stat $uniq) {
2054 unless ($self->{deny_activate}) { 2072 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2073 $self->decay_objects;
2056 $self->fix_auto_apply; 2074 $self->fix_auto_apply;
2057 $self->update_buttons; 2075 $self->update_buttons;
2058 cf::cede_to_tick; 2076 cf::cede_to_tick;
2059 $self->set_darkness_map;
2060 cf::cede_to_tick;
2061 $self->activate; 2077 $self->activate;
2062 } 2078 }
2063 2079
2064 $self->{last_save} = $cf::RUNTIME; 2080 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2081 $self->last_access ($cf::RUNTIME);
2066 2082
2067 $self->in_memory (cf::MAP_IN_MEMORY); 2083 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2084 }
2069 2085
2070 $self->post_load; 2086 $self->post_load;
2071} 2087}
2072 2088
2130 my ($path, $origin, $load) = @_; 2146 my ($path, $origin, $load) = @_;
2131 2147
2132 $path = normalise $path, $origin && $origin->{path}; 2148 $path = normalise $path, $origin && $origin->{path};
2133 2149
2134 if (my $map = $cf::MAP{$path}) { 2150 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2151 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2136 } 2152 }
2137 2153
2138 $MAP_PREFETCH{$path} |= $load; 2154 $MAP_PREFETCH{$path} |= $load;
2139 2155
2140 $MAP_PREFETCHER ||= cf::async { 2156 $MAP_PREFETCHER ||= cf::async {
2177 cf::async { 2193 cf::async {
2178 $Coro::current->{desc} = "map player save"; 2194 $Coro::current->{desc} = "map player save";
2179 $_->contr->save for $self->players; 2195 $_->contr->save for $self->players;
2180 }; 2196 };
2181 2197
2198 cf::get_slot 0.02;
2199
2182 if ($uniq) { 2200 if ($uniq) {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2201 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2184 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2202 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2185 } else { 2203 } else {
2186 $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);
2194 $self->save; 2212 $self->save;
2195 2213
2196 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2214 my $lock = cf::lock_acquire "map_data:$self->{path}";
2197 2215
2198 return if $self->players; 2216 return if $self->players;
2199 return if $self->in_memory != cf::MAP_IN_MEMORY; 2217 return if $self->in_memory != cf::MAP_ACTIVE;
2200 return if $self->{deny_save}; 2218 return if $self->{deny_save};
2201 2219
2202 $self->in_memory (cf::MAP_SWAPPED); 2220 $self->in_memory (cf::MAP_SWAPPED);
2203 2221
2204 $self->deactivate; 2222 $self->deactivate;
2229 2247
2230 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2248 my $lock = cf::lock_acquire "map_data:$self->{path}";
2231 2249
2232 return if $self->players; 2250 return if $self->players;
2233 2251
2234 warn "resetting map ", $self->path; 2252 warn "resetting map ", $self->path, "\n";
2235 2253
2236 $self->in_memory (cf::MAP_SWAPPED); 2254 $self->in_memory (cf::MAP_SWAPPED);
2237 2255
2238 # need to save uniques path 2256 # need to save uniques path
2239 unless ($self->{deny_save}) { 2257 unless ($self->{deny_save}) {
2322 2340
2323sub unique_maps() { 2341sub unique_maps() {
2324 [ 2342 [
2325 map { 2343 map {
2326 utf8::decode $_; 2344 utf8::decode $_;
2327 /\.map$/ 2345 s/\.map$//; # TODO future compatibility hack
2346 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2347 ? ()
2328 ? normalise $_ 2348 : normalise $_
2329 : ()
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2349 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2350 ]
2332} 2351}
2333 2352
2334package 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}
2335 2384
2336=back 2385=back
2337 2386
2338=head3 cf::object 2387=head3 cf::object
2339 2388
2343 2392
2344=over 4 2393=over 4
2345 2394
2346=item $ob->inv_recursive 2395=item $ob->inv_recursive
2347 2396
2348Returns 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.
2349 2399
2350=cut 2400=cut
2351 2401
2352sub inv_recursive_; 2402sub inv_recursive_;
2353sub inv_recursive_ { 2403sub inv_recursive_ {
2358 inv_recursive_ inv $_[0] 2408 inv_recursive_ inv $_[0]
2359} 2409}
2360 2410
2361=item $ref = $ob->ref 2411=item $ref = $ob->ref
2362 2412
2363creates 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.
2364 2414
2365=item $ob = cf::object::deref ($refstring) 2415=item $ob = cf::object::deref ($refstring)
2366 2416
2367returns 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,
2368even if the object actually exists. May block. 2418even if the object actually exists. May block.
2400can 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
2401dialogue with the given NPC character. 2451dialogue with the given NPC character.
2402 2452
2403=cut 2453=cut
2404 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
2405# rough implementation of a future "reply" method that works 2469# rough implementation of a future "reply" method that works
2406# with dialog boxes. 2470# with dialog boxes.
2407#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
2408sub cf::object::player::reply($$$;$) { 2472sub cf::object::player::reply($$$;$) {
2409 my ($self, $npc, $msg, $flags) = @_; 2473 my ($self, $npc, $msg, $flags) = @_;
2420 my $dialog = $pl->{npc_dialog}; 2484 my $dialog = $pl->{npc_dialog};
2421 $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));
2422 2486
2423 } else { 2487 } else {
2424 $msg = $npc->name . " says: $msg" if $npc; 2488 $msg = $npc->name . " says: $msg" if $npc;
2425 $self->message ($msg, $flags); 2489 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2426 } 2490 }
2427 } 2491 }
2428} 2492}
2429 2493
2430=item $object->send_msg ($channel, $msg, $color, [extra...]) 2494=item $object->send_msg ($channel, $msg, $color, [extra...])
2455 2519
2456=item $player_object->enter_link 2520=item $player_object->enter_link
2457 2521
2458Freezes 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}>).
2459 2523
2460The 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.
2461I<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.
2462 2528
2463Will never block. 2529Will never block.
2464 2530
2465=item $player_object->leave_link ($map, $x, $y) 2531=item $player_object->leave_link ($map, $x, $y)
2466 2532
2518 ($x, $y) = (-1, -1) 2584 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2585 unless (defined $x) && (defined $y);
2520 2586
2521 # use -1 or undef as default coordinates, not 0, 0 2587 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2588 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2589 if $x <= 0 && $y <= 0;
2524 2590
2525 $map->load; 2591 $map->load;
2526 $map->load_neighbours; 2592 $map->load_neighbours;
2527 2593
2528 return unless $self->contr->active; 2594 return unless $self->contr->active;
2529 $self->activate_recursive;
2530 2595
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2596 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $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;
2533} 2601}
2534 2602
2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2603=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2536 2604
2537Moves 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
2538her, loading and preparing them map, calling the provided $check callback 2606her, loading and preparing them map, calling the provided $check callback
2539that 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
2540the 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
2541be 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 >>.
2542 2613
2543=cut 2614=cut
2544 2615
2545our $GOTOGEN; 2616our $GOTOGEN;
2546 2617
2625} 2696}
2626 2697
2627sub prepare_random_map { 2698sub prepare_random_map {
2628 my ($exit) = @_; 2699 my ($exit) = @_;
2629 2700
2630 my $guard = cf::lock_acquire "exit_prepare:$exit";
2631
2632 # all this does is basically replace the /! path by 2701 # all this does is basically replace the /! path by
2633 # a new random map path (?random/...) with a seed 2702 # a new random map path (?random/...) with a seed
2634 # that depends on the exit object 2703 # that depends on the exit object
2635 2704
2636 my $rmp = parse_random_map_params $exit->msg; 2705 my $rmp = parse_random_map_params $exit->msg;
2638 if ($exit->map) { 2707 if ($exit->map) {
2639 $rmp->{region} = $exit->region->name; 2708 $rmp->{region} = $exit->region->name;
2640 $rmp->{origin_map} = $exit->map->path; 2709 $rmp->{origin_map} = $exit->map->path;
2641 $rmp->{origin_x} = $exit->x; 2710 $rmp->{origin_x} = $exit->x;
2642 $rmp->{origin_y} = $exit->y; 2711 $rmp->{origin_y} = $exit->y;
2712
2713 $exit->map->touch;
2643 } 2714 }
2644 2715
2645 $rmp->{random_seed} ||= $exit->random_seed; 2716 $rmp->{random_seed} ||= $exit->random_seed;
2646 2717
2647 my $data = cf::encode_json $rmp; 2718 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2648 my $md5 = Digest::MD5::md5_hex $data; 2719 my $md5 = Digest::MD5::md5_hex $data;
2649 my $meta = "$RANDOMDIR/$md5.meta"; 2720 my $meta = "$RANDOMDIR/$md5.meta";
2650 2721
2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2722 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2652 aio_write $fh, 0, (length $data), $data, 0; 2723 aio_write $fh, 0, (length $data), $data, 0;
2653 undef $fh; 2724 undef $fh;
2654 aio_rename "$meta~", $meta; 2725 aio_rename "$meta~", $meta;
2655 2726
2727 my $slaying = "?random/$md5";
2728
2729 if ($exit->valid) {
2656 $exit->slaying ("?random/$md5"); 2730 $exit->slaying ("?random/$md5");
2657 $exit->msg (undef); 2731 $exit->msg (undef);
2732 }
2658 } 2733 }
2659} 2734}
2660 2735
2661sub cf::object::player::enter_exit { 2736sub cf::object::player::enter_exit {
2662 my ($self, $exit) = @_; 2737 my ($self, $exit) = @_;
2663 2738
2664 return unless $self->type == cf::PLAYER; 2739 return unless $self->type == cf::PLAYER;
2665 2740
2666 if ($exit->slaying eq "/!") {
2667 #TODO: this should de-fi-ni-te-ly not be a sync-job
2668 # the problem is that $exit might not survive long enough
2669 # so it needs to be done right now, right here
2670 cf::sync_job { prepare_random_map $exit };
2671 }
2672
2673 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2674 my $hp = $exit->stats->hp;
2675 my $sp = $exit->stats->sp;
2676
2677 $self->enter_link; 2741 $self->enter_link;
2678 2742
2679 # if exit is damned, update players death & WoR home-position
2680 $self->contr->savebed ($slaying, $hp, $sp)
2681 if $exit->flag (FLAG_DAMNED);
2682
2683 (async { 2743 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2744 $Coro::current->{desc} = "enter_exit";
2685 2745
2686 $self->deactivate_recursive; # just to be sure
2687 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
2688 $self->goto ($slaying, $hp, $sp); 2761 $self->goto ($map, $x, $y);
2689 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
2690 1; 2767 1
2691 }) { 2768 }) {
2692 $self->message ("Something went wrong deep within the crossfire server. " 2769 $self->message ("Something went wrong deep within the deliantra server. "
2693 . "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. "
2694 . "Please report this to the dungeon master!", 2771 . "Please report this to the dungeon master!",
2695 cf::NDI_UNIQUE | cf::NDI_RED); 2772 cf::NDI_UNIQUE | cf::NDI_RED);
2696 2773
2697 warn "ERROR in enter_exit: $@"; 2774 warn "ERROR in enter_exit: $@";
2714sub cf::client::send_drawinfo { 2791sub cf::client::send_drawinfo {
2715 my ($self, $text, $flags) = @_; 2792 my ($self, $text, $flags) = @_;
2716 2793
2717 utf8::encode $text; 2794 utf8::encode $text;
2718 $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);
2719} 2821}
2720 2822
2721=item $client->send_msg ($channel, $msg, $color, [extra...]) 2823=item $client->send_msg ($channel, $msg, $color, [extra...])
2722 2824
2723Send 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
2727 2829
2728=cut 2830=cut
2729 2831
2730# non-persistent channels (usually the info channel) 2832# non-persistent channels (usually the info channel)
2731our %CHANNEL = ( 2833our %CHANNEL = (
2834 "c/motd" => {
2835 id => "infobox",
2836 title => "MOTD",
2837 reply => undef,
2838 tooltip => "The message of the day",
2839 },
2732 "c/identify" => { 2840 "c/identify" => {
2733 id => "infobox", 2841 id => "infobox",
2734 title => "Identify", 2842 title => "Identify",
2735 reply => undef, 2843 reply => undef,
2736 tooltip => "Items recently identified", 2844 tooltip => "Items recently identified",
2738 "c/examine" => { 2846 "c/examine" => {
2739 id => "infobox", 2847 id => "infobox",
2740 title => "Examine", 2848 title => "Examine",
2741 reply => undef, 2849 reply => undef,
2742 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",
2743 }, 2857 },
2744 "c/book" => { 2858 "c/book" => {
2745 id => "infobox", 2859 id => "infobox",
2746 title => "Book", 2860 title => "Book",
2747 reply => undef, 2861 reply => undef,
2763 id => "infobox", 2877 id => "infobox",
2764 title => "Body Parts", 2878 title => "Body Parts",
2765 reply => undef, 2879 reply => undef,
2766 tooltip => "Shows which body parts you posess and are available", 2880 tooltip => "Shows which body parts you posess and are available",
2767 }, 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 },
2768 "c/uptime" => { 2918 "c/uptime" => {
2769 id => "infobox", 2919 id => "infobox",
2770 title => "Uptime", 2920 title => "Uptime",
2771 reply => undef, 2921 reply => undef,
2772 tooltip => "How long the server has been running since last restart", 2922 tooltip => "How long the server has been running since last restart",
2775 id => "infobox", 2925 id => "infobox",
2776 title => "Map Info", 2926 title => "Map Info",
2777 reply => undef, 2927 reply => undef,
2778 tooltip => "Information related to the maps", 2928 tooltip => "Information related to the maps",
2779 }, 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,
2780); 2944);
2781 2945
2782sub cf::client::send_msg { 2946sub cf::client::send_msg {
2783 my ($self, $channel, $msg, $color, @extra) = @_; 2947 my ($self, $channel, $msg, $color, @extra) = @_;
2784 2948
2785 $msg = $self->pl->expand_cfpod ($msg); 2949 $msg = $self->pl->expand_cfpod ($msg)
2950 unless $color & cf::NDI_VERBATIM;
2786 2951
2787 $color &= cf::NDI_CLIENT_MASK; # just in case... 2952 $color &= cf::NDI_CLIENT_MASK; # just in case...
2788 2953
2789 # check predefined channels, for the benefit of C 2954 # check predefined channels, for the benefit of C
2790 if ($CHANNEL{$channel}) { 2955 if ($CHANNEL{$channel}) {
2791 $channel = $CHANNEL{$channel}; 2956 $channel = $CHANNEL{$channel};
2792 2957
2793 $self->ext_msg (channel_info => $channel) 2958 $self->ext_msg (channel_info => $channel);
2794 if $self->can_msg;
2795
2796 $channel = $channel->{id}; 2959 $channel = $channel->{id};
2797 2960
2798 } elsif (ref $channel) { 2961 } elsif (ref $channel) {
2799 # send meta info to client, if not yet sent 2962 # send meta info to client, if not yet sent
2800 unless (exists $self->{channel}{$channel->{id}}) { 2963 unless (exists $self->{channel}{$channel->{id}}) {
2801 $self->{channel}{$channel->{id}} = $channel; 2964 $self->{channel}{$channel->{id}} = $channel;
2802 $self->ext_msg (channel_info => $channel) 2965 $self->ext_msg (channel_info => $channel);
2803 if $self->can_msg;
2804 } 2966 }
2805 2967
2806 $channel = $channel->{id}; 2968 $channel = $channel->{id};
2807 } 2969 }
2808 2970
2809 return unless @extra || length $msg; 2971 return unless @extra || length $msg;
2810 2972
2811 if ($self->can_msg) {
2812 # default colour, mask it out 2973 # default colour, mask it out
2813 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2974 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2814 if $color & cf::NDI_DEF; 2975 if $color & cf::NDI_DEF;
2815 2976
2816 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2977 my $pkt = "msg "
2978 . $self->{json_coder}->encode (
2817 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2979 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2818 } else { 2980 );
2819 if ($color >= 0) {
2820 # replace some tags by gcfclient-compatible ones
2821 for ($msg) {
2822 1 while
2823 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2824 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2825 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2826 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2827 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2828 }
2829 2981
2830 $color &= cf::NDI_COLOR_MASK; 2982 $self->send_big_packet ($pkt);
2831
2832 utf8::encode $msg;
2833
2834 if (0 && $msg =~ /\[/) {
2835 # COMMAND/INFO
2836 $self->send_packet ("drawextinfo $color 10 8 $msg")
2837 } else {
2838 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2839 $self->send_packet ("drawinfo $color $msg")
2840 }
2841 }
2842 }
2843} 2983}
2844 2984
2845=item $client->ext_msg ($type, @msg) 2985=item $client->ext_msg ($type, @msg)
2846 2986
2847Sends an ext event to the client. 2987Sends an ext event to the client.
2850 2990
2851sub cf::client::ext_msg($$@) { 2991sub cf::client::ext_msg($$@) {
2852 my ($self, $type, @msg) = @_; 2992 my ($self, $type, @msg) = @_;
2853 2993
2854 if ($self->extcmd == 2) { 2994 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2995 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2856 } elsif ($self->extcmd == 1) { # TODO: remove 2996 } elsif ($self->extcmd == 1) { # TODO: remove
2857 push @msg, msgtype => "event_$type"; 2997 push @msg, msgtype => "event_$type";
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2998 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2859 } 2999 }
2860} 3000}
2861 3001
2862=item $client->ext_reply ($msgid, @msg) 3002=item $client->ext_reply ($msgid, @msg)
2863 3003
2867 3007
2868sub cf::client::ext_reply($$@) { 3008sub cf::client::ext_reply($$@) {
2869 my ($self, $id, @msg) = @_; 3009 my ($self, $id, @msg) = @_;
2870 3010
2871 if ($self->extcmd == 2) { 3011 if ($self->extcmd == 2) {
2872 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3012 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2873 } elsif ($self->extcmd == 1) { 3013 } elsif ($self->extcmd == 1) {
2874 #TODO: version 1, remove 3014 #TODO: version 1, remove
2875 unshift @msg, msgtype => "reply", msgid => $id; 3015 unshift @msg, msgtype => "reply", msgid => $id;
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3016 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2877 } 3017 }
2878} 3018}
2879 3019
2880=item $success = $client->query ($flags, "text", \&cb) 3020=item $success = $client->query ($flags, "text", \&cb)
2881 3021
3008our $safe_hole = new Safe::Hole; 3148our $safe_hole = new Safe::Hole;
3009 3149
3010$SIG{FPE} = 'IGNORE'; 3150$SIG{FPE} = 'IGNORE';
3011 3151
3012$safe->permit_only (Opcode::opset qw( 3152$safe->permit_only (Opcode::opset qw(
3013 :base_core :base_mem :base_orig :base_math 3153 :base_core :base_mem :base_orig :base_math :base_loop
3014 grepstart grepwhile mapstart mapwhile 3154 grepstart grepwhile mapstart mapwhile
3015 sort time 3155 sort time
3016)); 3156));
3017 3157
3018# here we export the classes and methods available to script code 3158# here we export the classes and methods available to script code
3021 3161
3022The following functions and methods are available within a safe environment: 3162The following functions and methods are available within a safe environment:
3023 3163
3024 cf::object 3164 cf::object
3025 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
3026 insert remove name archname title slaying race decrease_ob_nr 3166 insert remove name archname title slaying race decrease split
3167 value
3027 3168
3028 cf::object::player 3169 cf::object::player
3029 player 3170 player
3030 3171
3031 cf::player 3172 cf::player
3036 3177
3037=cut 3178=cut
3038 3179
3039for ( 3180for (
3040 ["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
3041 insert remove inv name archname title slaying race 3182 insert remove inv nrof name archname title slaying race
3042 decrease_ob_nr destroy)], 3183 decrease split destroy change_exp value msg lore send_msg)],
3043 ["cf::object::player" => qw(player)], 3184 ["cf::object::player" => qw(player)],
3044 ["cf::player" => qw(peaceful)], 3185 ["cf::player" => qw(peaceful send_msg)],
3045 ["cf::map" => qw(trigger)], 3186 ["cf::map" => qw(trigger)],
3046) { 3187) {
3047 no strict 'refs'; 3188 no strict 'refs';
3048 my ($pkg, @funs) = @$_; 3189 my ($pkg, @funs) = @$_;
3049 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3190 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3067 3208
3068 my $qcode = $code; 3209 my $qcode = $code;
3069 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3210 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3070 $qcode =~ s/\n/\\n/g; 3211 $qcode =~ s/\n/\\n/g;
3071 3212
3213 %vars = (_dummy => 0) unless %vars;
3214
3215 my @res;
3072 local $_; 3216 local $_;
3073 local @safe::cf::_safe_eval_args = values %vars;
3074 3217
3075 my $eval = 3218 my $eval =
3076 "do {\n" 3219 "do {\n"
3077 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3220 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3078 . "#line 0 \"{$qcode}\"\n" 3221 . "#line 0 \"{$qcode}\"\n"
3079 . $code 3222 . $code
3080 . "\n}" 3223 . "\n}"
3081 ; 3224 ;
3082 3225
3226 if ($CFG{safe_eval}) {
3083 sub_generation_inc; 3227 sub_generation_inc;
3228 local @safe::cf::_safe_eval_args = values %vars;
3084 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3229 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3085 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 }
3086 3235
3087 if ($@) { 3236 if ($@) {
3088 warn "$@"; 3237 warn "$@";
3089 warn "while executing safe code '$code'\n"; 3238 warn "while executing safe code '$code'\n";
3090 warn "with arguments " . (join " ", %vars) . "\n"; 3239 warn "with arguments " . (join " ", %vars) . "\n";
3109=cut 3258=cut
3110 3259
3111sub register_script_function { 3260sub register_script_function {
3112 my ($fun, $cb) = @_; 3261 my ($fun, $cb) = @_;
3113 3262
3114 no strict 'refs'; 3263 $fun = "safe::$fun" if $CFG{safe_eval};
3115 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3264 *$fun = $safe_hole->wrap ($cb);
3116} 3265}
3117 3266
3118=back 3267=back
3119 3268
3120=cut 3269=cut
3141 3290
3142 $facedata->{version} == 2 3291 $facedata->{version} == 2
3143 or cf::cleanup "$path: version mismatch, cannot proceed."; 3292 or cf::cleanup "$path: version mismatch, cannot proceed.";
3144 3293
3145 # 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]);
3146 $facedata->{resource}{"res/exp_table"} = { 3296 $facedata->{resource}{"res/exp_table"} = {
3147 type => FT_RSRC, 3297 type => FT_RSRC,
3148 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),
3149 }; 3300 };
3150 cf::cede_to_tick; 3301 cf::cede_to_tick;
3151 3302
3152 { 3303 {
3153 my $faces = $facedata->{faceinfo}; 3304 my $faces = $facedata->{faceinfo};
3155 while (my ($face, $info) = each %$faces) { 3306 while (my ($face, $info) = each %$faces) {
3156 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3307 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157 3308
3158 cf::face::set_visibility $idx, $info->{visibility}; 3309 cf::face::set_visibility $idx, $info->{visibility};
3159 cf::face::set_magicmap $idx, $info->{magicmap}; 3310 cf::face::set_magicmap $idx, $info->{magicmap};
3160 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3311 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3161 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3312 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3162 3313
3163 cf::cede_to_tick; 3314 cf::cede_to_tick;
3164 } 3315 }
3165 3316
3166 while (my ($face, $info) = each %$faces) { 3317 while (my ($face, $info) = each %$faces) {
3190 3341
3191 cf::anim::invalidate_all; # d'oh 3342 cf::anim::invalidate_all; # d'oh
3192 } 3343 }
3193 3344
3194 { 3345 {
3195 # TODO: for gcfclient pleasure, we should give resources
3196 # that gcfclient doesn't grok a >10000 face index.
3197 my $res = $facedata->{resource}; 3346 my $res = $facedata->{resource};
3198 3347
3199 while (my ($name, $info) = each %$res) { 3348 while (my ($name, $info) = each %$res) {
3200 if (defined $info->{type}) { 3349 if (defined $info->{type}) {
3201 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3350 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3202 my $data;
3203 3351
3204 if ($info->{type} & 1) { 3352 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3205 # prepend meta info
3206
3207 my $meta = $enc->encode ({
3208 name => $name,
3209 %{ $info->{meta} || {} },
3210 });
3211
3212 $data = pack "(w/a*)*", $meta, $info->{data};
3213 } else {
3214 $data = $info->{data};
3215 }
3216
3217 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3218 cf::face::set_type $idx, $info->{type}; 3353 cf::face::set_type $idx, $info->{type};
3219 } else { 3354 } else {
3220 $RESOURCE{$name} = $info; 3355 $RESOURCE{$name} = $info;
3221 } 3356 }
3222 3357
3255 while (my ($k, $v) = each %$want) { 3390 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v); 3391 $ns->fx_want ($k, $v);
3257 } 3392 }
3258}; 3393};
3259 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
3260sub reload_regions { 3405sub reload_regions {
3261 # 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
3262 # for this (global event?) 3407 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = (); 3408 %ext::player_env::MUSIC_FACE_CACHE = ();
3264 3409
3277} 3422}
3278 3423
3279sub reload_archetypes { 3424sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes" 3425 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n"; 3426 or die "unable to load archetypes\n";
3282 #d# NEED to laod twice to resolve forward references
3283 # this really needs to be done in an extra post-pass
3284 # (which needs to be synchronous, so solve it differently)
3285 load_resource_file "$DATADIR/archetypes"
3286 or die "unable to load archetypes\n";
3287} 3427}
3288 3428
3289sub reload_treasures { 3429sub reload_treasures {
3290 load_resource_file "$DATADIR/treasures" 3430 load_resource_file "$DATADIR/treasures"
3291 or die "unable to load treasurelists\n"; 3431 or die "unable to load treasurelists\n";
3292} 3432}
3293 3433
3294sub reload_resources { 3434sub reload_resources {
3295 warn "reloading resource files...\n"; 3435 warn "reloading resource files...\n";
3296 3436
3437 reload_facedata;
3438 reload_archetypes;
3297 reload_regions; 3439 reload_regions;
3298 reload_facedata;
3299 #reload_archetypes;#d#
3300 reload_archetypes;
3301 reload_treasures; 3440 reload_treasures;
3302 3441
3303 warn "finished reloading resource files\n"; 3442 warn "finished reloading resource files\n";
3304} 3443}
3305 3444
3306sub init {
3307 reload_resources;
3308}
3309
3310sub reload_config { 3445sub reload_config {
3446 warn "reloading config file...\n";
3447
3311 open my $fh, "<:utf8", "$CONFDIR/config" 3448 open my $fh, "<:utf8", "$CONFDIR/config"
3312 or return; 3449 or return;
3313 3450
3314 local $/; 3451 local $/;
3315 *CFG = YAML::Load <$fh>; 3452 *CFG = YAML::XS::Load scalar <$fh>;
3316 3453
3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3454 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3318 3455
3319 $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};
3320 $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};
3324 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3461 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3325 and die "WARNING: m(un)lockall failed: $!\n"; 3462 and die "WARNING: m(un)lockall failed: $!\n";
3326 }; 3463 };
3327 warn $@ if $@; 3464 warn $@ if $@;
3328 } 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;
3329} 3496}
3330 3497
3331sub 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
3332 # we must not ever block the main coroutine 3513 # we must not ever block the main coroutine
3333 local $Coro::idle = sub { 3514 local $Coro::idle = sub {
3334 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#
3335 (async { 3516 (async {
3336 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3517 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT; 3518 EV::loop EV::LOOP_ONESHOT;
3338 })->prio (Coro::PRIO_MAX); 3519 })->prio (Coro::PRIO_MAX);
3339 }; 3520 };
3340 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;
3341 reload_config; 3529 reload_config;
3342 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
3343 load_extensions; 3541 load_extensions;
3344 3542
3345 $TICK_WATCHER->start; 3543 utime time, time, $RUNTIMEFILE;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3544
3347 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;
3348} 3553}
3349 3554
3350############################################################################# 3555#############################################################################
3351# initialisation and cleanup 3556# initialisation and cleanup
3352 3557
3358 cf::cleanup "SIG$signal"; 3563 cf::cleanup "SIG$signal";
3359 }; 3564 };
3360 } 3565 }
3361} 3566}
3362 3567
3363sub write_runtime { 3568sub write_runtime_sync {
3364 my $runtime = "$LOCALDIR/runtime";
3365
3366 # first touch the runtime file to show we are still running: 3569 # first touch the runtime file to show we are still running:
3367 # the fsync below can take a very very long time. 3570 # the fsync below can take a very very long time.
3368 3571
3369 IO::AIO::aio_utime $runtime, undef, undef; 3572 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3370 3573
3371 my $guard = cf::lock_acquire "write_runtime"; 3574 my $guard = cf::lock_acquire "write_runtime";
3372 3575
3373 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3576 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3374 or return; 3577 or return;
3375 3578
3376 my $value = $cf::RUNTIME + 90 + 10; 3579 my $value = $cf::RUNTIME + 90 + 10;
3377 # 10 is the runtime save interval, for a monotonic clock 3580 # 10 is the runtime save interval, for a monotonic clock
3378 # 60 allows for the watchdog to kill the server. 3581 # 60 allows for the watchdog to kill the server.
3388 aio_utime $fh, undef, undef; 3591 aio_utime $fh, undef, undef;
3389 3592
3390 close $fh 3593 close $fh
3391 or return; 3594 or return;
3392 3595
3393 aio_rename "$runtime~", $runtime 3596 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3394 and return; 3597 and return;
3395 3598
3396 warn "runtime file written.\n"; 3599 warn "runtime file written.\n";
3397 3600
3398 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 };
3399} 3652}
3400 3653
3401sub emergency_save() { 3654sub emergency_save() {
3402 my $freeze_guard = cf::freeze_mainloop; 3655 my $freeze_guard = cf::freeze_mainloop;
3403 3656
3404 warn "enter emergency perl save\n"; 3657 warn "emergency_perl_save: enter\n";
3405 3658
3406 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
3407 # use a peculiar iteration method to avoid tripping on perl 3665 # use a peculiar iteration method to avoid tripping on perl
3408 # refcount bugs in for. also avoids problems with players 3666 # refcount bugs in for. also avoids problems with players
3409 # and maps saved/destroyed asynchronously. 3667 # and maps saved/destroyed asynchronously.
3410 warn "begin emergency player save\n"; 3668 warn "emergency_perl_save: begin player save\n";
3411 for my $login (keys %cf::PLAYER) { 3669 for my $login (keys %cf::PLAYER) {
3412 my $pl = $cf::PLAYER{$login} or next; 3670 my $pl = $cf::PLAYER{$login} or next;
3413 $pl->valid or next; 3671 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3672 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3415 $pl->save; 3673 $pl->save;
3416 } 3674 }
3417 warn "end emergency player save\n"; 3675 warn "emergency_perl_save: end player save\n";
3418 3676
3419 warn "begin emergency map save\n"; 3677 warn "emergency_perl_save: begin map save\n";
3420 for my $path (keys %cf::MAP) { 3678 for my $path (keys %cf::MAP) {
3421 my $map = $cf::MAP{$path} or next; 3679 my $map = $cf::MAP{$path} or next;
3422 $map->valid or next; 3680 $map->valid or next;
3423 $map->save; 3681 $map->save;
3424 } 3682 }
3425 warn "end emergency map save\n"; 3683 warn "emergency_perl_save: end map save\n";
3426 3684
3427 warn "begin emergency database checkpoint\n"; 3685 warn "emergency_perl_save: begin database checkpoint\n";
3428 BDB::db_env_txn_checkpoint $DB_ENV; 3686 BDB::db_env_txn_checkpoint $DB_ENV;
3429 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";
3430 }; 3692 };
3431 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
3432 warn "leave emergency perl save\n"; 3699 warn "emergency_perl_save: leave\n";
3433} 3700}
3434 3701
3435sub post_cleanup { 3702sub post_cleanup {
3436 my ($make_core) = @_; 3703 my ($make_core) = @_;
3437 3704
3438 warn Carp::longmess "post_cleanup backtrace" 3705 warn Carp::longmess "post_cleanup backtrace"
3439 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#
3440} 3736}
3441 3737
3442sub do_reload_perl() { 3738sub do_reload_perl() {
3443 # can/must only be called in main 3739 # can/must only be called in main
3444 if ($Coro::current != $Coro::main) { 3740 if ($Coro::current != $Coro::main) {
3445 warn "can only reload from main coroutine"; 3741 warn "can only reload from main coroutine";
3446 return; 3742 return;
3447 } 3743 }
3448 3744
3745 return if $RELOAD++;
3746
3747 my $t1 = EV::time;
3748
3749 while ($RELOAD) {
3449 warn "reloading..."; 3750 warn "reloading...";
3450 3751
3451 warn "entering sync_job"; 3752 warn "entering sync_job";
3452 3753
3453 cf::sync_job { 3754 cf::sync_job {
3454 cf::write_runtime; # external watchdog should not bark 3755 cf::write_runtime_sync; # external watchdog should not bark
3455 cf::emergency_save; 3756 cf::emergency_save;
3456 cf::write_runtime; # external watchdog should not bark 3757 cf::write_runtime_sync; # external watchdog should not bark
3457 3758
3458 warn "syncing database to disk"; 3759 warn "syncing database to disk";
3459 BDB::db_env_txn_checkpoint $DB_ENV; 3760 BDB::db_env_txn_checkpoint $DB_ENV;
3460 3761
3461 # 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
3462 3763
3463 warn "flushing outstanding aio requests"; 3764 warn "flushing outstanding aio requests";
3464 for (;;) {
3465 BDB::flush;
3466 IO::AIO::flush;
3467 Coro::cede_notself;
3468 last unless IO::AIO::nreqs || BDB::nreqs; 3765 while (IO::AIO::nreqs || BDB::nreqs) {
3469 warn "iterate..."; 3766 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3470 }
3471
3472 ++$RELOAD;
3473
3474 warn "cancelling all extension coros";
3475 $_->cancel for values %EXT_CORO;
3476 %EXT_CORO = ();
3477
3478 warn "removing commands";
3479 %COMMAND = ();
3480
3481 warn "removing ext/exti commands";
3482 %EXTCMD = ();
3483 %EXTICMD = ();
3484
3485 warn "unloading/nuking all extensions";
3486 for my $pkg (@EXTS) {
3487 warn "... unloading $pkg";
3488
3489 if (my $cb = $pkg->can ("unload")) {
3490 eval {
3491 $cb->($pkg);
3492 1
3493 } or warn "$pkg unloaded, but with errors: $@";
3494 } 3767 }
3495 3768
3496 warn "... nuking $pkg"; 3769 warn "cancelling all extension coros";
3497 Symbol::delete_package $pkg; 3770 $_->cancel for values %EXT_CORO;
3498 } 3771 %EXT_CORO = ();
3499 3772
3500 warn "unloading all perl modules loaded from $LIBDIR"; 3773 warn "removing commands";
3501 while (my ($k, $v) = each %INC) { 3774 %COMMAND = ();
3502 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3503 3775
3776 warn "removing ext/exti commands";
3777 %EXTCMD = ();
3778 %EXTICMD = ();
3779
3780 warn "unloading/nuking all extensions";
3781 for my $pkg (@EXTS) {
3504 warn "... unloading $k"; 3782 warn "... unloading $pkg";
3505 delete $INC{$k};
3506 3783
3507 $k =~ s/\.pm$//;
3508 $k =~ s/\//::/g;
3509
3510 if (my $cb = $k->can ("unload_module")) { 3784 if (my $cb = $pkg->can ("unload")) {
3785 eval {
3511 $cb->(); 3786 $cb->($pkg);
3787 1
3788 } or warn "$pkg unloaded, but with errors: $@";
3789 }
3790
3791 warn "... clearing $pkg";
3792 clear_package $pkg;
3512 } 3793 }
3513 3794
3514 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;
3515 } 3810 }
3516 3811
3517 warn "getting rid of safe::, as good as possible"; 3812 warn "getting rid of safe::, as good as possible";
3518 Symbol::delete_package "safe::$_" 3813 clear_package "safe::$_"
3519 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);
3520 3815
3521 warn "unloading cf.pm \"a bit\""; 3816 warn "unloading cf.pm \"a bit\"";
3522 delete $INC{"cf.pm"}; 3817 delete $INC{"cf.pm"};
3523 delete $INC{"cf/pod.pm"}; 3818 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3524 3819
3525 # don't, removes xs symbols, too, 3820 # don't, removes xs symbols, too,
3526 # and global variables created in xs 3821 # and global variables created in xs
3527 #Symbol::delete_package __PACKAGE__; 3822 #clear_package __PACKAGE__;
3528 3823
3529 warn "unload completed, starting to reload now"; 3824 warn "unload completed, starting to reload now";
3530 3825
3531 warn "reloading cf.pm"; 3826 warn "reloading cf.pm";
3532 require cf; 3827 require cf;
3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3828 cf::_connect_to_perl_1;
3534 3829
3535 warn "loading config and database again"; 3830 warn "loading config and database again";
3536 cf::reload_config; 3831 cf::reload_config;
3537 3832
3538 warn "loading extensions"; 3833 warn "loading extensions";
3539 cf::load_extensions; 3834 cf::load_extensions;
3540 3835
3836 if ($REATTACH_ON_RELOAD) {
3541 warn "reattaching attachments to objects/players"; 3837 warn "reattaching attachments to objects/players";
3542 _global_reattach; # objects, sockets 3838 _global_reattach; # objects, sockets
3543 warn "reattaching attachments to maps"; 3839 warn "reattaching attachments to maps";
3544 reattach $_ for values %MAP; 3840 reattach $_ for values %MAP;
3545 warn "reattaching attachments to players"; 3841 warn "reattaching attachments to players";
3546 reattach $_ for values %PLAYER; 3842 reattach $_ for values %PLAYER;
3843 }
3547 3844
3845 warn "running post_init jobs";
3846 (pop @POST_INIT)->(1) while @POST_INIT;
3847
3548 warn "leaving sync_job"; 3848 warn "leaving sync_job";
3549 3849
3550 1 3850 1
3551 } or do { 3851 } or do {
3552 warn $@; 3852 warn $@;
3553 warn "error while reloading, exiting."; 3853 cf::cleanup "error while reloading, exiting.";
3554 exit 1;
3555 }; 3854 };
3556 3855
3557 warn "reloaded"; 3856 warn "reloaded";
3857 --$RELOAD;
3858 }
3859
3860 $t1 = EV::time - $t1;
3861 warn "reload completed in ${t1}s\n";
3558}; 3862};
3559 3863
3560our $RELOAD_WATCHER; # used only during reload 3864our $RELOAD_WATCHER; # used only during reload
3561 3865
3562sub reload_perl() { 3866sub reload_perl() {
3563 # doing reload synchronously and two reloads happen back-to-back, 3867 # doing reload synchronously and two reloads happen back-to-back,
3564 # coro crashes during coro_state_free->destroy here. 3868 # coro crashes during coro_state_free->destroy here.
3565 3869
3870 $RELOAD_WATCHER ||= cf::async {
3871 Coro::AIO::aio_wait cache_extensions;
3872
3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3873 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3874 do_reload_perl;
3567 undef $RELOAD_WATCHER; 3875 undef $RELOAD_WATCHER;
3568 do_reload_perl; 3876 };
3569 }; 3877 };
3570} 3878}
3571 3879
3572register_command "reload" => sub { 3880register_command "reload" => sub {
3573 my ($who, $arg) = @_; 3881 my ($who, $arg) = @_;
3587 3895
3588our @WAIT_FOR_TICK; 3896our @WAIT_FOR_TICK;
3589our @WAIT_FOR_TICK_BEGIN; 3897our @WAIT_FOR_TICK_BEGIN;
3590 3898
3591sub wait_for_tick { 3899sub wait_for_tick {
3592 return unless $TICK_WATCHER->is_active;
3593 return if $Coro::current == $Coro::main; 3900 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3594 3901
3595 my $signal = new Coro::Signal; 3902 my $signal = new Coro::Signal;
3596 push @WAIT_FOR_TICK, $signal; 3903 push @WAIT_FOR_TICK, $signal;
3597 $signal->wait; 3904 $signal->wait;
3598} 3905}
3599 3906
3600sub wait_for_tick_begin { 3907sub wait_for_tick_begin {
3601 return unless $TICK_WATCHER->is_active;
3602 return if $Coro::current == $Coro::main; 3908 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3603 3909
3604 my $signal = new Coro::Signal; 3910 my $signal = new Coro::Signal;
3605 push @WAIT_FOR_TICK_BEGIN, $signal; 3911 push @WAIT_FOR_TICK_BEGIN, $signal;
3606 $signal->wait; 3912 $signal->wait;
3607} 3913}
3608 3914
3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3915sub tick {
3610 if ($Coro::current != $Coro::main) { 3916 if ($Coro::current != $Coro::main) {
3611 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"
3612 unless ++$bug_warning > 10; 3918 unless ++$bug_warning > 10;
3613 return; 3919 return;
3614 } 3920 }
3615 3921
3616 $NOW = $tick_start = EV::now;
3617
3618 cf::server_tick; # one server iteration 3922 cf::server_tick; # one server iteration
3619 3923
3620 $RUNTIME += $TICK; 3924 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3621 $NEXT_TICK = $_[0]->at;
3622 3925
3623 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3926 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3624 $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.;
3625 Coro::async_pool { 3928 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver"; 3929 $Coro::current->{desc} = "runtime saver";
3627 write_runtime 3930 write_runtime_sync
3628 or warn "ERROR: unable to write runtime file: $!"; 3931 or warn "ERROR: unable to write runtime file: $!";
3629 }; 3932 };
3630 } 3933 }
3631 3934
3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3935 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3634 } 3937 }
3635 while (my $sig = shift @WAIT_FOR_TICK) { 3938 while (my $sig = shift @WAIT_FOR_TICK) {
3636 $sig->send; 3939 $sig->send;
3637 } 3940 }
3638 3941
3639 $LOAD = ($NOW - $tick_start) / $TICK; 3942 $LOAD = ($NOW - $TICK_START) / $TICK;
3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3943 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3641 3944
3642 _post_tick; 3945 if (0) {
3643}; 3946 if ($NEXT_TICK) {
3644$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}
3645 3953
3646{ 3954{
3647 # configure BDB 3955 # configure BDB
3648 3956
3649 BDB::min_parallel 8; 3957 BDB::min_parallel 16;
3650 BDB::max_poll_reqs $TICK * 0.1; 3958 BDB::max_poll_reqs $TICK * 0.1;
3651 $Coro::BDB::WATCHER->priority (1); 3959 $AnyEvent::BDB::WATCHER->priority (1);
3652 3960
3653 unless ($DB_ENV) { 3961 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 3962 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3963 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | 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;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3966 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3967 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 3968
3660 cf::sync_job { 3969 cf::sync_job {
3661 eval { 3970 eval {
3687{ 3996{
3688 # configure IO::AIO 3997 # configure IO::AIO
3689 3998
3690 IO::AIO::min_parallel 8; 3999 IO::AIO::min_parallel 8;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4000 IO::AIO::max_poll_time $TICK * 0.1;
3692 $Coro::AIO::WATCHER->priority (1); 4001 undef $AnyEvent::AIO::WATCHER;
3693} 4002}
3694 4003
3695my $_log_backtrace; 4004my $_log_backtrace;
3696 4005
3697sub _log_backtrace { 4006sub _log_backtrace {
3700 $msg =~ s/\n//; 4009 $msg =~ s/\n//;
3701 4010
3702 # limit the # of concurrent backtraces 4011 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 4012 if ($_log_backtrace < 2) {
3704 ++$_log_backtrace; 4013 ++$_log_backtrace;
4014 my $perl_bt = Carp::longmess $msg;
3705 async { 4015 async {
3706 $Coro::current->{desc} = "abt $msg"; 4016 $Coro::current->{desc} = "abt $msg";
3707 4017
3708 my @bt = fork_call { 4018 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 4019 @addr = map { sprintf "%x", $_ } @addr;
3720 } 4030 }
3721 4031
3722 @funcs 4032 @funcs
3723 }; 4033 };
3724 4034
3725 LOG llevInfo, "[ABT] $msg\n"; 4035 LOG llevInfo, "[ABT] $perl_bt\n";
4036 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 4037 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 4038 --$_log_backtrace;
3728 }; 4039 };
3729 } else { 4040 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 4041 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 4042 LOG llevInfo, "[ABT] [suppressed]\n";
3732 } 4043 }
3733} 4044}
3734 4045
3735# load additional modules 4046# load additional modules
3736use cf::pod; 4047require "cf/$_.pm" for @EXTRA_MODULES;
4048cf::_connect_to_perl_2;
3737 4049
3738END { cf::emergency_save } 4050END { cf::emergency_save }
3739 4051
37401 40521
3741 4053

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines