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.388 by root, Thu Oct 18 02:56:13 2007 UTC vs.
Revision 1.489 by root, Fri Oct 23 03:08:35 2009 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 Event; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
14 37
38use Guard ();
15use Coro 4.1 (); 39use Coro ();
16use Coro::State; 40use Coro::State;
17use Coro::Handle; 41use Coro::Handle;
42use Coro::EV;
18use Coro::Event; 43use Coro::AnyEvent;
19use Coro::Timer; 44use Coro::Timer;
20use Coro::Signal; 45use Coro::Signal;
21use Coro::Semaphore; 46use Coro::Semaphore;
47use Coro::SemaphoreSet;
48use Coro::AnyEvent;
22use Coro::AIO; 49use Coro::AIO;
50use Coro::BDB 1.6;
23use Coro::Storable; 51use Coro::Storable;
24use Coro::Util (); 52use Coro::Util ();
25 53
26use JSON::XS (); 54use JSON::XS 2.01 ();
27use BDB (); 55use BDB ();
28use Data::Dumper; 56use Data::Dumper;
29use Digest::MD5; 57use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.51 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::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";
41Compress::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
42 77
43$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
44 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 80
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
65our $DATADIR = datadir; 98our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
75 112
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 115our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
83 117
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 121our $DB_ENV;
89 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
90our %CFG; 125our %CFG;
91 126
92our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 128our $RUNTIME;
129our $NOW;
94 130
95our (%PLAYER, %PLAYER_LOADING); # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 132our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
98 134
99# 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 ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 137
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
104our $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 :)
105 147
106binmode STDOUT; 148binmode STDOUT;
107binmode STDERR; 149binmode STDERR;
108 150
109# read virtual server time, if available 151# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
114} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
115 159
116mkdir $_ 160mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 162
119our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
120 164
121sub 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::"} };
122 177
123############################################################################# 178#############################################################################
124 179
125=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
126 181
162 217
163The raw value load value from the last tick. 218The raw value load value from the last tick.
164 219
165=item %cf::CFG 220=item %cf::CFG
166 221
167Configuration for the server, loaded from C</etc/crossfire/config>, or 222Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 223from wherever your confdir points to.
169 224
170=item cf::wait_for_tick, cf::wait_for_tick_begin 225=item cf::wait_for_tick, cf::wait_for_tick_begin
171 226
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
173returns 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
174per 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.
175 230
176=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
177 232
178This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
179C<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
180that call. 235that call.
181 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
182=back 243=back
183 244
184=cut 245=cut
185 246
186BEGIN { 247$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 248 my $msg = join "", @_;
189 249
190 $msg .= "\n" 250 $msg .= "\n"
191 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
192 252
193 $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;
194 254
195 LOG llevError, $msg; 255 LOG llevError, $msg;
196 }; 256};
197} 257
258$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "=="
260
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
269 Coro::terminate
270};
198 271
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 282for my $pkg (qw(
210 cf::global cf::attachable 283 cf::global cf::attachable
211 cf::object cf::object::player 284 cf::object cf::object::player
212 cf::client cf::player 285 cf::client cf::player
213 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
214 cf::map cf::party cf::region 288 cf::party cf::region
215)) { 289)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 291}
219 292
220$Event::DIED = sub { 293$EV::DIED = sub {
221 warn "error in event callback: @_"; 294 warn "error in event callback: @_";
222}; 295};
223 296
224############################################################################# 297#############################################################################
225 298
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 322 $d
250 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
251} 324}
252 325
253=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
254 327
255Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
256 329
257=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
258 331
259Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
260 333
261=cut 334=cut
262 335
263our $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
264 337
265sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
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}
267 354
268=item cf::lock_wait $string 355=item cf::lock_wait $string
269 356
270Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
271 358
272=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
273 360
274Wait 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
275a 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,
276for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
277returned. 364returned.
278 365
279Locks 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
280deadlocked coro. 367deadlocked coro.
286 373
287Return 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.
288 375
289=cut 376=cut
290 377
291our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 379
294sub lock_wait($) { 380sub lock_wait($) {
295 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 382}
308 383
309sub lock_acquire($) { 384sub lock_acquire($) {
310 my ($key) = @_; 385 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 386}
324 387
325sub lock_active($) { 388sub lock_active($) {
326 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 390}
330 391
331sub freeze_mainloop { 392sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
333 394
334 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 396}
336 }; 397
337 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
338 $guard 399
400Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer.
402
403=cut
404
405sub periodic($$) {
406 my ($interval, $cb) = @_;
407
408 my $start = rand List::Util::min 180, $interval;
409
410 EV::periodic $start, $interval, 0, $cb
339} 411}
340 412
341=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
342 414
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
383 } 455 }
384 } 456 }
385}; 457};
386 458
387sub get_slot($;$$) { 459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
388 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
389 463
390 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
392 466
406 480
407BEGIN { *async = \&Coro::async_pool } 481BEGIN { *async = \&Coro::async_pool }
408 482
409=item cf::sync_job { BLOCK } 483=item cf::sync_job { BLOCK }
410 484
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 485The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 486is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 487partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 488acceptable.
415 489
416If it must be done, put the blocking parts into C<sync_job>. This will run 490If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 491the given BLOCK in another coroutine while waiting for the result. The
422 496
423sub sync_job(&) { 497sub sync_job(&) {
424 my ($job) = @_; 498 my ($job) = @_;
425 499
426 if ($Coro::current == $Coro::main) { 500 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 501 my $time = EV::time;
428 502
429 # this is the main coro, too bad, we have to block 503 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 504 # till the operation succeeds, freezing the server :/
431 505
432 LOG llevError, Carp::longmess "sync job";#d# 506 LOG llevError, Carp::longmess "sync job";#d#
433 507
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
437 509
438 my $busy = 1; 510 my $busy = 1;
439 my @res; 511 my @res;
440 512
447 519
448 while ($busy) { 520 while ($busy) {
449 if (Coro::nready) { 521 if (Coro::nready) {
450 Coro::cede_notself; 522 Coro::cede_notself;
451 } else { 523 } else {
452 Event::one_event; 524 EV::loop EV::LOOP_ONESHOT;
453 } 525 }
454 } 526 }
455 527
456 $time = Event::time - $time; 528 my $time = EV::time - $time;
457 529
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 530 $TICK_START += $time; # do not account sync jobs to server load
462 531
463 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
464 } else { 533 } else {
465 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
466 535
491=item fork_call { }, $args 560=item fork_call { }, $args
492 561
493Executes the given code block with the given arguments in a seperate 562Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 563process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 564Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 565never block itself or use any form of event handling.
497 566
498=cut 567=cut
499 568
500sub fork_call(&@) { 569sub fork_call(&@) {
501 my ($cb, @args) = @_; 570 my ($cb, @args) = @_;
508 reset_signals; 577 reset_signals;
509 &$cb 578 &$cb
510 }, @args; 579 }, @args;
511 580
512 wantarray ? @res : $res[-1] 581 wantarray ? @res : $res[-1]
582}
583
584=item $coin = coin_from_name $name
585
586=cut
587
588our %coin_alias = (
589 "silver" => "silvercoin",
590 "silvercoin" => "silvercoin",
591 "silvercoins" => "silvercoin",
592 "gold" => "goldcoin",
593 "goldcoin" => "goldcoin",
594 "goldcoins" => "goldcoin",
595 "platinum" => "platinacoin",
596 "platinumcoin" => "platinacoin",
597 "platinumcoins" => "platinacoin",
598 "platina" => "platinacoin",
599 "platinacoin" => "platinacoin",
600 "platinacoins" => "platinacoin",
601 "royalty" => "royalty",
602 "royalties" => "royalty",
603);
604
605sub coin_from_name($) {
606 $coin_alias{$_[0]}
607 ? cf::arch::find $coin_alias{$_[0]}
608 : undef
513} 609}
514 610
515=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
516 612
517Returns a single value from the environment database. 613Returns a single value from the environment database.
656 752
657############################################################################# 753#############################################################################
658 754
659=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
660 756
661Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
662attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
664 760
665In the following description, CLASS can be any of C<global>, C<object> 761In the following description, CLASS can be any of C<global>, C<object>
666C<player>, C<client> or C<map> (i.e. the attachable objects in 762C<player>, C<client> or C<map> (i.e. the attachable objects in
667Crossfire TRT). 763Deliantra).
668 764
669=over 4 765=over 4
670 766
671=item $attachable->attach ($attachment, key => $value...) 767=item $attachable->attach ($attachment, key => $value...)
672 768
716=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
717 813
718Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
719given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
720 816
721Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
722that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
723 819
724These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
725 821
726=over 4 822=over 4
954 } 1050 }
955 1051
956 0 1052 0
957} 1053}
958 1054
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1056
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1057=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1058
963Generate an object-specific event with the given arguments. 1059Generate an object-specific event with the given arguments.
964 1060
1017 1113
1018sub reattach { 1114sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1116 my ($obj) = @_;
1021 1117
1118 # no longer needed after getting rid of delete_package?
1022 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1023 1120
1024 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
1025 1122
1026 @$registry = (); 1123 @$registry = ();
1027 1124
1042cf::attachable->attach ( 1139cf::attachable->attach (
1043 prio => -1000000, 1140 prio => -1000000,
1044 on_instantiate => sub { 1141 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1142 my ($obj, $data) = @_;
1046 1143
1047 $data = from_json $data; 1144 $data = decode_json $data;
1048 1145
1049 for (@$data) { 1146 for (@$data) {
1050 my ($name, $args) = @$_; 1147 my ($name, $args) = @$_;
1051 1148
1052 $obj->attach ($name, %{$args || {} }); 1149 $obj->attach ($name, %{$args || {} });
1073 utf8::decode (my $decname = $filename); 1170 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1076 1173
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1177 if ($cf::USE_FSYNC) {
1178 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;
1179 aio_fsync $fh;
1180 }
1081 close $fh; 1181 aio_close $fh;
1082 1182
1083 if (@$objs) { 1183 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1188 if ($cf::USE_FSYNC) {
1189 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;
1190 aio_fsync $fh;
1191 }
1089 close $fh; 1192 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1194 }
1092 } else { 1195 } else {
1093 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1094 } 1197 }
1095 1198
1096 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1097 } else { 1203 } else {
1098 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1099 } 1205 }
1100 } else { 1206 } else {
1101 aio_unlink $filename; 1207 aio_unlink $filename;
1102 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1103 } 1209 }
1194 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1195 1301
1196 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1197} 1303}
1198 1304
1305use File::Glob ();
1306
1199cf::player->attach ( 1307cf::player->attach (
1200 on_command => sub { 1308 on_command => sub {
1201 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1202 1310
1203 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
1235 1343
1236 cf::override; 1344 cf::override;
1237 }, 1345 },
1238); 1346);
1239 1347
1348# "readahead" all extensions
1349sub cache_extensions {
1350 my $grp = IO::AIO::aio_group;
1351
1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1353 for (grep /\.ext$/, @{$_[0]}) {
1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1355 }
1356 };
1357
1358 $grp
1359}
1360
1240sub load_extensions { 1361sub load_extensions {
1241 cf::sync_job { 1362 cf::sync_job {
1242 my %todo; 1363 my %todo;
1243 1364
1244 for my $path (<$LIBDIR/*.ext>) { 1365 for my $path (<$LIBDIR/*.ext>) {
1263 1384
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1387
1267 $ext{source} = 1388 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1270 . $source 1391 . $source
1271 . "\n};\n1"; 1392 . "\n};\n1";
1272 1393
1273 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
1289 my $msg = $@ ? "$v->{path}: $@\n" 1410 my $msg = $@ ? "$v->{path}: $@\n"
1290 : "$v->{base}: extension inactive.\n"; 1411 : "$v->{base}: extension inactive.\n";
1291 1412
1292 if (exists $v->{meta}{mandatory}) { 1413 if (exists $v->{meta}{mandatory}) {
1293 warn $msg; 1414 warn $msg;
1294 warn "mandatory extension failed to load, exiting.\n"; 1415 cf::cleanup "mandatory extension failed to load, exiting.";
1295 exit 1;
1296 } 1416 }
1297 1417
1298 warn $msg; 1418 warn $msg;
1299 } 1419 }
1300 1420
1314 1434
1315=back 1435=back
1316 1436
1317=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1318 1438
1319Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1320 1440
1321=cut 1441=cut
1322 1442
1323package cf::player; 1443package cf::player;
1324 1444
1367 1487
1368sub exists($) { 1488sub exists($) {
1369 my ($login) = @_; 1489 my ($login) = @_;
1370 1490
1371 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1373} 1493}
1374 1494
1375sub find($) { 1495sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1497 my $login = $_[0];
1389 my $f = new_from_file cf::object::thawer path $login 1509 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1510 or return;
1391 1511
1392 my $pl = cf::player::load_pl $f 1512 my $pl = cf::player::load_pl $f
1393 or return; 1513 or return;
1514
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1515 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1516 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1517 $cf::PLAYER{$login} = $pl
1397 } 1518 }
1398 } 1519 }
1408 1529
1409 return if $pl->{deny_save}; 1530 return if $pl->{deny_save};
1410 1531
1411 aio_mkdir playerdir $pl, 0770; 1532 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1533 $pl->{last_save} = $cf::RUNTIME;
1534
1535 cf::get_slot 0.01;
1413 1536
1414 $pl->save_pl ($path); 1537 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1538 cf::cede_to_tick;
1416} 1539}
1417 1540
1449 my ($pl) = @_; 1572 my ($pl) = @_;
1450 1573
1451 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1452 1575
1453 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1454 $pl->password ("*"); # this should lock out the player until we nuked the dir 1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1455 1578
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1460 1585
1461 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 1626
1502 for my $login (@$dirs) { 1627 for my $login (@$dirs) {
1503 my $path = path $login; 1628 my $path = path $login;
1504 1629
1505 # a .pst is a dead give-away for a valid player 1630 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1631 # if no pst file found, open and chekc for blocked users
1632 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1633 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1634 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1635 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1636 }
1511 1637
1542 } 1668 }
1543 1669
1544 \@paths 1670 \@paths
1545} 1671}
1546 1672
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1674
1549Expand crossfire pod fragments into protocol xml. 1675Expand deliantra pod fragments into protocol xml.
1550
1551=cut
1552
1553sub expand_cfpod {
1554 ((my $self), (local $_)) = @_;
1555
1556 # escape & and <
1557 s/&/&amp;/g;
1558 s/(?<![BIUGHT])</&lt;/g;
1559
1560 # this is buggy, it needs to properly take care of nested <'s
1561
1562 1 while
1563 # replace B<>, I<>, U<> etc.
1564 s/B<([^\>]*)>/<b>$1<\/b>/
1565 || s/I<([^\>]*)>/<i>$1<\/i>/
1566 || s/U<([^\>]*)>/<u>$1<\/u>/
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1568 # replace G<male|female> tags
1569 || s{G<([^>|]*)\|([^>]*)>}{
1570 $self->gender ? $2 : $1
1571 }ge
1572 # replace H<hint text>
1573 || s{H<([^\>]*)>}
1574 {
1575 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1576 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1577 "")
1578 [$self->{hintmode}]
1579 }ge;
1580
1581 # create single paragraphs (very hackish)
1582 s/(?<=\S)\n(?=\w)/ /g;
1583
1584 # compress some whitespace
1585 s/\s+\n/\n/g; # ws line-ends
1586 s/\n\n+/\n/g; # double lines
1587 s/^\n+//; # beginning lines
1588 s/\n+$//; # ending lines
1589
1590 $_
1591}
1592
1593sub hintmode {
1594 $_[0]{hintmode} = $_[1] if @_ > 1;
1595 $_[0]{hintmode}
1596}
1597 1676
1598=item $player->ext_reply ($msgid, @msg) 1677=item $player->ext_reply ($msgid, @msg)
1599 1678
1600Sends an ext reply to the player. 1679Sends an ext reply to the player.
1601 1680
1668our $MAX_RESET = 3600; 1747our $MAX_RESET = 3600;
1669our $DEFAULT_RESET = 3000; 1748our $DEFAULT_RESET = 3000;
1670 1749
1671sub generate_random_map { 1750sub generate_random_map {
1672 my ($self, $rmp) = @_; 1751 my ($self, $rmp) = @_;
1752
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754
1673 # mit "rum" bekleckern, nicht 1755 # mit "rum" bekleckern, nicht
1674 $self->_create_random_map ( 1756 $self->_create_random_map (
1675 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1676 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1677 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1799 1881
1800# the temporary/swap location 1882# the temporary/swap location
1801sub save_path { 1883sub save_path {
1802 my ($self) = @_; 1884 my ($self) = @_;
1803 1885
1804 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1886 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1805 "$TMPDIR/$path.map" 1887 "$TMPDIR/$path.map"
1806} 1888}
1807 1889
1808# the unique path, undef == no special unique path 1890# the unique path, undef == no special unique path
1809sub uniq_path { 1891sub uniq_path {
1810 my ($self) = @_; 1892 my ($self) = @_;
1811 1893
1812 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1813 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1814}
1815
1816# and all this just because we cannot iterate over
1817# all maps in C++...
1818sub change_all_map_light {
1819 my ($change) = @_;
1820
1821 $_->change_map_light ($change)
1822 for grep $_->outdoor, values %cf::MAP;
1823} 1896}
1824 1897
1825sub decay_objects { 1898sub decay_objects {
1826 my ($self) = @_; 1899 my ($self) = @_;
1827 1900
1911sub find { 1984sub find {
1912 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1913 1986
1914 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1915 1988
1916 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1917 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1918 1991
1919 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
1920 my $guard1 = cf::lock_acquire "map_find:$path";
1921 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1922
1923 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
1924 or return; 1994 or return;
1925 1995
1926 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1927 1997
1929 or return; 1999 or return;
1930 2000
1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1932 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
1933 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
1934 undef $guard1; 2005 undef $guard1;
1935 undef $guard2;
1936 $map->reset; 2006 $map->reset;
1937 return find $path; 2007 return find $path;
1938 } 2008 }
1939 2009
1940 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
1967 my $f = new_from_file cf::object::thawer $self->{load_path}; 2037 my $f = new_from_file cf::object::thawer $self->{load_path};
1968 $f->skip_block; 2038 $f->skip_block;
1969 $self->_load_objects ($f) 2039 $self->_load_objects ($f)
1970 or return; 2040 or return;
1971 2041
1972 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
1973 if delete $self->{load_original}; 2043 if delete $self->{load_original};
1974 2044
1975 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
1976 utf8::encode $uniq; 2046 utf8::encode $uniq;
1977 unless (aio_stat $uniq) { 2047 unless (aio_stat $uniq) {
1995 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
1996 $self->decay_objects; 2066 $self->decay_objects;
1997 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
1998 $self->update_buttons; 2068 $self->update_buttons;
1999 cf::cede_to_tick; 2069 cf::cede_to_tick;
2000 $self->set_darkness_map;
2001 cf::cede_to_tick;
2002 $self->activate; 2070 $self->activate;
2003 } 2071 }
2004 2072
2005 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
2006 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
2007 2075
2008 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_ACTIVE);
2009 } 2077 }
2010 2078
2011 $self->post_load; 2079 $self->post_load;
2012} 2080}
2013 2081
2071 my ($path, $origin, $load) = @_; 2139 my ($path, $origin, $load) = @_;
2072 2140
2073 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
2074 2142
2075 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2077 } 2145 }
2078 2146
2079 $MAP_PREFETCH{$path} |= $load; 2147 $MAP_PREFETCH{$path} |= $load;
2080 2148
2081 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2118 cf::async { 2186 cf::async {
2119 $Coro::current->{desc} = "map player save"; 2187 $Coro::current->{desc} = "map player save";
2120 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2121 }; 2189 };
2122 2190
2191 cf::get_slot 0.02;
2192
2123 if ($uniq) { 2193 if ($uniq) {
2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2194 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2125 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2195 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2126 } else { 2196 } else {
2127 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2135 $self->save; 2205 $self->save;
2136 2206
2137 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2207 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138 2208
2139 return if $self->players; 2209 return if $self->players;
2140 return if $self->in_memory != cf::MAP_IN_MEMORY; 2210 return if $self->in_memory != cf::MAP_ACTIVE;
2141 return if $self->{deny_save}; 2211 return if $self->{deny_save};
2142 2212
2143 $self->in_memory (cf::MAP_SWAPPED); 2213 $self->in_memory (cf::MAP_SWAPPED);
2144 2214
2145 $self->deactivate; 2215 $self->deactivate;
2170 2240
2171 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2242
2173 return if $self->players; 2243 return if $self->players;
2174 2244
2175 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2176 2246
2177 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2178 2248
2179 # need to save uniques path 2249 # need to save uniques path
2180 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
2263 2333
2264sub unique_maps() { 2334sub unique_maps() {
2265 [ 2335 [
2266 map { 2336 map {
2267 utf8::decode $_; 2337 utf8::decode $_;
2268 /\.map$/ 2338 s/\.map$//; # TODO future compatibility hack
2339 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2340 ? ()
2269 ? normalise $_ 2341 : normalise $_
2270 : ()
2271 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2272 ] 2343 ]
2273} 2344}
2274 2345
2275package cf; 2346=item cf::map::static_maps
2347
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory). May block.
2350
2351=cut
2352
2353sub static_maps() {
2354 my @dirs = "";
2355 my @maps;
2356
2357 while (@dirs) {
2358 my $dir = shift @dirs;
2359
2360 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2361 or return;
2362
2363 for (@$files) {
2364 s/\.map$// or next;
2365 utf8::decode $_;
2366 push @maps, "$dir/$_";
2367 }
2368
2369 push @dirs, map "$dir/$_", @$dirs;
2370 }
2371
2372 \@maps
2373}
2276 2374
2277=back 2375=back
2278 2376
2279=head3 cf::object 2377=head3 cf::object
2280 2378
2284 2382
2285=over 4 2383=over 4
2286 2384
2287=item $ob->inv_recursive 2385=item $ob->inv_recursive
2288 2386
2289Returns the inventory of the object _and_ their inventories, recursively. 2387Returns the inventory of the object I<and> their inventories, recursively,
2388but I<not> the object itself.
2290 2389
2291=cut 2390=cut
2292 2391
2293sub inv_recursive_; 2392sub inv_recursive_;
2294sub inv_recursive_ { 2393sub inv_recursive_ {
2299 inv_recursive_ inv $_[0] 2398 inv_recursive_ inv $_[0]
2300} 2399}
2301 2400
2302=item $ref = $ob->ref 2401=item $ref = $ob->ref
2303 2402
2304creates and returns a persistent reference to an objetc that can be stored as a string. 2403Creates and returns a persistent reference to an object that can be stored as a string.
2305 2404
2306=item $ob = cf::object::deref ($refstring) 2405=item $ob = cf::object::deref ($refstring)
2307 2406
2308returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2407returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309even if the object actually exists. May block. 2408even if the object actually exists. May block.
2341can be C<undef>. Does the right thing when the player is currently in a 2440can be C<undef>. Does the right thing when the player is currently in a
2342dialogue with the given NPC character. 2441dialogue with the given NPC character.
2343 2442
2344=cut 2443=cut
2345 2444
2445our $SAY_CHANNEL = {
2446 id => "say",
2447 title => "Map",
2448 reply => "say ",
2449 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2450};
2451
2452our $CHAT_CHANNEL = {
2453 id => "chat",
2454 title => "Chat",
2455 reply => "chat ",
2456 tooltip => "Player chat and shouts, global to the server.",
2457};
2458
2346# rough implementation of a future "reply" method that works 2459# rough implementation of a future "reply" method that works
2347# with dialog boxes. 2460# with dialog boxes.
2348#TODO: the first argument must go, split into a $npc->reply_to ( method 2461#TODO: the first argument must go, split into a $npc->reply_to ( method
2349sub cf::object::player::reply($$$;$) { 2462sub cf::object::player::reply($$$;$) {
2350 my ($self, $npc, $msg, $flags) = @_; 2463 my ($self, $npc, $msg, $flags) = @_;
2361 my $dialog = $pl->{npc_dialog}; 2474 my $dialog = $pl->{npc_dialog};
2362 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2475 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2363 2476
2364 } else { 2477 } else {
2365 $msg = $npc->name . " says: $msg" if $npc; 2478 $msg = $npc->name . " says: $msg" if $npc;
2366 $self->message ($msg, $flags); 2479 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2367 } 2480 }
2368 } 2481 }
2369} 2482}
2370 2483
2371=item $object->send_msg ($channel, $msg, $color, [extra...]) 2484=item $object->send_msg ($channel, $msg, $color, [extra...])
2396 2509
2397=item $player_object->enter_link 2510=item $player_object->enter_link
2398 2511
2399Freezes the player and moves him/her to a special map (C<{link}>). 2512Freezes the player and moves him/her to a special map (C<{link}>).
2400 2513
2401The player should be reasonably safe there for short amounts of time. You 2514The player should be reasonably safe there for short amounts of time (e.g.
2402I<MUST> call C<leave_link> as soon as possible, though. 2515for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2516though, as the palyer cannot control the character while it is on the link
2517map.
2403 2518
2404Will never block. 2519Will never block.
2405 2520
2406=item $player_object->leave_link ($map, $x, $y) 2521=item $player_object->leave_link ($map, $x, $y)
2407 2522
2465 2580
2466 $map->load; 2581 $map->load;
2467 $map->load_neighbours; 2582 $map->load_neighbours;
2468 2583
2469 return unless $self->contr->active; 2584 return unless $self->contr->active;
2470 $self->activate_recursive;
2471 2585
2472 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2586 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2473 $self->enter_map ($map, $x, $y); 2587 $self->enter_map ($map, $x, $y);
2588
2589 # only activate afterwards, to support waiting in hooks
2590 $self->activate_recursive;
2474} 2591}
2475 2592
2476=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2593=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2477 2594
2478Moves the player to the given map-path and coordinates by first freezing 2595Moves the player to the given map-path and coordinates by first freezing
2479her, loading and preparing them map, calling the provided $check callback 2596her, loading and preparing them map, calling the provided $check callback
2480that has to return the map if sucecssful, and then unfreezes the player on 2597that has to return the map if sucecssful, and then unfreezes the player on
2481the new (success) or old (failed) map position. In either case, $done will 2598the new (success) or old (failed) map position. In either case, $done will
2482be called at the end of this process. 2599be called at the end of this process.
2600
2601Note that $check will be called with a potentially non-loaded map, so if
2602it needs a loaded map it has to call C<< ->load >>.
2483 2603
2484=cut 2604=cut
2485 2605
2486our $GOTOGEN; 2606our $GOTOGEN;
2487 2607
2566} 2686}
2567 2687
2568sub prepare_random_map { 2688sub prepare_random_map {
2569 my ($exit) = @_; 2689 my ($exit) = @_;
2570 2690
2571 my $guard = cf::lock_acquire "exit_prepare:$exit";
2572
2573 # all this does is basically replace the /! path by 2691 # all this does is basically replace the /! path by
2574 # a new random map path (?random/...) with a seed 2692 # a new random map path (?random/...) with a seed
2575 # that depends on the exit object 2693 # that depends on the exit object
2576 2694
2577 my $rmp = parse_random_map_params $exit->msg; 2695 my $rmp = parse_random_map_params $exit->msg;
2579 if ($exit->map) { 2697 if ($exit->map) {
2580 $rmp->{region} = $exit->region->name; 2698 $rmp->{region} = $exit->region->name;
2581 $rmp->{origin_map} = $exit->map->path; 2699 $rmp->{origin_map} = $exit->map->path;
2582 $rmp->{origin_x} = $exit->x; 2700 $rmp->{origin_x} = $exit->x;
2583 $rmp->{origin_y} = $exit->y; 2701 $rmp->{origin_y} = $exit->y;
2702
2703 $exit->map->touch;
2584 } 2704 }
2585 2705
2586 $rmp->{random_seed} ||= $exit->random_seed; 2706 $rmp->{random_seed} ||= $exit->random_seed;
2587 2707
2588 my $data = cf::to_json $rmp; 2708 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2589 my $md5 = Digest::MD5::md5_hex $data; 2709 my $md5 = Digest::MD5::md5_hex $data;
2590 my $meta = "$RANDOMDIR/$md5.meta"; 2710 my $meta = "$RANDOMDIR/$md5.meta";
2591 2711
2592 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2712 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2593 aio_write $fh, 0, (length $data), $data, 0; 2713 aio_write $fh, 0, (length $data), $data, 0;
2594 undef $fh; 2714 undef $fh;
2595 aio_rename "$meta~", $meta; 2715 aio_rename "$meta~", $meta;
2596 2716
2717 my $slaying = "?random/$md5";
2718
2719 if ($exit->valid) {
2597 $exit->slaying ("?random/$md5"); 2720 $exit->slaying ("?random/$md5");
2598 $exit->msg (undef); 2721 $exit->msg (undef);
2722 }
2599 } 2723 }
2600} 2724}
2601 2725
2602sub cf::object::player::enter_exit { 2726sub cf::object::player::enter_exit {
2603 my ($self, $exit) = @_; 2727 my ($self, $exit) = @_;
2604 2728
2605 return unless $self->type == cf::PLAYER; 2729 return unless $self->type == cf::PLAYER;
2606 2730
2607 if ($exit->slaying eq "/!") {
2608 #TODO: this should de-fi-ni-te-ly not be a sync-job
2609 # the problem is that $exit might not survive long enough
2610 # so it needs to be done right now, right here
2611 cf::sync_job { prepare_random_map $exit };
2612 }
2613
2614 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2615 my $hp = $exit->stats->hp;
2616 my $sp = $exit->stats->sp;
2617
2618 $self->enter_link; 2731 $self->enter_link;
2619 2732
2620 # if exit is damned, update players death & WoR home-position
2621 $self->contr->savebed ($slaying, $hp, $sp)
2622 if $exit->flag (FLAG_DAMNED);
2623
2624 (async { 2733 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2734 $Coro::current->{desc} = "enter_exit";
2626 2735
2627 $self->deactivate_recursive; # just to be sure
2628 unless (eval { 2736 unless (eval {
2737 $self->deactivate_recursive; # just to be sure
2738
2739 # random map handling
2740 {
2741 my $guard = cf::lock_acquire "exit_prepare:$exit";
2742
2743 prepare_random_map $exit
2744 if $exit->slaying eq "/!";
2745 }
2746
2747 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2748 my $x = $exit->stats->hp;
2749 my $y = $exit->stats->sp;
2750
2629 $self->goto ($slaying, $hp, $sp); 2751 $self->goto ($map, $x, $y);
2630 2752
2753 # if exit is damned, update players death & WoR home-position
2754 $self->contr->savebed ($map, $x, $y)
2755 if $exit->flag (cf::FLAG_DAMNED);
2756
2631 1; 2757 1
2632 }) { 2758 }) {
2633 $self->message ("Something went wrong deep within the crossfire server. " 2759 $self->message ("Something went wrong deep within the deliantra server. "
2634 . "I'll try to bring you back to the map you were before. " 2760 . "I'll try to bring you back to the map you were before. "
2635 . "Please report this to the dungeon master!", 2761 . "Please report this to the dungeon master!",
2636 cf::NDI_UNIQUE | cf::NDI_RED); 2762 cf::NDI_UNIQUE | cf::NDI_RED);
2637 2763
2638 warn "ERROR in enter_exit: $@"; 2764 warn "ERROR in enter_exit: $@";
2666the message, with C<log> being the default. If C<$color> is negative, suppress 2792the message, with C<log> being the default. If C<$color> is negative, suppress
2667the message unless the client supports the msg packet. 2793the message unless the client supports the msg packet.
2668 2794
2669=cut 2795=cut
2670 2796
2797# non-persistent channels (usually the info channel)
2671our %CHANNEL = ( 2798our %CHANNEL = (
2799 "c/motd" => {
2800 id => "infobox",
2801 title => "MOTD",
2802 reply => undef,
2803 tooltip => "The message of the day",
2804 },
2672 "c/identify" => { 2805 "c/identify" => {
2673 id => "infobox", 2806 id => "infobox",
2674 title => "Identify", 2807 title => "Identify",
2675 reply => undef, 2808 reply => undef,
2676 tooltip => "Items recently identified", 2809 tooltip => "Items recently identified",
2679 id => "infobox", 2812 id => "infobox",
2680 title => "Examine", 2813 title => "Examine",
2681 reply => undef, 2814 reply => undef,
2682 tooltip => "Signs and other items you examined", 2815 tooltip => "Signs and other items you examined",
2683 }, 2816 },
2817 "c/shopinfo" => {
2818 id => "infobox",
2819 title => "Shop Info",
2820 reply => undef,
2821 tooltip => "What your bargaining skill tells you about the shop",
2822 },
2823 "c/book" => {
2824 id => "infobox",
2825 title => "Book",
2826 reply => undef,
2827 tooltip => "The contents of a note or book",
2828 },
2684 "c/lookat" => { 2829 "c/lookat" => {
2685 id => "infobox", 2830 id => "infobox",
2686 title => "Look", 2831 title => "Look",
2687 reply => undef, 2832 reply => undef,
2688 tooltip => "What you saw there", 2833 tooltip => "What you saw there",
2689 }, 2834 },
2835 "c/who" => {
2836 id => "infobox",
2837 title => "Players",
2838 reply => undef,
2839 tooltip => "Shows players who are currently online",
2840 },
2841 "c/body" => {
2842 id => "infobox",
2843 title => "Body Parts",
2844 reply => undef,
2845 tooltip => "Shows which body parts you posess and are available",
2846 },
2847 "c/statistics" => {
2848 id => "infobox",
2849 title => "Statistics",
2850 reply => undef,
2851 tooltip => "Shows your primary statistics",
2852 },
2853 "c/skills" => {
2854 id => "infobox",
2855 title => "Skills",
2856 reply => undef,
2857 tooltip => "Shows your experience per skill and item power",
2858 },
2859 "c/shopitems" => {
2860 id => "infobox",
2861 title => "Shop Items",
2862 reply => undef,
2863 tooltip => "Shows the items currently for sale in this shop",
2864 },
2865 "c/resistances" => {
2866 id => "infobox",
2867 title => "Resistances",
2868 reply => undef,
2869 tooltip => "Shows your resistances",
2870 },
2871 "c/pets" => {
2872 id => "infobox",
2873 title => "Pets",
2874 reply => undef,
2875 tooltip => "Shows information abotu your pets/a specific pet",
2876 },
2877 "c/perceiveself" => {
2878 id => "infobox",
2879 title => "Perceive Self",
2880 reply => undef,
2881 tooltip => "You gained detailed knowledge about yourself",
2882 },
2883 "c/uptime" => {
2884 id => "infobox",
2885 title => "Uptime",
2886 reply => undef,
2887 tooltip => "How long the server has been running since last restart",
2888 },
2889 "c/mapinfo" => {
2890 id => "infobox",
2891 title => "Map Info",
2892 reply => undef,
2893 tooltip => "Information related to the maps",
2894 },
2895 "c/party" => {
2896 id => "party",
2897 title => "Party",
2898 reply => "gsay ",
2899 tooltip => "Messages and chat related to your party",
2900 },
2901 "c/death" => {
2902 id => "death",
2903 title => "Death",
2904 reply => undef,
2905 tooltip => "Reason for and more info about your most recent death",
2906 },
2907 "c/say" => $SAY_CHANNEL,
2908 "c/chat" => $CHAT_CHANNEL,
2690); 2909);
2691 2910
2692sub cf::client::send_msg { 2911sub cf::client::send_msg {
2693 my ($self, $channel, $msg, $color, @extra) = @_; 2912 my ($self, $channel, $msg, $color, @extra) = @_;
2694 2913
2695 $msg = $self->pl->expand_cfpod ($msg); 2914 $msg = $self->pl->expand_cfpod ($msg)
2915 unless $color & cf::NDI_VERBATIM;
2696 2916
2697 $color &= cf::NDI_CLIENT_MASK; # just in case... 2917 $color &= cf::NDI_CLIENT_MASK; # just in case...
2698 2918
2699 # check predefined channels, for the benefit of C 2919 # check predefined channels, for the benefit of C
2700 if ($CHANNEL{$channel}) { 2920 if ($CHANNEL{$channel}) {
2701 $channel = $CHANNEL{$channel}; 2921 $channel = $CHANNEL{$channel};
2702 2922
2703 $self->ext_msg (channel_info => $channel) 2923 $self->ext_msg (channel_info => $channel);
2704 if $self->can_msg;
2705
2706 $channel = $channel->{id}; 2924 $channel = $channel->{id};
2707 2925
2708 } elsif (ref $channel) { 2926 } elsif (ref $channel) {
2709 # send meta info to client, if not yet sent 2927 # send meta info to client, if not yet sent
2710 unless (exists $self->{channel}{$channel->{id}}) { 2928 unless (exists $self->{channel}{$channel->{id}}) {
2711 $self->{channel}{$channel->{id}} = $channel; 2929 $self->{channel}{$channel->{id}} = $channel;
2712 $self->ext_msg (channel_info => $channel) 2930 $self->ext_msg (channel_info => $channel);
2713 if $self->can_msg;
2714 } 2931 }
2715 2932
2716 $channel = $channel->{id}; 2933 $channel = $channel->{id};
2717 } 2934 }
2718 2935
2719 return unless @extra || length $msg; 2936 return unless @extra || length $msg;
2720 2937
2721 if ($self->can_msg) {
2722 # default colour, mask it out 2938 # default colour, mask it out
2723 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2939 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2724 if $color & cf::NDI_DEF; 2940 if $color & cf::NDI_DEF;
2725 2941
2726 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2942 my $pkt = "msg "
2943 . $self->{json_coder}->encode (
2727 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2944 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2728 } else { 2945 );
2729 if ($color >= 0) {
2730 # replace some tags by gcfclient-compatible ones
2731 for ($msg) {
2732 1 while
2733 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2734 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2735 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2736 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2737 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2738 }
2739 2946
2740 $color &= cf::NDI_COLOR_MASK; 2947 # try lzf for large packets
2948 $pkt = "lzf " . Compress::LZF::compress $pkt
2949 if 1024 <= length $pkt and $self->{can_lzf};
2741 2950
2742 utf8::encode $msg; 2951 # split very large packets
2743 2952 if (8192 < length $pkt and $self->{can_lzf}) {
2744 if (0 && $msg =~ /\[/) { 2953 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2745 # COMMAND/INFO 2954 $pkt = "frag";
2746 $self->send_packet ("drawextinfo $color 10 8 $msg")
2747 } else {
2748 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2749 $self->send_packet ("drawinfo $color $msg")
2750 }
2751 }
2752 } 2955 }
2956
2957 $self->send_packet ($pkt);
2753} 2958}
2754 2959
2755=item $client->ext_msg ($type, @msg) 2960=item $client->ext_msg ($type, @msg)
2756 2961
2757Sends an ext event to the client. 2962Sends an ext event to the client.
2931 3136
2932The following functions and methods are available within a safe environment: 3137The following functions and methods are available within a safe environment:
2933 3138
2934 cf::object 3139 cf::object
2935 contr pay_amount pay_player map x y force_find force_add destroy 3140 contr pay_amount pay_player map x y force_find force_add destroy
2936 insert remove name archname title slaying race decrease_ob_nr 3141 insert remove name archname title slaying race decrease split
3142 value
2937 3143
2938 cf::object::player 3144 cf::object::player
2939 player 3145 player
2940 3146
2941 cf::player 3147 cf::player
2946 3152
2947=cut 3153=cut
2948 3154
2949for ( 3155for (
2950 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3156 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2951 insert remove inv name archname title slaying race 3157 insert remove inv nrof name archname title slaying race
2952 decrease_ob_nr destroy)], 3158 decrease split destroy change_exp value msg lore send_msg)],
2953 ["cf::object::player" => qw(player)], 3159 ["cf::object::player" => qw(player)],
2954 ["cf::player" => qw(peaceful)], 3160 ["cf::player" => qw(peaceful send_msg)],
2955 ["cf::map" => qw(trigger)], 3161 ["cf::map" => qw(trigger)],
2956) { 3162) {
2957 no strict 'refs'; 3163 no strict 'refs';
2958 my ($pkg, @funs) = @$_; 3164 my ($pkg, @funs) = @$_;
2959 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3165 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2976 my ($code, %vars) = @_; 3182 my ($code, %vars) = @_;
2977 3183
2978 my $qcode = $code; 3184 my $qcode = $code;
2979 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3185 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2980 $qcode =~ s/\n/\\n/g; 3186 $qcode =~ s/\n/\\n/g;
3187
3188 %vars = (_dummy => 0) unless %vars;
2981 3189
2982 local $_; 3190 local $_;
2983 local @safe::cf::_safe_eval_args = values %vars; 3191 local @safe::cf::_safe_eval_args = values %vars;
2984 3192
2985 my $eval = 3193 my $eval =
3062 { 3270 {
3063 my $faces = $facedata->{faceinfo}; 3271 my $faces = $facedata->{faceinfo};
3064 3272
3065 while (my ($face, $info) = each %$faces) { 3273 while (my ($face, $info) = each %$faces) {
3066 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3274 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3275
3067 cf::face::set_visibility $idx, $info->{visibility}; 3276 cf::face::set_visibility $idx, $info->{visibility};
3068 cf::face::set_magicmap $idx, $info->{magicmap}; 3277 cf::face::set_magicmap $idx, $info->{magicmap};
3069 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3278 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3070 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3279 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3071 3280
3072 cf::cede_to_tick; 3281 cf::cede_to_tick;
3073 } 3282 }
3074 3283
3075 while (my ($face, $info) = each %$faces) { 3284 while (my ($face, $info) = each %$faces) {
3076 next unless $info->{smooth}; 3285 next unless $info->{smooth};
3286
3077 my $idx = cf::face::find $face 3287 my $idx = cf::face::find $face
3078 or next; 3288 or next;
3289
3079 if (my $smooth = cf::face::find $info->{smooth}) { 3290 if (my $smooth = cf::face::find $info->{smooth}) {
3080 cf::face::set_smooth $idx, $smooth; 3291 cf::face::set_smooth $idx, $smooth;
3081 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3292 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3082 } else { 3293 } else {
3083 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3294 warn "smooth face '$info->{smooth}' not found for face '$face'";
3101 { 3312 {
3102 # TODO: for gcfclient pleasure, we should give resources 3313 # TODO: for gcfclient pleasure, we should give resources
3103 # that gcfclient doesn't grok a >10000 face index. 3314 # that gcfclient doesn't grok a >10000 face index.
3104 my $res = $facedata->{resource}; 3315 my $res = $facedata->{resource};
3105 3316
3106 my $soundconf = delete $res->{"res/sound.conf"};
3107
3108 while (my ($name, $info) = each %$res) { 3317 while (my ($name, $info) = each %$res) {
3318 if (defined $info->{type}) {
3109 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3319 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3110 my $data; 3320 my $data;
3111 3321
3112 if ($info->{type} & 1) { 3322 if ($info->{type} & 1) {
3113 # prepend meta info 3323 # prepend meta info
3114 3324
3115 my $meta = $enc->encode ({ 3325 my $meta = $enc->encode ({
3116 name => $name, 3326 name => $name,
3117 %{ $info->{meta} || {} }, 3327 %{ $info->{meta} || {} },
3118 }); 3328 });
3119 3329
3120 $data = pack "(w/a*)*", $meta, $info->{data}; 3330 $data = pack "(w/a*)*", $meta, $info->{data};
3331 } else {
3332 $data = $info->{data};
3333 }
3334
3335 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3336 cf::face::set_type $idx, $info->{type};
3121 } else { 3337 } else {
3122 $data = $info->{data}; 3338 $RESOURCE{$name} = $info;
3123 } 3339 }
3124 3340
3125 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3126 cf::face::set_type $idx, $info->{type};
3127
3128 cf::cede_to_tick; 3341 cf::cede_to_tick;
3129 } 3342 }
3130
3131 if ($soundconf) {
3132 $soundconf = $enc->decode (delete $soundconf->{data});
3133
3134 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3135 my $sound = $soundconf->{compat}[$_]
3136 or next;
3137
3138 my $face = cf::face::find "sound/$sound->[1]";
3139 cf::sound::set $sound->[0] => $face;
3140 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3141 }
3142
3143 while (my ($k, $v) = each %{$soundconf->{event}}) {
3144 my $face = cf::face::find "sound/$v";
3145 cf::sound::set $k => $face;
3146 }
3147 }
3148 } 3343 }
3344
3345 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3149 3346
3150 1 3347 1
3151} 3348}
3349
3350cf::global->attach (on_resource_update => sub {
3351 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3352 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3353
3354 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3355 my $sound = $soundconf->{compat}[$_]
3356 or next;
3357
3358 my $face = cf::face::find "sound/$sound->[1]";
3359 cf::sound::set $sound->[0] => $face;
3360 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3361 }
3362
3363 while (my ($k, $v) = each %{$soundconf->{event}}) {
3364 my $face = cf::face::find "sound/$v";
3365 cf::sound::set $k => $face;
3366 }
3367 }
3368});
3152 3369
3153register_exticmd fx_want => sub { 3370register_exticmd fx_want => sub {
3154 my ($ns, $want) = @_; 3371 my ($ns, $want) = @_;
3155 3372
3156 while (my ($k, $v) = each %$want) { 3373 while (my ($k, $v) = each %$want) {
3157 $ns->fx_want ($k, $v); 3374 $ns->fx_want ($k, $v);
3158 } 3375 }
3159}; 3376};
3377
3378sub load_resource_file($) {
3379 my $guard = lock_acquire "load_resource_file";
3380
3381 my $status = load_resource_file_ $_[0];
3382 get_slot 0.1, 100;
3383 cf::arch::commit_load;
3384
3385 $status
3386}
3160 3387
3161sub reload_regions { 3388sub reload_regions {
3162 # HACK to clear player env face cache, we need some signal framework 3389 # HACK to clear player env face cache, we need some signal framework
3163 # for this (global event?) 3390 # for this (global event?)
3164 %ext::player_env::MUSIC_FACE_CACHE = (); 3391 %ext::player_env::MUSIC_FACE_CACHE = ();
3178} 3405}
3179 3406
3180sub reload_archetypes { 3407sub reload_archetypes {
3181 load_resource_file "$DATADIR/archetypes" 3408 load_resource_file "$DATADIR/archetypes"
3182 or die "unable to load archetypes\n"; 3409 or die "unable to load archetypes\n";
3183 #d# NEED to laod twice to resolve forward references
3184 # this really needs to be done in an extra post-pass
3185 # (which needs to be synchronous, so solve it differently)
3186 load_resource_file "$DATADIR/archetypes"
3187 or die "unable to load archetypes\n";
3188} 3410}
3189 3411
3190sub reload_treasures { 3412sub reload_treasures {
3191 load_resource_file "$DATADIR/treasures" 3413 load_resource_file "$DATADIR/treasures"
3192 or die "unable to load treasurelists\n"; 3414 or die "unable to load treasurelists\n";
3193} 3415}
3194 3416
3195sub reload_resources { 3417sub reload_resources {
3196 warn "reloading resource files...\n"; 3418 warn "reloading resource files...\n";
3197 3419
3420 reload_facedata;
3421 reload_archetypes;
3198 reload_regions; 3422 reload_regions;
3199 reload_facedata;
3200 #reload_archetypes;#d#
3201 reload_archetypes;
3202 reload_treasures; 3423 reload_treasures;
3203 3424
3204 warn "finished reloading resource files\n"; 3425 warn "finished reloading resource files\n";
3205} 3426}
3206 3427
3207sub init {
3208 reload_resources;
3209}
3210
3211sub reload_config { 3428sub reload_config {
3429 warn "reloading config file...\n";
3430
3212 open my $fh, "<:utf8", "$CONFDIR/config" 3431 open my $fh, "<:utf8", "$CONFDIR/config"
3213 or return; 3432 or return;
3214 3433
3215 local $/; 3434 local $/;
3216 *CFG = YAML::Syck::Load <$fh>; 3435 *CFG = YAML::XS::Load scalar <$fh>;
3217 3436
3218 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3437 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3219 3438
3220 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3439 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3221 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3440 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3225 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3444 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3226 and die "WARNING: m(un)lockall failed: $!\n"; 3445 and die "WARNING: m(un)lockall failed: $!\n";
3227 }; 3446 };
3228 warn $@ if $@; 3447 warn $@ if $@;
3229 } 3448 }
3449
3450 warn "finished reloading resource files\n";
3451}
3452
3453sub pidfile() {
3454 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3455 or die "$PIDFILE: $!";
3456 flock $fh, &Fcntl::LOCK_EX
3457 or die "$PIDFILE: flock: $!";
3458 $fh
3459}
3460
3461# make sure only one server instance is running at any one time
3462sub atomic {
3463 my $fh = pidfile;
3464
3465 my $pid = <$fh>;
3466 kill 9, $pid if $pid > 0;
3467
3468 seek $fh, 0, 0;
3469 print $fh $$;
3470}
3471
3472sub main_loop {
3473 warn "EV::loop starting\n";
3474 if (1) {
3475 EV::loop;
3476 }
3477 warn "EV::loop returned\n";
3478 goto &main_loop unless $REALLY_UNLOOP;
3230} 3479}
3231 3480
3232sub main { 3481sub main {
3482 cf::init_globals; # initialise logging
3483
3484 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3485 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3486 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3487 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3488
3489 cf::init_experience;
3490 cf::init_anim;
3491 cf::init_attackmess;
3492 cf::init_dynamic;
3493
3494 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3495
3233 # we must not ever block the main coroutine 3496 # we must not ever block the main coroutine
3234 local $Coro::idle = sub { 3497 local $Coro::idle = sub {
3235 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3498 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3236 (async { 3499 (async {
3237 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3500 $Coro::current->{desc} = "IDLE BUG HANDLER";
3238 Event::one_event; 3501 EV::loop EV::LOOP_ONESHOT;
3239 })->prio (Coro::PRIO_MAX); 3502 })->prio (Coro::PRIO_MAX);
3240 }; 3503 };
3241 3504
3505 evthread_start IO::AIO::poll_fileno;
3506
3507 cf::sync_job {
3508 reload_resources;
3242 reload_config; 3509 reload_config;
3243 db_init; 3510 db_init;
3511
3512 cf::load_settings;
3513 cf::load_materials;
3514 cf::init_uuid;
3515 cf::init_signals;
3516 cf::init_commands;
3517 cf::init_skills;
3518
3519 cf::init_beforeplay;
3520
3521 atomic;
3522
3244 load_extensions; 3523 load_extensions;
3245 3524
3246 $TICK_WATCHER->start; 3525 utime time, time, $RUNTIMEFILE;
3247 Event::loop; 3526
3527 # no (long-running) fork's whatsoever before this point(!)
3528 use POSIX ();
3529 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3530
3531 (pop @POST_INIT)->(0) while @POST_INIT;
3532 };
3533
3534 main_loop;
3248} 3535}
3249 3536
3250############################################################################# 3537#############################################################################
3251# initialisation and cleanup 3538# initialisation and cleanup
3252 3539
3253# install some emergency cleanup handlers 3540# install some emergency cleanup handlers
3254BEGIN { 3541BEGIN {
3542 our %SIGWATCHER = ();
3255 for my $signal (qw(INT HUP TERM)) { 3543 for my $signal (qw(INT HUP TERM)) {
3256 Event->signal ( 3544 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3257 reentrant => 0,
3258 data => WF_AUTOCANCEL,
3259 signal => $signal,
3260 prio => 0,
3261 cb => sub {
3262 cf::cleanup "SIG$signal"; 3545 cf::cleanup "SIG$signal";
3263 },
3264 ); 3546 };
3265 } 3547 }
3266} 3548}
3267 3549
3268sub write_runtime { 3550sub write_runtime_sync {
3269 my $runtime = "$LOCALDIR/runtime";
3270
3271 # first touch the runtime file to show we are still running: 3551 # first touch the runtime file to show we are still running:
3272 # the fsync below can take a very very long time. 3552 # the fsync below can take a very very long time.
3273 3553
3274 IO::AIO::aio_utime $runtime, undef, undef; 3554 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3275 3555
3276 my $guard = cf::lock_acquire "write_runtime"; 3556 my $guard = cf::lock_acquire "write_runtime";
3277 3557
3278 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3558 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3279 or return; 3559 or return;
3280 3560
3281 my $value = $cf::RUNTIME + 90 + 10; 3561 my $value = $cf::RUNTIME + 90 + 10;
3282 # 10 is the runtime save interval, for a monotonic clock 3562 # 10 is the runtime save interval, for a monotonic clock
3283 # 60 allows for the watchdog to kill the server. 3563 # 60 allows for the watchdog to kill the server.
3293 aio_utime $fh, undef, undef; 3573 aio_utime $fh, undef, undef;
3294 3574
3295 close $fh 3575 close $fh
3296 or return; 3576 or return;
3297 3577
3298 aio_rename "$runtime~", $runtime 3578 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3299 and return; 3579 and return;
3300 3580
3301 warn "runtime file written.\n"; 3581 warn "runtime file written.\n";
3302 3582
3303 1 3583 1
3584}
3585
3586our $uuid_lock;
3587our $uuid_skip;
3588
3589sub write_uuid_sync($) {
3590 $uuid_skip ||= $_[0];
3591
3592 return if $uuid_lock;
3593 local $uuid_lock = 1;
3594
3595 my $uuid = "$LOCALDIR/uuid";
3596
3597 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3598 or return;
3599
3600 my $value = uuid_seq uuid_cur;
3601
3602 unless ($value) {
3603 warn "cowardly refusing to write zero uuid value!\n";
3604 return;
3605 }
3606
3607 my $value = uuid_str $value + $uuid_skip;
3608 $uuid_skip = 0;
3609
3610 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3611 and return;
3612
3613 # always fsync - this file is important
3614 aio_fsync $fh
3615 and return;
3616
3617 close $fh
3618 or return;
3619
3620 aio_rename "$uuid~", $uuid
3621 and return;
3622
3623 warn "uuid file written ($value).\n";
3624
3625 1
3626
3627}
3628
3629sub write_uuid($$) {
3630 my ($skip, $sync) = @_;
3631
3632 $sync ? write_uuid_sync $skip
3633 : async { write_uuid_sync $skip };
3304} 3634}
3305 3635
3306sub emergency_save() { 3636sub emergency_save() {
3307 my $freeze_guard = cf::freeze_mainloop; 3637 my $freeze_guard = cf::freeze_mainloop;
3308 3638
3309 warn "enter emergency perl save\n"; 3639 warn "emergency_perl_save: enter\n";
3310 3640
3311 cf::sync_job { 3641 cf::sync_job {
3642 # this is a trade-off: we want to be very quick here, so
3643 # save all maps without fsync, and later call a global sync
3644 # (which in turn might be very very slow)
3645 local $USE_FSYNC = 0;
3646
3312 # use a peculiar iteration method to avoid tripping on perl 3647 # use a peculiar iteration method to avoid tripping on perl
3313 # refcount bugs in for. also avoids problems with players 3648 # refcount bugs in for. also avoids problems with players
3314 # and maps saved/destroyed asynchronously. 3649 # and maps saved/destroyed asynchronously.
3315 warn "begin emergency player save\n"; 3650 warn "emergency_perl_save: begin player save\n";
3316 for my $login (keys %cf::PLAYER) { 3651 for my $login (keys %cf::PLAYER) {
3317 my $pl = $cf::PLAYER{$login} or next; 3652 my $pl = $cf::PLAYER{$login} or next;
3318 $pl->valid or next; 3653 $pl->valid or next;
3319 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3654 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3320 $pl->save; 3655 $pl->save;
3321 } 3656 }
3322 warn "end emergency player save\n"; 3657 warn "emergency_perl_save: end player save\n";
3323 3658
3324 warn "begin emergency map save\n"; 3659 warn "emergency_perl_save: begin map save\n";
3325 for my $path (keys %cf::MAP) { 3660 for my $path (keys %cf::MAP) {
3326 my $map = $cf::MAP{$path} or next; 3661 my $map = $cf::MAP{$path} or next;
3327 $map->valid or next; 3662 $map->valid or next;
3328 $map->save; 3663 $map->save;
3329 } 3664 }
3330 warn "end emergency map save\n"; 3665 warn "emergency_perl_save: end map save\n";
3331 3666
3332 warn "begin emergency database checkpoint\n"; 3667 warn "emergency_perl_save: begin database checkpoint\n";
3333 BDB::db_env_txn_checkpoint $DB_ENV; 3668 BDB::db_env_txn_checkpoint $DB_ENV;
3334 warn "end emergency database checkpoint\n"; 3669 warn "emergency_perl_save: end database checkpoint\n";
3670
3671 warn "emergency_perl_save: begin write uuid\n";
3672 write_uuid_sync 1;
3673 warn "emergency_perl_save: end write uuid\n";
3335 }; 3674 };
3336 3675
3676 warn "emergency_perl_save: starting sync()\n";
3677 IO::AIO::aio_sync sub {
3678 warn "emergency_perl_save: finished sync()\n";
3679 };
3680
3337 warn "leave emergency perl save\n"; 3681 warn "emergency_perl_save: leave\n";
3338} 3682}
3339 3683
3340sub post_cleanup { 3684sub post_cleanup {
3341 my ($make_core) = @_; 3685 my ($make_core) = @_;
3342 3686
3343 warn Carp::longmess "post_cleanup backtrace" 3687 warn Carp::longmess "post_cleanup backtrace"
3344 if $make_core; 3688 if $make_core;
3689
3690 my $fh = pidfile;
3691 unlink $PIDFILE if <$fh> == $$;
3692}
3693
3694# a safer delete_package, copied from Symbol
3695sub clear_package($) {
3696 my $pkg = shift;
3697
3698 # expand to full symbol table name if needed
3699 unless ($pkg =~ /^main::.*::$/) {
3700 $pkg = "main$pkg" if $pkg =~ /^::/;
3701 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3702 $pkg .= '::' unless $pkg =~ /::$/;
3703 }
3704
3705 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3706 my $stem_symtab = *{$stem}{HASH};
3707
3708 defined $stem_symtab and exists $stem_symtab->{$leaf}
3709 or return;
3710
3711 # clear all symbols
3712 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3713 for my $name (keys %$leaf_symtab) {
3714 _gv_clear *{"$pkg$name"};
3715# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3716 }
3717 warn "cleared package $pkg\n";#d#
3345} 3718}
3346 3719
3347sub do_reload_perl() { 3720sub do_reload_perl() {
3348 # can/must only be called in main 3721 # can/must only be called in main
3349 if ($Coro::current != $Coro::main) { 3722 if ($Coro::current != $Coro::main) {
3350 warn "can only reload from main coroutine"; 3723 warn "can only reload from main coroutine";
3351 return; 3724 return;
3352 } 3725 }
3353 3726
3727 return if $RELOAD++;
3728
3729 my $t1 = EV::time;
3730
3731 while ($RELOAD) {
3354 warn "reloading..."; 3732 warn "reloading...";
3355 3733
3356 warn "entering sync_job"; 3734 warn "entering sync_job";
3357 3735
3358 cf::sync_job { 3736 cf::sync_job {
3359 cf::write_runtime; # external watchdog should not bark 3737 cf::write_runtime_sync; # external watchdog should not bark
3360 cf::emergency_save; 3738 cf::emergency_save;
3361 cf::write_runtime; # external watchdog should not bark 3739 cf::write_runtime_sync; # external watchdog should not bark
3362 3740
3363 warn "syncing database to disk"; 3741 warn "syncing database to disk";
3364 BDB::db_env_txn_checkpoint $DB_ENV; 3742 BDB::db_env_txn_checkpoint $DB_ENV;
3365 3743
3366 # if anything goes wrong in here, we should simply crash as we already saved 3744 # if anything goes wrong in here, we should simply crash as we already saved
3367 3745
3368 warn "cancelling all WF_AUTOCANCEL watchers";
3369 for (Event::all_watchers) {
3370 $_->cancel if $_->data & WF_AUTOCANCEL;
3371 }
3372
3373 warn "flushing outstanding aio requests"; 3746 warn "flushing outstanding aio requests";
3374 for (;;) {
3375 BDB::flush;
3376 IO::AIO::flush;
3377 Coro::cede_notself;
3378 last unless IO::AIO::nreqs || BDB::nreqs; 3747 while (IO::AIO::nreqs || BDB::nreqs) {
3379 warn "iterate..."; 3748 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3380 }
3381
3382 ++$RELOAD;
3383
3384 warn "cancelling all extension coros";
3385 $_->cancel for values %EXT_CORO;
3386 %EXT_CORO = ();
3387
3388 warn "removing commands";
3389 %COMMAND = ();
3390
3391 warn "removing ext/exti commands";
3392 %EXTCMD = ();
3393 %EXTICMD = ();
3394
3395 warn "unloading/nuking all extensions";
3396 for my $pkg (@EXTS) {
3397 warn "... unloading $pkg";
3398
3399 if (my $cb = $pkg->can ("unload")) {
3400 eval {
3401 $cb->($pkg);
3402 1
3403 } or warn "$pkg unloaded, but with errors: $@";
3404 } 3749 }
3405 3750
3406 warn "... nuking $pkg"; 3751 warn "cancelling all extension coros";
3407 Symbol::delete_package $pkg; 3752 $_->cancel for values %EXT_CORO;
3408 } 3753 %EXT_CORO = ();
3409 3754
3410 warn "unloading all perl modules loaded from $LIBDIR"; 3755 warn "removing commands";
3411 while (my ($k, $v) = each %INC) { 3756 %COMMAND = ();
3412 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3413 3757
3758 warn "removing ext/exti commands";
3759 %EXTCMD = ();
3760 %EXTICMD = ();
3761
3762 warn "unloading/nuking all extensions";
3763 for my $pkg (@EXTS) {
3414 warn "... unloading $k"; 3764 warn "... unloading $pkg";
3415 delete $INC{$k};
3416 3765
3417 $k =~ s/\.pm$//;
3418 $k =~ s/\//::/g;
3419
3420 if (my $cb = $k->can ("unload_module")) { 3766 if (my $cb = $pkg->can ("unload")) {
3767 eval {
3421 $cb->(); 3768 $cb->($pkg);
3769 1
3770 } or warn "$pkg unloaded, but with errors: $@";
3771 }
3772
3773 warn "... clearing $pkg";
3774 clear_package $pkg;
3422 } 3775 }
3423 3776
3424 Symbol::delete_package $k; 3777 warn "unloading all perl modules loaded from $LIBDIR";
3778 while (my ($k, $v) = each %INC) {
3779 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3780
3781 warn "... unloading $k";
3782 delete $INC{$k};
3783
3784 $k =~ s/\.pm$//;
3785 $k =~ s/\//::/g;
3786
3787 if (my $cb = $k->can ("unload_module")) {
3788 $cb->();
3789 }
3790
3791 clear_package $k;
3425 } 3792 }
3426 3793
3427 warn "getting rid of safe::, as good as possible"; 3794 warn "getting rid of safe::, as good as possible";
3428 Symbol::delete_package "safe::$_" 3795 clear_package "safe::$_"
3429 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3796 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3430 3797
3431 warn "unloading cf.pm \"a bit\""; 3798 warn "unloading cf.pm \"a bit\"";
3432 delete $INC{"cf.pm"}; 3799 delete $INC{"cf.pm"};
3433 delete $INC{"cf/pod.pm"}; 3800 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3434 3801
3435 # don't, removes xs symbols, too, 3802 # don't, removes xs symbols, too,
3436 # and global variables created in xs 3803 # and global variables created in xs
3437 #Symbol::delete_package __PACKAGE__; 3804 #clear_package __PACKAGE__;
3438 3805
3439 warn "unload completed, starting to reload now"; 3806 warn "unload completed, starting to reload now";
3440 3807
3441 warn "reloading cf.pm"; 3808 warn "reloading cf.pm";
3442 require cf; 3809 require cf;
3443 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3810 cf::_connect_to_perl_1;
3444 3811
3445 warn "loading config and database again"; 3812 warn "loading config and database again";
3446 cf::reload_config; 3813 cf::reload_config;
3447 3814
3448 warn "loading extensions"; 3815 warn "loading extensions";
3449 cf::load_extensions; 3816 cf::load_extensions;
3450 3817
3818 if ($REATTACH_ON_RELOAD) {
3451 warn "reattaching attachments to objects/players"; 3819 warn "reattaching attachments to objects/players";
3452 _global_reattach; # objects, sockets 3820 _global_reattach; # objects, sockets
3453 warn "reattaching attachments to maps"; 3821 warn "reattaching attachments to maps";
3454 reattach $_ for values %MAP; 3822 reattach $_ for values %MAP;
3455 warn "reattaching attachments to players"; 3823 warn "reattaching attachments to players";
3456 reattach $_ for values %PLAYER; 3824 reattach $_ for values %PLAYER;
3825 }
3457 3826
3827 warn "running post_init jobs";
3828 (pop @POST_INIT)->(1) while @POST_INIT;
3829
3458 warn "leaving sync_job"; 3830 warn "leaving sync_job";
3459 3831
3460 1 3832 1
3461 } or do { 3833 } or do {
3462 warn $@; 3834 warn $@;
3463 warn "error while reloading, exiting."; 3835 cf::cleanup "error while reloading, exiting.";
3464 exit 1;
3465 }; 3836 };
3466 3837
3467 warn "reloaded"; 3838 warn "reloaded";
3839 --$RELOAD;
3840 }
3841
3842 $t1 = EV::time - $t1;
3843 warn "reload completed in ${t1}s\n";
3468}; 3844};
3469 3845
3470our $RELOAD_WATCHER; # used only during reload 3846our $RELOAD_WATCHER; # used only during reload
3471 3847
3472sub reload_perl() { 3848sub reload_perl() {
3473 # doing reload synchronously and two reloads happen back-to-back, 3849 # doing reload synchronously and two reloads happen back-to-back,
3474 # coro crashes during coro_state_free->destroy here. 3850 # coro crashes during coro_state_free->destroy here.
3475 3851
3476 $RELOAD_WATCHER ||= Event->timer ( 3852 $RELOAD_WATCHER ||= cf::async {
3477 reentrant => 0, 3853 Coro::AIO::aio_wait cache_extensions;
3478 after => 0, 3854
3479 data => WF_AUTOCANCEL, 3855 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3480 cb => sub {
3481 do_reload_perl; 3856 do_reload_perl;
3482 undef $RELOAD_WATCHER; 3857 undef $RELOAD_WATCHER;
3483 }, 3858 };
3484 ); 3859 };
3485} 3860}
3486 3861
3487register_command "reload" => sub { 3862register_command "reload" => sub {
3488 my ($who, $arg) = @_; 3863 my ($who, $arg) = @_;
3489 3864
3502 3877
3503our @WAIT_FOR_TICK; 3878our @WAIT_FOR_TICK;
3504our @WAIT_FOR_TICK_BEGIN; 3879our @WAIT_FOR_TICK_BEGIN;
3505 3880
3506sub wait_for_tick { 3881sub wait_for_tick {
3507 return unless $TICK_WATCHER->is_active;
3508 return if $Coro::current == $Coro::main; 3882 return if tick_inhibit || $Coro::current == $Coro::main;
3509 3883
3510 my $signal = new Coro::Signal; 3884 my $signal = new Coro::Signal;
3511 push @WAIT_FOR_TICK, $signal; 3885 push @WAIT_FOR_TICK, $signal;
3512 $signal->wait; 3886 $signal->wait;
3513} 3887}
3514 3888
3515sub wait_for_tick_begin { 3889sub wait_for_tick_begin {
3516 return unless $TICK_WATCHER->is_active;
3517 return if $Coro::current == $Coro::main; 3890 return if tick_inhibit || $Coro::current == $Coro::main;
3518 3891
3519 my $signal = new Coro::Signal; 3892 my $signal = new Coro::Signal;
3520 push @WAIT_FOR_TICK_BEGIN, $signal; 3893 push @WAIT_FOR_TICK_BEGIN, $signal;
3521 $signal->wait; 3894 $signal->wait;
3522} 3895}
3523 3896
3524$TICK_WATCHER = Event->timer ( 3897sub tick {
3525 reentrant => 0,
3526 parked => 1,
3527 prio => 0,
3528 at => $NEXT_TICK || $TICK,
3529 data => WF_AUTOCANCEL,
3530 cb => sub {
3531 if ($Coro::current != $Coro::main) { 3898 if ($Coro::current != $Coro::main) {
3532 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3899 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3533 unless ++$bug_warning > 10; 3900 unless ++$bug_warning > 10;
3534 return; 3901 return;
3535 } 3902 }
3536 3903
3537 $NOW = $tick_start = Event::time;
3538
3539 cf::server_tick; # one server iteration 3904 cf::server_tick; # one server iteration
3540 3905
3541 $RUNTIME += $TICK;
3542 $NEXT_TICK += $TICK;
3543
3544 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3906 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3545 $NEXT_RUNTIME_WRITE = $NOW + 10; 3907 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3546 Coro::async_pool { 3908 Coro::async_pool {
3547 $Coro::current->{desc} = "runtime saver"; 3909 $Coro::current->{desc} = "runtime saver";
3548 write_runtime 3910 write_runtime_sync
3549 or warn "ERROR: unable to write runtime file: $!"; 3911 or warn "ERROR: unable to write runtime file: $!";
3550 };
3551 } 3912 };
3913 }
3552 3914
3553 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3915 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3554 $sig->send; 3916 $sig->send;
3555 } 3917 }
3556 while (my $sig = shift @WAIT_FOR_TICK) { 3918 while (my $sig = shift @WAIT_FOR_TICK) {
3557 $sig->send; 3919 $sig->send;
3558 } 3920 }
3559 3921
3560 $NOW = Event::time; 3922 $LOAD = ($NOW - $TICK_START) / $TICK;
3561
3562 # if we are delayed by four ticks or more, skip them all
3563 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3564
3565 $TICK_WATCHER->at ($NEXT_TICK);
3566 $TICK_WATCHER->start;
3567
3568 $LOAD = ($NOW - $tick_start) / $TICK;
3569 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3923 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3570 3924
3571 _post_tick; 3925 if (0) {
3926 if ($NEXT_TICK) {
3927 my $jitter = $TICK_START - $NEXT_TICK;
3928 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3929 warn "jitter $JITTER\n";#d#
3930 }
3572 }, 3931 }
3573); 3932}
3574 3933
3575{ 3934{
3935 # configure BDB
3936
3576 BDB::min_parallel 8; 3937 BDB::min_parallel 8;
3577 BDB::max_poll_time $TICK * 0.1; 3938 BDB::max_poll_reqs $TICK * 0.1;
3578 $BDB_POLL_WATCHER = Event->io ( 3939 $AnyEvent::BDB::WATCHER->priority (1);
3579 reentrant => 0,
3580 fd => BDB::poll_fileno,
3581 poll => 'r',
3582 prio => 0,
3583 data => WF_AUTOCANCEL,
3584 cb => \&BDB::poll_cb,
3585 );
3586
3587 BDB::set_sync_prepare {
3588 my $status;
3589 my $current = $Coro::current;
3590 (
3591 sub {
3592 $status = $!;
3593 $current->ready; undef $current;
3594 },
3595 sub {
3596 Coro::schedule while defined $current;
3597 $! = $status;
3598 },
3599 )
3600 };
3601 3940
3602 unless ($DB_ENV) { 3941 unless ($DB_ENV) {
3603 $DB_ENV = BDB::db_env_create; 3942 $DB_ENV = BDB::db_env_create;
3604 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3943 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3605 | BDB::LOG_AUTOREMOVE, 1); 3944 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3945 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3606 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3946 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3607 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3947 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3608 3948
3609 cf::sync_job { 3949 cf::sync_job {
3610 eval { 3950 eval {
3620 3960
3621 cf::cleanup "db_env_open(db): $@" if $@; 3961 cf::cleanup "db_env_open(db): $@" if $@;
3622 }; 3962 };
3623 } 3963 }
3624 3964
3625 $BDB_DEADLOCK_WATCHER = Event->timer ( 3965 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3626 after => 3,
3627 interval => 1,
3628 hard => 1,
3629 prio => 0,
3630 data => WF_AUTOCANCEL,
3631 cb => sub {
3632 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3966 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3633 },
3634 ); 3967 };
3635 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3968 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3636 after => 11,
3637 interval => 60,
3638 hard => 1,
3639 prio => 0,
3640 data => WF_AUTOCANCEL,
3641 cb => sub {
3642 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3969 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3643 },
3644 ); 3970 };
3645 $BDB_TRICKLE_WATCHER = Event->timer ( 3971 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3646 after => 5,
3647 interval => 10,
3648 hard => 1,
3649 prio => 0,
3650 data => WF_AUTOCANCEL,
3651 cb => sub {
3652 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3972 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3653 },
3654 ); 3973 };
3655} 3974}
3656 3975
3657{ 3976{
3977 # configure IO::AIO
3978
3658 IO::AIO::min_parallel 8; 3979 IO::AIO::min_parallel 8;
3659
3660 undef $Coro::AIO::WATCHER;
3661 IO::AIO::max_poll_time $TICK * 0.1; 3980 IO::AIO::max_poll_time $TICK * 0.1;
3662 $AIO_POLL_WATCHER = Event->io ( 3981 undef $AnyEvent::AIO::WATCHER;
3663 reentrant => 0,
3664 data => WF_AUTOCANCEL,
3665 fd => IO::AIO::poll_fileno,
3666 poll => 'r',
3667 prio => 0,
3668 cb => \&IO::AIO::poll_cb,
3669 );
3670} 3982}
3671 3983
3672my $_log_backtrace; 3984my $_log_backtrace;
3673 3985
3674sub _log_backtrace { 3986sub _log_backtrace {
3677 $msg =~ s/\n//; 3989 $msg =~ s/\n//;
3678 3990
3679 # limit the # of concurrent backtraces 3991 # limit the # of concurrent backtraces
3680 if ($_log_backtrace < 2) { 3992 if ($_log_backtrace < 2) {
3681 ++$_log_backtrace; 3993 ++$_log_backtrace;
3994 my $perl_bt = Carp::longmess $msg;
3682 async { 3995 async {
3683 $Coro::current->{desc} = "abt $msg"; 3996 $Coro::current->{desc} = "abt $msg";
3684 3997
3685 my @bt = fork_call { 3998 my @bt = fork_call {
3686 @addr = map { sprintf "%x", $_ } @addr; 3999 @addr = map { sprintf "%x", $_ } @addr;
3697 } 4010 }
3698 4011
3699 @funcs 4012 @funcs
3700 }; 4013 };
3701 4014
3702 LOG llevInfo, "[ABT] $msg\n"; 4015 LOG llevInfo, "[ABT] $perl_bt\n";
4016 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3703 LOG llevInfo, "[ABT] $_\n" for @bt; 4017 LOG llevInfo, "[ABT] $_\n" for @bt;
3704 --$_log_backtrace; 4018 --$_log_backtrace;
3705 }; 4019 };
3706 } else { 4020 } else {
3707 LOG llevInfo, "[ABT] $msg\n"; 4021 LOG llevInfo, "[ABT] $msg\n";
3708 LOG llevInfo, "[ABT] [suppressed]\n"; 4022 LOG llevInfo, "[ABT] [suppressed]\n";
3709 } 4023 }
3710} 4024}
3711 4025
3712# load additional modules 4026# load additional modules
3713use cf::pod; 4027require "cf/$_.pm" for @EXTRA_MODULES;
4028cf::_connect_to_perl_2;
3714 4029
3715END { cf::emergency_save } 4030END { cf::emergency_save }
3716 4031
37171 40321
3718 4033

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines