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.358 by root, Fri Sep 7 18:10:52 2007 UTC vs.
Revision 1.516 by root, Thu Apr 15 06:05:52 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 3.64 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
24use Coro::Util (); 53use Coro::Util ();
25 54
26use JSON::XS (); 55use JSON::XS 2.01 ();
27use BDB (); 56use BDB ();
28use Data::Dumper; 57use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.32 (); 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;
112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
75 115
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $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 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 118our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
83 120
121our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 123our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 124our $DB_ENV;
125
126our @EXTRA_MODULES = qw(pod match mapscript);
86 127
87our %CFG; 128our %CFG;
88 129
89our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 131our $RUNTIME;
132our $NOW;
91 133
92our (%PLAYER, %PLAYER_LOADING); # all users 134our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 135our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 136our $LINK_MAP; # the special {link} map, which is always available
95 137
96# used to convert map paths into valid unix filenames by replacing / by ∕ 138# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 140
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
102 150
103binmode STDOUT; 151binmode STDOUT;
104binmode STDERR; 152binmode STDERR;
105 153
106# read virtual server time, if available 154# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
111} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
112 162
113mkdir $_ 163mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 165
116our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
117 167
118sub cf::map::normalise; 168sub cf::map::normalise;
169
170#############################################################################
171
172%REFLECT = ();
173for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_;
175 $REFLECT{$reflect->{class}} = $reflect;
176}
177
178# this is decidedly evil
179$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
119 180
120############################################################################# 181#############################################################################
121 182
122=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
123 184
159 220
160The raw value load value from the last tick. 221The raw value load value from the last tick.
161 222
162=item %cf::CFG 223=item %cf::CFG
163 224
164Configuration for the server, loaded from C</etc/crossfire/config>, or 225Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 226from wherever your confdir points to.
166 227
167=item cf::wait_for_tick, cf::wait_for_tick_begin 228=item cf::wait_for_tick, cf::wait_for_tick_begin
168 229
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 230These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
170returns directly I<after> the tick processing (and consequently, can only wake one process 231returns directly I<after> the tick processing (and consequently, can only wake one process
171per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 232per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172 233
173=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
174 235
175This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call. 238that call.
178 239
240=item %cf::REFLECT
241
242Contains, for each (C++) class name, a hash reference with information
243about object members (methods, scalars, arrays and flags) and other
244metadata, which is useful for introspection.
245
179=back 246=back
180 247
181=cut 248=cut
182 249
183BEGIN { 250$Coro::State::WARNHOOK = sub {
184 *CORE::GLOBAL::warn = sub {
185 my $msg = join "", @_; 251 my $msg = join "", @_;
186 252
187 $msg .= "\n" 253 $msg .= "\n"
188 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
189 255
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 257
192 utf8::encode $msg;
193 LOG llevError, $msg; 258 LOG llevError, $msg;
194 }; 259};
195} 260
261$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
265
266 if ($Coro::current == $Coro::main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d#
269 }#d#
270
271 # kill coroutine otherwise
272 Coro::terminate
273};
196 274
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 285for my $pkg (qw(
208 cf::global cf::attachable 286 cf::global cf::attachable
209 cf::object cf::object::player 287 cf::object cf::object::player
210 cf::client cf::player 288 cf::client cf::player
211 cf::arch cf::living 289 cf::arch cf::living
290 cf::map cf::mapspace
212 cf::map cf::party cf::region 291 cf::party cf::region
213)) { 292)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 294}
217 295
218$Event::DIED = sub { 296$EV::DIED = sub {
219 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
220}; 298};
221 299
222############################################################################# 300#############################################################################
223 301
224=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 324 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 325 $d
248 } || "[unable to dump $_[0]: '$@']"; 326 } || "[unable to dump $_[0]: '$@']";
249} 327}
250 328
251=item $ref = cf::from_json $json 329=item $ref = cf::decode_json $json
252 330
253Converts a JSON string into the corresponding perl data structure. 331Converts a JSON string into the corresponding perl data structure.
254 332
255=item $json = cf::to_json $ref 333=item $json = cf::encode_json $ref
256 334
257Converts a perl data structure into its JSON representation. 335Converts a perl data structure into its JSON representation.
258 336
259=cut 337=cut
260 338
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 339our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 340
263sub to_json ($) { $json_coder->encode ($_[0]) } 341sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 342sub decode_json($) { $json_coder->decode ($_[0]) }
343
344=item cf::post_init { BLOCK }
345
346Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again.
348
349The cdoeblock will have a single boolean argument to indicate whether this
350is a reload or not.
351
352=cut
353
354sub post_init(&) {
355 push @POST_INIT, shift;
356}
265 357
266=item cf::lock_wait $string 358=item cf::lock_wait $string
267 359
268Wait until the given lock is available. See cf::lock_acquire. 360Wait until the given lock is available. See cf::lock_acquire.
269 361
270=item my $lock = cf::lock_acquire $string 362=item my $lock = cf::lock_acquire $string
271 363
272Wait until the given lock is available and then acquires it and returns 364Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 365a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 366for example when the coroutine gets canceled), the lock is automatically
275returned. 367returned.
276 368
277Locks are *not* recursive, locking from the same coro twice results in a 369Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro. 370deadlocked coro.
284 376
285Return true if the lock is currently active, i.e. somebody has locked it. 377Return true if the lock is currently active, i.e. somebody has locked it.
286 378
287=cut 379=cut
288 380
289our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 382
292sub lock_wait($) { 383sub lock_wait($) {
293 my ($key) = @_; 384 $LOCKS->wait ($_[0]);
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
299
300 # wait for lock, if any
301 while ($LOCK{$key}) {
302 push @{ $LOCK{$key} }, $Coro::current;
303 Coro::schedule;
304 }
305} 385}
306 386
307sub lock_acquire($) { 387sub lock_acquire($) {
308 my ($key) = @_; 388 $LOCKS->guard ($_[0])
309
310 # wait, to be sure we are not locked
311 lock_wait $key;
312
313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
315
316 Coro::guard {
317 delete $LOCKER{$key};#d#
318 # wake up all waiters, to be on the safe side
319 $_->ready for @{ delete $LOCK{$key} };
320 }
321} 389}
322 390
323sub lock_active($) { 391sub lock_active($) {
324 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 393}
328 394
329sub freeze_mainloop { 395sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 396 tick_inhibit_inc;
331 397
332 my $guard = Coro::guard { 398 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start; 399}
334 }; 400
335 $TICK_WATCHER->stop; 401=item cf::periodic $interval, $cb
336 $guard 402
403Like EV::periodic, but randomly selects a starting point so that the actions
404get spread over time.
405
406=cut
407
408sub periodic($$) {
409 my ($interval, $cb) = @_;
410
411 my $start = rand List::Util::min 180, $interval;
412
413 EV::periodic $start, $interval, 0, $cb
337} 414}
338 415
339=item cf::get_slot $time[, $priority[, $name]] 416=item cf::get_slot $time[, $priority[, $name]]
340 417
341Allocate $time seconds of blocking CPU time at priority C<$priority>: 418Allocate $time seconds of blocking CPU time at priority C<$priority>:
349 426
350=cut 427=cut
351 428
352our @SLOT_QUEUE; 429our @SLOT_QUEUE;
353our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
354 432
355$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
435 $Coro::current->desc ("timeslot manager");
436
357 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
358 439
359 while () { 440 while () {
360 next_job: 441 next_job:
442
361 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
362 if ($avail > 0.01) { 444
363 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
364 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
365 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
366 $job->[2]->send; 449 $job->[2]->send;
367 Coro::cede; 450 Coro::cede;
368 goto next_job; 451 goto next_job;
369 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
370 } 454 }
371 } 455 }
372 456
373 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait; 460 $signal->wait;
377 } else { 461 } else {
462 $busy = 0;
378 Coro::schedule; 463 Coro::schedule;
379 } 464 }
380 } 465 }
381}; 466};
382 467
383sub get_slot($;$$) { 468sub get_slot($;$$) {
469 return if tick_inhibit || $Coro::current == $Coro::main;
470
384 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
385 472
386 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
387 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
388 476
389 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
390 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
391 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
402 490
403BEGIN { *async = \&Coro::async_pool } 491BEGIN { *async = \&Coro::async_pool }
404 492
405=item cf::sync_job { BLOCK } 493=item cf::sync_job { BLOCK }
406 494
407The design of Crossfire TRT requires that the main coroutine ($Coro::main) 495The design of Deliantra requires that the main coroutine ($Coro::main)
408is always able to handle events or runnable, as Crossfire TRT is only 496is always able to handle events or runnable, as Deliantra is only
409partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 497partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable. 498acceptable.
411 499
412If it must be done, put the blocking parts into C<sync_job>. This will run 500If it must be done, put the blocking parts into C<sync_job>. This will run
413the given BLOCK in another coroutine while waiting for the result. The 501the given BLOCK in another coroutine while waiting for the result. The
418 506
419sub sync_job(&) { 507sub sync_job(&) {
420 my ($job) = @_; 508 my ($job) = @_;
421 509
422 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
423 my $time = Event::time; 511 my $time = AE::time;
424 512
425 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
426 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
427 515
428 # TODO: use suspend/resume instead 516 LOG llevError, Carp::longmess "sync job";#d#
429 # (but this is cancel-safe) 517
430 my $freeze_guard = freeze_mainloop; 518 my $freeze_guard = freeze_mainloop;
431 519
432 my $busy = 1; 520 my $busy = 1;
433 my @res; 521 my @res;
434 522
435 (async { 523 (async {
524 $Coro::current->desc ("sync job coro");
436 @res = eval { $job->() }; 525 @res = eval { $job->() };
437 warn $@ if $@; 526 warn $@ if $@;
438 undef $busy; 527 undef $busy;
439 })->prio (Coro::PRIO_MAX); 528 })->prio (Coro::PRIO_MAX);
440 529
441 while ($busy) { 530 while ($busy) {
442 Coro::cede or Event::one_event; 531 if (Coro::nready) {
532 Coro::cede_notself;
533 } else {
534 EV::loop EV::LOOP_ONESHOT;
443 } 535 }
536 }
444 537
445 $time = Event::time - $time; 538 my $time = AE::time - $time;
446 539
447 LOG llevError | logBacktrace, Carp::longmess "long sync job"
448 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
449
450 $tick_start += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
451 541
452 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
453 } else { 543 } else {
454 # we are in another coroutine, how wonderful, everything just works 544 # we are in another coroutine, how wonderful, everything just works
455 545
480=item fork_call { }, $args 570=item fork_call { }, $args
481 571
482Executes the given code block with the given arguments in a seperate 572Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with 573process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may 574Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling. 575never block itself or use any form of event handling.
486 576
487=cut 577=cut
488 578
489sub fork_call(&@) { 579sub fork_call(&@) {
490 my ($cb, @args) = @_; 580 my ($cb, @args) = @_;
499 }, @args; 589 }, @args;
500 590
501 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
502} 592}
503 593
594sub objinfo {
595 (
596 "counter value" => cf::object::object_count,
597 "objects created" => cf::object::create_count,
598 "objects destroyed" => cf::object::destroy_count,
599 "freelist size" => cf::object::free_count,
600 "allocated objects" => cf::object::objects_size,
601 "active objects" => cf::object::actives_size,
602 )
603}
604
605=item $coin = coin_from_name $name
606
607=cut
608
609our %coin_alias = (
610 "silver" => "silvercoin",
611 "silvercoin" => "silvercoin",
612 "silvercoins" => "silvercoin",
613 "gold" => "goldcoin",
614 "goldcoin" => "goldcoin",
615 "goldcoins" => "goldcoin",
616 "platinum" => "platinacoin",
617 "platinumcoin" => "platinacoin",
618 "platinumcoins" => "platinacoin",
619 "platina" => "platinacoin",
620 "platinacoin" => "platinacoin",
621 "platinacoins" => "platinacoin",
622 "royalty" => "royalty",
623 "royalties" => "royalty",
624);
625
626sub coin_from_name($) {
627 $coin_alias{$_[0]}
628 ? cf::arch::find $coin_alias{$_[0]}
629 : undef
630}
631
504=item $value = cf::db_get $family => $key 632=item $value = cf::db_get $family => $key
505 633
506Returns a single value from the environment database. 634Returns a single value from the environment database.
507 635
508=item cf::db_put $family => $key => $value 636=item cf::db_put $family => $key => $value
509 637
510Stores the given C<$value> in the family. It can currently store binary 638Stores the given C<$value> in the family. It can currently store binary
511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 639data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 640
641=item $db = cf::db_table "name"
642
643Create and/or open a new database table. The string must not be "db" and must be unique
644within each server.
645
513=cut 646=cut
647
648sub db_table($) {
649 my ($name) = @_;
650 my $db = BDB::db_create $DB_ENV;
651
652 eval {
653 $db->set_flags (BDB::CHKSUM);
654
655 utf8::encode $name;
656 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
657 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
658 cf::cleanup "db_open(db): $!" if $!;
659 };
660 cf::cleanup "db_open(db): $@" if $@;
661
662 $db
663}
514 664
515our $DB; 665our $DB;
516 666
517sub db_init { 667sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job { 668 cf::sync_job {
522 eval { 669 $DB ||= db_table "db";
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
531 } 670 };
532} 671}
533 672
534sub db_get($$) { 673sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 674 my $key = "$_[0]/$_[1]";
536 675
634 773
635############################################################################# 774#############################################################################
636 775
637=head2 ATTACHABLE OBJECTS 776=head2 ATTACHABLE OBJECTS
638 777
639Many objects in crossfire are so-called attachable objects. That means you can 778Many objects in deliantra are so-called attachable objects. That means you can
640attach callbacks/event handlers (a collection of which is called an "attachment") 779attach callbacks/event handlers (a collection of which is called an "attachment")
641to it. All such attachable objects support the following methods. 780to it. All such attachable objects support the following methods.
642 781
643In the following description, CLASS can be any of C<global>, C<object> 782In the following description, CLASS can be any of C<global>, C<object>
644C<player>, C<client> or C<map> (i.e. the attachable objects in 783C<player>, C<client> or C<map> (i.e. the attachable objects in
645Crossfire TRT). 784Deliantra).
646 785
647=over 4 786=over 4
648 787
649=item $attachable->attach ($attachment, key => $value...) 788=item $attachable->attach ($attachment, key => $value...)
650 789
694=item cf::CLASS::attachment $name, ... 833=item cf::CLASS::attachment $name, ...
695 834
696Register an attachment by C<$name> through which attachable objects of the 835Register an attachment by C<$name> through which attachable objects of the
697given CLASS can refer to this attachment. 836given CLASS can refer to this attachment.
698 837
699Some classes such as crossfire maps and objects can specify attachments 838Some classes such as deliantra maps and objects can specify attachments
700that are attached at load/instantiate time, thus the need for a name. 839that are attached at load/instantiate time, thus the need for a name.
701 840
702These calls expect any number of the following handler/hook descriptions: 841These calls expect any number of the following handler/hook descriptions:
703 842
704=over 4 843=over 4
932 } 1071 }
933 1072
934 0 1073 0
935} 1074}
936 1075
937=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1076=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
938 1077
939=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1078=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
940 1079
941Generate an object-specific event with the given arguments. 1080Generate an object-specific event with the given arguments.
942 1081
948 1087
949=cut 1088=cut
950 1089
951############################################################################# 1090#############################################################################
952# object support 1091# object support
953#
954 1092
1093sub _object_equal($$);
1094sub _object_equal($$) {
1095 my ($a, $b) = @_;
1096
1097 return 0 unless (ref $a) eq (ref $b);
1098
1099 if ("HASH" eq ref $a) {
1100 my @ka = keys %$a;
1101 my @kb = keys %$b;
1102
1103 return 0 if @ka != @kb;
1104
1105 for (0 .. $#ka) {
1106 return 0 unless $ka[$_] eq $kb[$_];
1107 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1108 }
1109
1110 } elsif ("ARRAY" eq ref $a) {
1111
1112 return 0 if @$a != @$b;
1113
1114 for (0 .. $#$a) {
1115 return 0 unless _object_equal $a->[$_], $b->[$_];
1116 }
1117
1118 } elsif ($a ne $b) {
1119 return 0;
1120 }
1121
1122 1
1123}
1124
1125our $SLOW_MERGES;#d#
955sub _can_merge { 1126sub _can_merge {
956 my ($ob1, $ob2) = @_; 1127 my ($ob1, $ob2) = @_;
957 1128
958 local $Storable::canonical = 1; 1129 ++$SLOW_MERGES;#d#
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961 1130
962 $fob1 eq $fob2 1131 # we do the slow way here
1132 return _object_equal $ob1, $ob2
963} 1133}
964 1134
965sub reattach { 1135sub reattach {
966 # basically do the same as instantiate, without calling instantiate 1136 # basically do the same as instantiate, without calling instantiate
967 my ($obj) = @_; 1137 my ($obj) = @_;
968 1138
1139 # no longer needed after getting rid of delete_package?
969 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1140 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
970 1141
971 my $registry = $obj->registry; 1142 my $registry = $obj->registry;
972 1143
973 @$registry = (); 1144 @$registry = ();
974 1145
989cf::attachable->attach ( 1160cf::attachable->attach (
990 prio => -1000000, 1161 prio => -1000000,
991 on_instantiate => sub { 1162 on_instantiate => sub {
992 my ($obj, $data) = @_; 1163 my ($obj, $data) = @_;
993 1164
994 $data = from_json $data; 1165 $data = decode_json $data;
995 1166
996 for (@$data) { 1167 for (@$data) {
997 my ($name, $args) = @$_; 1168 my ($name, $args) = @$_;
998 1169
999 $obj->attach ($name, %{$args || {} }); 1170 $obj->attach ($name, %{$args || {} });
1013); 1184);
1014 1185
1015sub object_freezer_save { 1186sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1187 my ($filename, $rdata, $objs) = @_;
1017 1188
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1189 sync_job {
1021 if (length $$rdata) { 1190 if (length $$rdata) {
1191 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1192 warn sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1024 1194
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1196 aio_chmod $fh, SAVE_MODE;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1198 if ($cf::USE_FSYNC) {
1199 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;
1200 aio_fsync $fh;
1201 }
1029 close $fh; 1202 aio_close $fh;
1030 1203
1031 if (@$objs) { 1204 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1205 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1206 aio_chmod $fh, SAVE_MODE;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1209 if ($cf::USE_FSYNC) {
1210 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;
1211 aio_fsync $fh;
1212 }
1037 close $fh; 1213 aio_close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1215 }
1040 } else { 1216 } else {
1041 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
1042 } 1218 }
1043 1219
1044 aio_rename "$filename~", $filename; 1220 aio_rename "$filename~", $filename;
1221
1222 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC;
1045 } else { 1224 } else {
1046 warn "FATAL: $filename~: $!\n"; 1225 warn "unable to save objects: $filename~: $!\n";
1047 } 1226 }
1048 } else { 1227 } else {
1049 aio_unlink $filename; 1228 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1229 aio_unlink "$filename.pst";
1051 } 1230 }
1052 }; 1231 };
1053
1054 undef $guard;
1055} 1232}
1056 1233
1057sub object_freezer_as_string { 1234sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1235 my ($rdata, $objs) = @_;
1059 1236
1064 1241
1065sub object_thawer_load { 1242sub object_thawer_load {
1066 my ($filename) = @_; 1243 my ($filename) = @_;
1067 1244
1068 my ($data, $av); 1245 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1246
1072 (aio_load $filename, $data) >= 0 1247 (aio_load $filename, $data) >= 0
1073 or return; 1248 or return;
1074 1249
1075 unless (aio_stat "$filename.pst") { 1250 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1251 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1252 or return;
1078 1253
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1254 my $st = eval { Coro::Storable::thaw $av };
1255 $av = $st->{objs};
1081 } 1256 }
1082 1257
1258 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1259 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1260 $decname, length $data, scalar @{$av || []};
1085 1261
1086 ($data, $av) 1262 ($data, $av)
1087} 1263}
1088 1264
1089=head2 COMMAND CALLBACKS 1265=head2 COMMAND CALLBACKS
1145 my ($name, $cb) = @_; 1321 my ($name, $cb) = @_;
1146 1322
1147 $EXTICMD{$name} = $cb; 1323 $EXTICMD{$name} = $cb;
1148} 1324}
1149 1325
1326use File::Glob ();
1327
1150cf::player->attach ( 1328cf::player->attach (
1151 on_command => sub { 1329 on_unknown_command => sub {
1152 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1153 1331
1154 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1155 or return; 1333 or return;
1156 1334
1186 1364
1187 cf::override; 1365 cf::override;
1188 }, 1366 },
1189); 1367);
1190 1368
1369# "readahead" all extensions
1370sub cache_extensions {
1371 my $grp = IO::AIO::aio_group;
1372
1373 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1374 for (grep /\.ext$/, @{$_[0]}) {
1375 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1376 }
1377 };
1378
1379 $grp
1380}
1381
1191sub load_extensions { 1382sub load_extensions {
1192 cf::sync_job { 1383 cf::sync_job {
1193 my %todo; 1384 my %todo;
1194 1385
1195 for my $path (<$LIBDIR/*.ext>) { 1386 for my $path (<$LIBDIR/*.ext>) {
1214 1405
1215 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1216 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1217 1408
1218 $ext{source} = 1409 $ext{source} =
1219 "package $pkg; use strict; use utf8;\n" 1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1220 . "#line 1 \"$path\"\n{\n" 1411 . "#line 1 \"$path\"\n{\n"
1221 . $source 1412 . $source
1222 . "\n};\n1"; 1413 . "\n};\n1";
1223 1414
1224 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1225 } 1416 }
1226 1417
1418 my $pass = 0;
1227 my %done; 1419 my %done;
1228 while (%todo) { 1420 while (%todo) {
1229 my $progress; 1421 my $progress;
1230 1422
1423 ++$pass;
1424
1425 ext:
1231 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1232 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1233 goto skip 1428 next ext
1234 unless exists $done{$_}; 1429 unless exists $done{$_};
1235 } 1430 }
1236 1431
1237 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1238 1433
1239 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1240 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1241 : "$v->{base}: extension inactive.\n";
1242 1438
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1243 if (exists $v->{meta}{mandatory}) { 1440 if exists $v->{meta}{mandatory};
1244 warn $msg; 1441 } else {
1245 warn "mandatory extension failed to load, exiting.\n"; 1442 $done{$k} = delete $todo{$k};
1246 exit 1; 1443 push @EXTS, $v->{pkg};
1247 } 1444 $progress = 1;
1248 1445
1249 warn $msg; 1446 warn "$v->{base}: extension inactive.\n"
1447 unless $active;
1250 } 1448 }
1251
1252 $done{$k} = delete $todo{$k};
1253 push @EXTS, $v->{pkg};
1254 $progress = 1;
1255 } 1449 }
1256 1450
1257 skip: 1451 unless ($progress) {
1258 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1259 unless $progress; 1453
1454 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory};
1457 }
1458 }
1260 } 1459 }
1261 }; 1460 };
1262} 1461}
1263 1462
1264############################################################################# 1463#############################################################################
1265 1464
1266=back 1465=back
1267 1466
1268=head2 CORE EXTENSIONS 1467=head2 CORE EXTENSIONS
1269 1468
1270Functions and methods that extend core crossfire objects. 1469Functions and methods that extend core deliantra objects.
1271 1470
1272=cut 1471=cut
1273 1472
1274package cf::player; 1473package cf::player;
1275 1474
1276use Coro::AIO; 1475use Coro::AIO;
1277 1476
1278=head3 cf::player 1477=head3 cf::player
1279 1478
1280=over 4 1479=over 4
1480
1481=item cf::player::num_playing
1482
1483Returns the official number of playing players, as per the Crossfire metaserver rules.
1484
1485=cut
1486
1487sub num_playing {
1488 scalar grep
1489 $_->ob->map
1490 && !$_->hidden
1491 && !$_->ob->flag (cf::FLAG_WIZ),
1492 cf::player::list
1493}
1281 1494
1282=item cf::player::find $login 1495=item cf::player::find $login
1283 1496
1284Returns the given player object, loading it if necessary (might block). 1497Returns the given player object, loading it if necessary (might block).
1285 1498
1304 1517
1305sub exists($) { 1518sub exists($) {
1306 my ($login) = @_; 1519 my ($login) = @_;
1307 1520
1308 $cf::PLAYER{$login} 1521 $cf::PLAYER{$login}
1309 or cf::sync_job { !aio_stat path $login } 1522 or !aio_stat path $login
1310} 1523}
1311 1524
1312sub find($) { 1525sub find($) {
1313 return $cf::PLAYER{$_[0]} || do { 1526 return $cf::PLAYER{$_[0]} || do {
1314 my $login = $_[0]; 1527 my $login = $_[0];
1324 aio_unlink +(playerdir $login) . "/$login.pl"; 1537 aio_unlink +(playerdir $login) . "/$login.pl";
1325 1538
1326 my $f = new_from_file cf::object::thawer path $login 1539 my $f = new_from_file cf::object::thawer path $login
1327 or return; 1540 or return;
1328 1541
1329 $f->next;
1330 my $pl = cf::player::load_pl $f 1542 my $pl = cf::player::load_pl $f
1331 or return; 1543 or return;
1544
1332 local $cf::PLAYER_LOADING{$login} = $pl; 1545 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs; 1546 $f->resolve_delayed_derefs;
1334 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1335 } 1548 }
1336 } 1549 }
1337} 1550}
1338 1551
1552cf::player->attach (
1553 on_load => sub {
1554 my ($pl, $path) = @_;
1555
1556 # restore slots saved in save, below
1557 my $slots = delete $pl->{_slots};
1558
1559 $pl->ob->current_weapon ($slots->[0]);
1560 $pl->combat_ob ($slots->[1]);
1561 $pl->ranged_ob ($slots->[2]);
1562 },
1563);
1564
1339sub save($) { 1565sub save($) {
1340 my ($pl) = @_; 1566 my ($pl) = @_;
1341 1567
1342 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1343 1569
1346 1572
1347 return if $pl->{deny_save}; 1573 return if $pl->{deny_save};
1348 1574
1349 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1350 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1577
1578 cf::get_slot 0.01;
1579
1580 # save slots, to be restored later
1581 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1351 1582
1352 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1353 cf::cede_to_tick; 1584 cf::cede_to_tick;
1354} 1585}
1355 1586
1387 my ($pl) = @_; 1618 my ($pl) = @_;
1388 1619
1389 my $name = $pl->ob->name; 1620 my $name = $pl->ob->name;
1390 1621
1391 $pl->{deny_save} = 1; 1622 $pl->{deny_save} = 1;
1392 $pl->password ("*"); # this should lock out the player until we nuked the dir 1623 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1393 1624
1394 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1395 $pl->deactivate; 1626 $pl->deactivate;
1627 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628 $pl->ob->check_score;
1396 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1629 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1397 $pl->ns->destroy if $pl->ns; 1630 $pl->ns->destroy if $pl->ns;
1398 1631
1399 my $path = playerdir $pl; 1632 my $path = playerdir $pl;
1400 my $temp = "$path~$cf::RUNTIME~deleting~"; 1633 my $temp = "$path~$cf::RUNTIME~deleting~";
1439 1672
1440 for my $login (@$dirs) { 1673 for my $login (@$dirs) {
1441 my $path = path $login; 1674 my $path = path $login;
1442 1675
1443 # a .pst is a dead give-away for a valid player 1676 # a .pst is a dead give-away for a valid player
1444 unless (-e "$path.pst") { 1677 # if no pst file found, open and chekc for blocked users
1678 if (aio_stat "$path.pst") {
1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1679 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1446 aio_read $fh, 0, 512, my $buf, 0 or next; 1680 aio_read $fh, 0, 512, my $buf, 0 or next;
1447 $buf !~ /^password -------------$/m or next; # official not-valid tag 1681 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 } 1682 }
1449 1683
1480 } 1714 }
1481 1715
1482 \@paths 1716 \@paths
1483} 1717}
1484 1718
1485=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1719=item $protocol_xml = $player->expand_cfpod ($cfpod)
1486 1720
1487Expand crossfire pod fragments into protocol xml. 1721Expand deliantra pod fragments into protocol xml.
1488
1489=cut
1490
1491sub expand_cfpod {
1492 ((my $self), (local $_)) = @_;
1493
1494 # escape & and <
1495 s/&/&amp;/g;
1496 s/(?<![BIUGHT])</&lt;/g;
1497
1498 # this is buggy, it needs to properly take care of nested <'s
1499
1500 1 while
1501 # replace B<>, I<>, U<> etc.
1502 s/B<([^\>]*)>/<b>$1<\/b>/
1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1506 # replace G<male|female> tags
1507 || s{G<([^>|]*)\|([^>]*)>}{
1508 $self->gender ? $2 : $1
1509 }ge
1510 # replace H<hint text>
1511 || s{H<([^\>]*)>}
1512 {
1513 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1514 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1515 "")
1516 [$self->{hintmode}]
1517 }ge;
1518
1519 # create single paragraphs (very hackish)
1520 s/(?<=\S)\n(?=\w)/ /g;
1521
1522 # compress some whitespace
1523 s/\s+\n/\n/g; # ws line-ends
1524 s/\n\n+/\n/g; # double lines
1525 s/^\n+//; # beginning lines
1526 s/\n+$//; # ending lines
1527
1528 $_
1529}
1530
1531sub hintmode {
1532 $_[0]{hintmode} = $_[1] if @_ > 1;
1533 $_[0]{hintmode}
1534}
1535 1722
1536=item $player->ext_reply ($msgid, @msg) 1723=item $player->ext_reply ($msgid, @msg)
1537 1724
1538Sends an ext reply to the player. 1725Sends an ext reply to the player.
1539 1726
1606our $MAX_RESET = 3600; 1793our $MAX_RESET = 3600;
1607our $DEFAULT_RESET = 3000; 1794our $DEFAULT_RESET = 3000;
1608 1795
1609sub generate_random_map { 1796sub generate_random_map {
1610 my ($self, $rmp) = @_; 1797 my ($self, $rmp) = @_;
1798
1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1800
1611 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1612 $self->_create_random_map ( 1802 $self->_create_random_map (
1613 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1614 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1615 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1616 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1617 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1618 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1619 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1737 1927
1738# the temporary/swap location 1928# the temporary/swap location
1739sub save_path { 1929sub save_path {
1740 my ($self) = @_; 1930 my ($self) = @_;
1741 1931
1742 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1743 "$TMPDIR/$path.map" 1933 "$TMPDIR/$path.map"
1744} 1934}
1745 1935
1746# the unique path, undef == no special unique path 1936# the unique path, undef == no special unique path
1747sub uniq_path { 1937sub uniq_path {
1748 my ($self) = @_; 1938 my ($self) = @_;
1749 1939
1750 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1751 "$UNIQUEDIR/$path" 1941 "$UNIQUEDIR/$path"
1752}
1753
1754# and all this just because we cannot iterate over
1755# all maps in C++...
1756sub change_all_map_light {
1757 my ($change) = @_;
1758
1759 $_->change_map_light ($change)
1760 for grep $_->outdoor, values %cf::MAP;
1761} 1942}
1762 1943
1763sub decay_objects { 1944sub decay_objects {
1764 my ($self) = @_; 1945 my ($self) = @_;
1765 1946
1849sub find { 2030sub find {
1850 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1851 2032
1852 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1853 2034
1854 cf::lock_wait "map_data:$path";#d#remove 2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1855 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
1856 2037
1857 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1858 my $guard1 = cf::lock_acquire "map_find:$path";
1859 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1860
1861 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1862 or return; 2040 or return;
1863 2041
1864 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1865 2043
1867 or return; 2045 or return;
1868 2046
1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1870 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1871 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
1872 undef $guard1; 2051 undef $guard1;
1873 undef $guard2;
1874 $map->reset; 2052 $map->reset;
1875 return find $path; 2053 return find $path;
1876 } 2054 }
1877 2055
1878 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1879 } 2057 }
1880} 2058}
1881 2059
1882sub pre_load { } 2060sub pre_load { }
1883sub post_load { } 2061#sub post_load { } # XS
1884 2062
1885sub load { 2063sub load {
1886 my ($self) = @_; 2064 my ($self) = @_;
1887 2065
1888 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
1891 2069
1892 { 2070 {
1893 my $guard = cf::lock_acquire "map_data:$path"; 2071 my $guard = cf::lock_acquire "map_data:$path";
1894 2072
1895 return unless $self->valid; 2073 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 2074 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 2075
1898 $self->in_memory (cf::MAP_LOADING); 2076 $self->in_memory (cf::MAP_LOADING);
1899 2077
1900 $self->alloc; 2078 $self->alloc;
1901 2079
1905 my $f = new_from_file cf::object::thawer $self->{load_path}; 2083 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block; 2084 $f->skip_block;
1907 $self->_load_objects ($f) 2085 $self->_load_objects ($f)
1908 or return; 2086 or return;
1909 2087
1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->post_load_original
1911 if delete $self->{load_original}; 2089 if delete $self->{load_original};
1912 2090
1913 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
1914 utf8::encode $uniq; 2092 utf8::encode $uniq;
1915 unless (aio_stat $uniq) { 2093 unless (aio_stat $uniq) {
1933 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
1934 $self->decay_objects; 2112 $self->decay_objects;
1935 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
1936 $self->update_buttons; 2114 $self->update_buttons;
1937 cf::cede_to_tick; 2115 cf::cede_to_tick;
1938 $self->set_darkness_map;
1939 cf::cede_to_tick;
1940 $self->activate; 2116 $self->activate;
1941 } 2117 }
1942 2118
1943 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
1945 2121
1946 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
1947 } 2123 }
1948 2124
1949 $self->post_load; 2125 $self->post_load;
1950} 2126}
1951 2127
2128# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath
1952sub customise_for { 2131sub customise_for {
1953 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
1954 2133
1955 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
1956 if $self->per_player; 2135 if $self->per_player;
2009 my ($path, $origin, $load) = @_; 2188 my ($path, $origin, $load) = @_;
2010 2189
2011 $path = normalise $path, $origin && $origin->{path}; 2190 $path = normalise $path, $origin && $origin->{path};
2012 2191
2013 if (my $map = $cf::MAP{$path}) { 2192 if (my $map = $cf::MAP{$path}) {
2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2193 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2015 } 2194 }
2016 2195
2017 $MAP_PREFETCH{$path} |= $load; 2196 $MAP_PREFETCH{$path} |= $load;
2018 2197
2019 $MAP_PREFETCHER ||= cf::async { 2198 $MAP_PREFETCHER ||= cf::async {
2199 $Coro::current->{desc} = "map prefetcher";
2200
2020 while (%MAP_PREFETCH) { 2201 while (%MAP_PREFETCH) {
2021 while (my ($k, $v) = each %MAP_PREFETCH) { 2202 while (my ($k, $v) = each %MAP_PREFETCH) {
2022 if (my $map = find $k) { 2203 if (my $map = find $k) {
2023 $map->load if $v; 2204 $map->load if $v;
2024 } 2205 }
2050 return if $self->{deny_save}; 2231 return if $self->{deny_save};
2051 2232
2052 local $self->{last_access} = $self->last_access;#d# 2233 local $self->{last_access} = $self->last_access;#d#
2053 2234
2054 cf::async { 2235 cf::async {
2236 $Coro::current->{desc} = "map player save";
2055 $_->contr->save for $self->players; 2237 $_->contr->save for $self->players;
2056 }; 2238 };
2239
2240 cf::get_slot 0.02;
2057 2241
2058 if ($uniq) { 2242 if ($uniq) {
2059 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2243 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2060 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2244 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2061 } else { 2245 } else {
2070 $self->save; 2254 $self->save;
2071 2255
2072 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2256 my $lock = cf::lock_acquire "map_data:$self->{path}";
2073 2257
2074 return if $self->players; 2258 return if $self->players;
2075 return if $self->in_memory != cf::MAP_IN_MEMORY; 2259 return if $self->in_memory != cf::MAP_ACTIVE;
2076 return if $self->{deny_save}; 2260 return if $self->{deny_save};
2077 2261
2262 $self->in_memory (cf::MAP_SWAPPED);
2263
2078 $self->deactivate; 2264 $self->deactivate;
2265 $_->clear_links_to ($self) for values %cf::MAP;
2079 $self->clear; 2266 $self->clear;
2080 $self->in_memory (cf::MAP_SWAPPED);
2081} 2267}
2082 2268
2083sub reset_at { 2269sub reset_at {
2084 my ($self) = @_; 2270 my ($self) = @_;
2085 2271
2103 2289
2104 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2105 2291
2106 return if $self->players; 2292 return if $self->players;
2107 2293
2108 warn "resetting map ", $self->path; 2294 warn "resetting map ", $self->path, "\n";
2109 2295
2110 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2111 2297
2112 # need to save uniques path 2298 # need to save uniques path
2113 unless ($self->{deny_save}) { 2299 unless ($self->{deny_save}) {
2118 } 2304 }
2119 2305
2120 delete $cf::MAP{$self->path}; 2306 delete $cf::MAP{$self->path};
2121 2307
2122 $self->deactivate; 2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2123 $self->clear; 2310 $self->clear;
2124
2125 $_->clear_links_to ($self) for values %cf::MAP;
2126 2311
2127 $self->unlink_save; 2312 $self->unlink_save;
2128 $self->destroy; 2313 $self->destroy;
2129} 2314}
2130 2315
2197 2382
2198sub unique_maps() { 2383sub unique_maps() {
2199 [ 2384 [
2200 map { 2385 map {
2201 utf8::decode $_; 2386 utf8::decode $_;
2202 /\.map$/ 2387 s/\.map$//; # TODO future compatibility hack
2388 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2389 ? ()
2203 ? normalise $_ 2390 : normalise $_
2204 : ()
2205 } @{ aio_readdir $UNIQUEDIR or [] } 2391 } @{ aio_readdir $UNIQUEDIR or [] }
2206 ] 2392 ]
2207} 2393}
2208 2394
2209package cf; 2395=item cf::map::static_maps
2396
2397Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2398file in the shared directory excluding F</styles> and F</editor>). May
2399block.
2400
2401=cut
2402
2403sub static_maps() {
2404 my @dirs = "";
2405 my @maps;
2406
2407 while (@dirs) {
2408 my $dir = shift @dirs;
2409
2410 next if $dir eq "/styles" || $dir eq "/editor";
2411
2412 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2413 or return;
2414
2415 for (@$files) {
2416 s/\.map$// or next;
2417 utf8::decode $_;
2418 push @maps, "$dir/$_";
2419 }
2420
2421 push @dirs, map "$dir/$_", @$dirs;
2422 }
2423
2424 \@maps
2425}
2210 2426
2211=back 2427=back
2212 2428
2213=head3 cf::object 2429=head3 cf::object
2214 2430
2218 2434
2219=over 4 2435=over 4
2220 2436
2221=item $ob->inv_recursive 2437=item $ob->inv_recursive
2222 2438
2223Returns the inventory of the object _and_ their inventories, recursively. 2439Returns the inventory of the object I<and> their inventories, recursively,
2440but I<not> the object itself.
2224 2441
2225=cut 2442=cut
2226 2443
2227sub inv_recursive_; 2444sub inv_recursive_;
2228sub inv_recursive_ { 2445sub inv_recursive_ {
2233 inv_recursive_ inv $_[0] 2450 inv_recursive_ inv $_[0]
2234} 2451}
2235 2452
2236=item $ref = $ob->ref 2453=item $ref = $ob->ref
2237 2454
2238creates and returns a persistent reference to an objetc that can be stored as a string. 2455Creates and returns a persistent reference to an object that can be stored as a string.
2239 2456
2240=item $ob = cf::object::deref ($refstring) 2457=item $ob = cf::object::deref ($refstring)
2241 2458
2242returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2459returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2243even if the object actually exists. May block. 2460even if the object actually exists. May block.
2245=cut 2462=cut
2246 2463
2247sub deref { 2464sub deref {
2248 my ($ref) = @_; 2465 my ($ref) = @_;
2249 2466
2250 # temporary compatibility#TODO#remove
2251 $ref =~ s{^<}{player/<};
2252
2253 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2467 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2254 my ($uuid, $name) = ($1, $2); 2468 my ($uuid, $name) = ($1, $2);
2255 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2469 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2256 or return; 2470 or return;
2257 $pl->ob->uuid eq $uuid 2471 $pl->ob->uuid eq $uuid
2258 or return; 2472 or return;
2278can be C<undef>. Does the right thing when the player is currently in a 2492can be C<undef>. Does the right thing when the player is currently in a
2279dialogue with the given NPC character. 2493dialogue with the given NPC character.
2280 2494
2281=cut 2495=cut
2282 2496
2497our $SAY_CHANNEL = {
2498 id => "say",
2499 title => "Map",
2500 reply => "say ",
2501 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2502};
2503
2504our $CHAT_CHANNEL = {
2505 id => "chat",
2506 title => "Chat",
2507 reply => "chat ",
2508 tooltip => "Player chat and shouts, global to the server.",
2509};
2510
2283# rough implementation of a future "reply" method that works 2511# rough implementation of a future "reply" method that works
2284# with dialog boxes. 2512# with dialog boxes.
2285#TODO: the first argument must go, split into a $npc->reply_to ( method 2513#TODO: the first argument must go, split into a $npc->reply_to ( method
2286sub cf::object::player::reply($$$;$) { 2514sub cf::object::player::reply($$$;$) {
2287 my ($self, $npc, $msg, $flags) = @_; 2515 my ($self, $npc, $msg, $flags) = @_;
2298 my $dialog = $pl->{npc_dialog}; 2526 my $dialog = $pl->{npc_dialog};
2299 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2527 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2300 2528
2301 } else { 2529 } else {
2302 $msg = $npc->name . " says: $msg" if $npc; 2530 $msg = $npc->name . " says: $msg" if $npc;
2303 $self->message ($msg, $flags); 2531 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2304 } 2532 }
2305 } 2533 }
2306} 2534}
2307 2535
2308=item $object->send_msg ($channel, $msg, $color, [extra...]) 2536=item $object->send_msg ($channel, $msg, $color, [extra...])
2333 2561
2334=item $player_object->enter_link 2562=item $player_object->enter_link
2335 2563
2336Freezes the player and moves him/her to a special map (C<{link}>). 2564Freezes the player and moves him/her to a special map (C<{link}>).
2337 2565
2338The player should be reasonably safe there for short amounts of time. You 2566The player should be reasonably safe there for short amounts of time (e.g.
2339I<MUST> call C<leave_link> as soon as possible, though. 2567for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2568though, as the palyer cannot control the character while it is on the link
2569map.
2340 2570
2341Will never block. 2571Will never block.
2342 2572
2343=item $player_object->leave_link ($map, $x, $y) 2573=item $player_object->leave_link ($map, $x, $y)
2344 2574
2396 ($x, $y) = (-1, -1) 2626 ($x, $y) = (-1, -1)
2397 unless (defined $x) && (defined $y); 2627 unless (defined $x) && (defined $y);
2398 2628
2399 # use -1 or undef as default coordinates, not 0, 0 2629 # use -1 or undef as default coordinates, not 0, 0
2400 ($x, $y) = ($map->enter_x, $map->enter_y) 2630 ($x, $y) = ($map->enter_x, $map->enter_y)
2401 if $x <=0 && $y <= 0; 2631 if $x <= 0 && $y <= 0;
2402 2632
2403 $map->load; 2633 $map->load;
2404 $map->load_neighbours; 2634 $map->load_neighbours;
2405 2635
2406 return unless $self->contr->active; 2636 return unless $self->contr->active;
2407 $self->activate_recursive;
2408 2637
2409 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2410 $self->enter_map ($map, $x, $y); 2639 $self->enter_map ($map, $x, $y);
2640
2641 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive;
2411} 2643}
2412 2644
2413=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2414 2646
2415Moves the player to the given map-path and coordinates by first freezing 2647Moves the player to the given map-path and coordinates by first freezing
2416her, loading and preparing them map, calling the provided $check callback 2648her, loading and preparing them map, calling the provided $check callback
2417that has to return the map if sucecssful, and then unfreezes the player on 2649that has to return the map if sucecssful, and then unfreezes the player on
2418the new (success) or old (failed) map position. In either case, $done will 2650the new (success) or old (failed) map position. In either case, $done will
2419be called at the end of this process. 2651be called at the end of this process.
2420 2652
2653Note that $check will be called with a potentially non-loaded map, so if
2654it needs a loaded map it has to call C<< ->load >>.
2655
2421=cut 2656=cut
2422 2657
2423our $GOTOGEN; 2658our $GOTOGEN;
2424 2659
2425sub cf::object::player::goto { 2660sub cf::object::player::goto {
2429 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2664 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2430 2665
2431 $self->enter_link; 2666 $self->enter_link;
2432 2667
2433 (async { 2668 (async {
2669 $Coro::current->{desc} = "player::goto $path $x $y";
2670
2671 # *tag paths override both path and x|y
2672 if ($path =~ /^\*(.*)$/) {
2673 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2674 my $ob = $obs[rand @obs];
2675
2676 # see if we actually can go there
2677 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2678 $ob = $obs[rand @obs];
2679 } else {
2680 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2681 }
2682 # else put us there anyways for now #d#
2683
2684 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2685 } else {
2686 ($path, $x, $y) = (undef, undef, undef);
2687 }
2688 }
2689
2434 my $map = eval { 2690 my $map = eval {
2435 my $map = cf::map::find $path; 2691 my $map = defined $path ? cf::map::find $path : undef;
2436 2692
2437 if ($map) { 2693 if ($map) {
2438 $map = $map->customise_for ($self); 2694 $map = $map->customise_for ($self);
2439 $map = $check->($map) if $check && $map; 2695 $map = $check->($map) if $check && $map;
2440 } else { 2696 } else {
2441 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2697 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2442 } 2698 }
2443 2699
2444 $map 2700 $map
2445 }; 2701 };
2446 2702
2482} 2738}
2483 2739
2484sub prepare_random_map { 2740sub prepare_random_map {
2485 my ($exit) = @_; 2741 my ($exit) = @_;
2486 2742
2487 my $guard = cf::lock_acquire "exit_prepare:$exit";
2488
2489 # all this does is basically replace the /! path by 2743 # all this does is basically replace the /! path by
2490 # a new random map path (?random/...) with a seed 2744 # a new random map path (?random/...) with a seed
2491 # that depends on the exit object 2745 # that depends on the exit object
2492 2746
2493 my $rmp = parse_random_map_params $exit->msg; 2747 my $rmp = parse_random_map_params $exit->msg;
2495 if ($exit->map) { 2749 if ($exit->map) {
2496 $rmp->{region} = $exit->region->name; 2750 $rmp->{region} = $exit->region->name;
2497 $rmp->{origin_map} = $exit->map->path; 2751 $rmp->{origin_map} = $exit->map->path;
2498 $rmp->{origin_x} = $exit->x; 2752 $rmp->{origin_x} = $exit->x;
2499 $rmp->{origin_y} = $exit->y; 2753 $rmp->{origin_y} = $exit->y;
2754
2755 $exit->map->touch;
2500 } 2756 }
2501 2757
2502 $rmp->{random_seed} ||= $exit->random_seed; 2758 $rmp->{random_seed} ||= $exit->random_seed;
2503 2759
2504 my $data = cf::to_json $rmp; 2760 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2505 my $md5 = Digest::MD5::md5_hex $data; 2761 my $md5 = Digest::MD5::md5_hex $data;
2506 my $meta = "$RANDOMDIR/$md5.meta"; 2762 my $meta = "$RANDOMDIR/$md5.meta";
2507 2763
2508 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2764 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2509 aio_write $fh, 0, (length $data), $data, 0; 2765 aio_write $fh, 0, (length $data), $data, 0;
2510 undef $fh; 2766 undef $fh;
2511 aio_rename "$meta~", $meta; 2767 aio_rename "$meta~", $meta;
2512 2768
2769 my $slaying = "?random/$md5";
2770
2771 if ($exit->valid) {
2513 $exit->slaying ("?random/$md5"); 2772 $exit->slaying ("?random/$md5");
2514 $exit->msg (undef); 2773 $exit->msg (undef);
2774 }
2515 } 2775 }
2516} 2776}
2517 2777
2518sub cf::object::player::enter_exit { 2778sub cf::object::player::enter_exit {
2519 my ($self, $exit) = @_; 2779 my ($self, $exit) = @_;
2520 2780
2521 return unless $self->type == cf::PLAYER; 2781 return unless $self->type == cf::PLAYER;
2522 2782
2523 if ($exit->slaying eq "/!") {
2524 #TODO: this should de-fi-ni-te-ly not be a sync-job
2525 # the problem is that $exit might not survive long enough
2526 # so it needs to be done right now, right here
2527 cf::sync_job { prepare_random_map $exit };
2528 }
2529
2530 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2531 my $hp = $exit->stats->hp;
2532 my $sp = $exit->stats->sp;
2533
2534 $self->enter_link; 2783 $self->enter_link;
2535 2784
2536 # if exit is damned, update players death & WoR home-position
2537 $self->contr->savebed ($slaying, $hp, $sp)
2538 if $exit->flag (FLAG_DAMNED);
2539
2540 (async { 2785 (async {
2541 $self->deactivate_recursive; # just to be sure 2786 $Coro::current->{desc} = "enter_exit";
2787
2542 unless (eval { 2788 unless (eval {
2789 $self->deactivate_recursive; # just to be sure
2790
2791 # random map handling
2792 {
2793 my $guard = cf::lock_acquire "exit_prepare:$exit";
2794
2795 prepare_random_map $exit
2796 if $exit->slaying eq "/!";
2797 }
2798
2799 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2800 my $x = $exit->stats->hp;
2801 my $y = $exit->stats->sp;
2802
2543 $self->goto ($slaying, $hp, $sp); 2803 $self->goto ($map, $x, $y);
2544 2804
2805 # if exit is damned, update players death & WoR home-position
2806 $self->contr->savebed ($map, $x, $y)
2807 if $exit->flag (cf::FLAG_DAMNED);
2808
2545 1; 2809 1
2546 }) { 2810 }) {
2547 $self->message ("Something went wrong deep within the crossfire server. " 2811 $self->message ("Something went wrong deep within the deliantra server. "
2548 . "I'll try to bring you back to the map you were before. " 2812 . "I'll try to bring you back to the map you were before. "
2549 . "Please report this to the dungeon master!", 2813 . "Please report this to the dungeon master!",
2550 cf::NDI_UNIQUE | cf::NDI_RED); 2814 cf::NDI_UNIQUE | cf::NDI_RED);
2551 2815
2552 warn "ERROR in enter_exit: $@"; 2816 warn "ERROR in enter_exit: $@";
2569sub cf::client::send_drawinfo { 2833sub cf::client::send_drawinfo {
2570 my ($self, $text, $flags) = @_; 2834 my ($self, $text, $flags) = @_;
2571 2835
2572 utf8::encode $text; 2836 utf8::encode $text;
2573 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2837 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2838}
2839
2840=item $client->send_big_packet ($pkt)
2841
2842Like C<send_packet>, but tries to compress large packets, and fragments
2843them as required.
2844
2845=cut
2846
2847our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2848
2849sub cf::client::send_big_packet {
2850 my ($self, $pkt) = @_;
2851
2852 # try lzf for large packets
2853 $pkt = "lzf " . Compress::LZF::compress $pkt
2854 if 1024 <= length $pkt and $self->{can_lzf};
2855
2856 # split very large packets
2857 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2858 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2859 $pkt = "frag";
2860 }
2861
2862 $self->send_packet ($pkt);
2574} 2863}
2575 2864
2576=item $client->send_msg ($channel, $msg, $color, [extra...]) 2865=item $client->send_msg ($channel, $msg, $color, [extra...])
2577 2866
2578Send a drawinfo or msg packet to the client, formatting the msg for the 2867Send a drawinfo or msg packet to the client, formatting the msg for the
2580the message, with C<log> being the default. If C<$color> is negative, suppress 2869the message, with C<log> being the default. If C<$color> is negative, suppress
2581the message unless the client supports the msg packet. 2870the message unless the client supports the msg packet.
2582 2871
2583=cut 2872=cut
2584 2873
2874# non-persistent channels (usually the info channel)
2585our %CHANNEL = ( 2875our %CHANNEL = (
2876 "c/motd" => {
2877 id => "infobox",
2878 title => "MOTD",
2879 reply => undef,
2880 tooltip => "The message of the day",
2881 },
2586 "c/identify" => { 2882 "c/identify" => {
2587 id => "identify", 2883 id => "infobox",
2588 title => "Identify", 2884 title => "Identify",
2589 reply => undef, 2885 reply => undef,
2590 tooltip => "Items recently identified", 2886 tooltip => "Items recently identified",
2591 }, 2887 },
2592 "c/examine" => { 2888 "c/examine" => {
2593 id => "examine", 2889 id => "infobox",
2594 title => "Examine", 2890 title => "Examine",
2595 reply => undef, 2891 reply => undef,
2596 tooltip => "Signs and other items you examined", 2892 tooltip => "Signs and other items you examined",
2597 }, 2893 },
2894 "c/shopinfo" => {
2895 id => "infobox",
2896 title => "Shop Info",
2897 reply => undef,
2898 tooltip => "What your bargaining skill tells you about the shop",
2899 },
2900 "c/book" => {
2901 id => "infobox",
2902 title => "Book",
2903 reply => undef,
2904 tooltip => "The contents of a note or book",
2905 },
2906 "c/lookat" => {
2907 id => "infobox",
2908 title => "Look",
2909 reply => undef,
2910 tooltip => "What you saw there",
2911 },
2912 "c/who" => {
2913 id => "infobox",
2914 title => "Players",
2915 reply => undef,
2916 tooltip => "Shows players who are currently online",
2917 },
2918 "c/body" => {
2919 id => "infobox",
2920 title => "Body Parts",
2921 reply => undef,
2922 tooltip => "Shows which body parts you posess and are available",
2923 },
2924 "c/statistics" => {
2925 id => "infobox",
2926 title => "Statistics",
2927 reply => undef,
2928 tooltip => "Shows your primary statistics",
2929 },
2930 "c/skills" => {
2931 id => "infobox",
2932 title => "Skills",
2933 reply => undef,
2934 tooltip => "Shows your experience per skill and item power",
2935 },
2936 "c/shopitems" => {
2937 id => "infobox",
2938 title => "Shop Items",
2939 reply => undef,
2940 tooltip => "Shows the items currently for sale in this shop",
2941 },
2942 "c/resistances" => {
2943 id => "infobox",
2944 title => "Resistances",
2945 reply => undef,
2946 tooltip => "Shows your resistances",
2947 },
2948 "c/pets" => {
2949 id => "infobox",
2950 title => "Pets",
2951 reply => undef,
2952 tooltip => "Shows information abotu your pets/a specific pet",
2953 },
2954 "c/perceiveself" => {
2955 id => "infobox",
2956 title => "Perceive Self",
2957 reply => undef,
2958 tooltip => "You gained detailed knowledge about yourself",
2959 },
2960 "c/uptime" => {
2961 id => "infobox",
2962 title => "Uptime",
2963 reply => undef,
2964 tooltip => "How long the server has been running since last restart",
2965 },
2966 "c/mapinfo" => {
2967 id => "infobox",
2968 title => "Map Info",
2969 reply => undef,
2970 tooltip => "Information related to the maps",
2971 },
2972 "c/party" => {
2973 id => "party",
2974 title => "Party",
2975 reply => "gsay ",
2976 tooltip => "Messages and chat related to your party",
2977 },
2978 "c/death" => {
2979 id => "death",
2980 title => "Death",
2981 reply => undef,
2982 tooltip => "Reason for and more info about your most recent death",
2983 },
2984 "c/say" => $SAY_CHANNEL,
2985 "c/chat" => $CHAT_CHANNEL,
2598); 2986);
2599 2987
2600sub cf::client::send_msg { 2988sub cf::client::send_msg {
2601 my ($self, $channel, $msg, $color, @extra) = @_; 2989 my ($self, $channel, $msg, $color, @extra) = @_;
2602 2990
2603 $msg = $self->pl->expand_cfpod ($msg); 2991 $msg = $self->pl->expand_cfpod ($msg)
2992 unless $color & cf::NDI_VERBATIM;
2604 2993
2605 $color &= cf::NDI_CLIENT_MASK; # just in case... 2994 $color &= cf::NDI_CLIENT_MASK; # just in case...
2606 2995
2607 # check predefined channels, for the benefit of C 2996 # check predefined channels, for the benefit of C
2608 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2997 if ($CHANNEL{$channel}) {
2998 $channel = $CHANNEL{$channel};
2609 2999
3000 $self->ext_msg (channel_info => $channel);
3001 $channel = $channel->{id};
3002
2610 if (ref $channel) { 3003 } elsif (ref $channel) {
2611 # send meta info to client, if not yet sent 3004 # send meta info to client, if not yet sent
2612 unless (exists $self->{channel}{$channel->{id}}) { 3005 unless (exists $self->{channel}{$channel->{id}}) {
2613 $self->{channel}{$channel->{id}} = $channel; 3006 $self->{channel}{$channel->{id}} = $channel;
2614 $self->ext_msg (channel_info => $channel) 3007 $self->ext_msg (channel_info => $channel);
2615 if $self->can_msg;
2616 } 3008 }
2617 3009
2618 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2619 } 3011 }
2620 3012
2621 return unless @extra || length $msg; 3013 return unless @extra || length $msg;
2622 3014
2623 if ($self->can_msg) {
2624 # default colour, mask it out 3015 # default colour, mask it out
2625 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3016 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2626 if $color & cf::NDI_DEF; 3017 if $color & cf::NDI_DEF;
2627 3018
2628 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3019 my $pkt = "msg "
3020 . $self->{json_coder}->encode (
2629 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3021 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2630 } else { 3022 );
2631 if ($color >= 0) {
2632 # replace some tags by gcfclient-compatible ones
2633 for ($msg) {
2634 1 while
2635 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2636 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2637 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2638 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2639 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2640 }
2641 3023
2642 $color &= cf::NDI_COLOR_MASK; 3024 $self->send_big_packet ($pkt);
2643
2644 utf8::encode $msg;
2645
2646 if (0 && $msg =~ /\[/) {
2647 # COMMAND/INFO
2648 $self->send_packet ("drawextinfo $color 10 8 $msg")
2649 } else {
2650 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2651 $self->send_packet ("drawinfo $color $msg")
2652 }
2653 }
2654 }
2655} 3025}
2656 3026
2657=item $client->ext_msg ($type, @msg) 3027=item $client->ext_msg ($type, @msg)
2658 3028
2659Sends an ext event to the client. 3029Sends an ext event to the client.
2662 3032
2663sub cf::client::ext_msg($$@) { 3033sub cf::client::ext_msg($$@) {
2664 my ($self, $type, @msg) = @_; 3034 my ($self, $type, @msg) = @_;
2665 3035
2666 if ($self->extcmd == 2) { 3036 if ($self->extcmd == 2) {
2667 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3037 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2668 } elsif ($self->extcmd == 1) { # TODO: remove 3038 } elsif ($self->extcmd == 1) { # TODO: remove
2669 push @msg, msgtype => "event_$type"; 3039 push @msg, msgtype => "event_$type";
2670 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2671 } 3041 }
2672} 3042}
2673 3043
2674=item $client->ext_reply ($msgid, @msg) 3044=item $client->ext_reply ($msgid, @msg)
2675 3045
2679 3049
2680sub cf::client::ext_reply($$@) { 3050sub cf::client::ext_reply($$@) {
2681 my ($self, $id, @msg) = @_; 3051 my ($self, $id, @msg) = @_;
2682 3052
2683 if ($self->extcmd == 2) { 3053 if ($self->extcmd == 2) {
2684 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3054 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2685 } elsif ($self->extcmd == 1) { 3055 } elsif ($self->extcmd == 1) {
2686 #TODO: version 1, remove 3056 #TODO: version 1, remove
2687 unshift @msg, msgtype => "reply", msgid => $id; 3057 unshift @msg, msgtype => "reply", msgid => $id;
2688 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2689 } 3059 }
2690} 3060}
2691 3061
2692=item $success = $client->query ($flags, "text", \&cb) 3062=item $success = $client->query ($flags, "text", \&cb)
2693 3063
2794 3164
2795 $coro 3165 $coro
2796} 3166}
2797 3167
2798cf::client->attach ( 3168cf::client->attach (
2799 on_destroy => sub { 3169 on_client_destroy => sub {
2800 my ($ns) = @_; 3170 my ($ns) = @_;
2801 3171
2802 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3172 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2803 }, 3173 },
2804); 3174);
2820our $safe_hole = new Safe::Hole; 3190our $safe_hole = new Safe::Hole;
2821 3191
2822$SIG{FPE} = 'IGNORE'; 3192$SIG{FPE} = 'IGNORE';
2823 3193
2824$safe->permit_only (Opcode::opset qw( 3194$safe->permit_only (Opcode::opset qw(
2825 :base_core :base_mem :base_orig :base_math 3195 :base_core :base_mem :base_orig :base_math :base_loop
2826 grepstart grepwhile mapstart mapwhile 3196 grepstart grepwhile mapstart mapwhile
2827 sort time 3197 sort time
2828)); 3198));
2829 3199
2830# here we export the classes and methods available to script code 3200# here we export the classes and methods available to script code
2832=pod 3202=pod
2833 3203
2834The following functions and methods are available within a safe environment: 3204The following functions and methods are available within a safe environment:
2835 3205
2836 cf::object 3206 cf::object
2837 contr pay_amount pay_player map x y force_find force_add 3207 contr pay_amount pay_player map x y force_find force_add destroy
2838 insert remove name archname title slaying race decrease_ob_nr 3208 insert remove name archname title slaying race decrease split
3209 value
2839 3210
2840 cf::object::player 3211 cf::object::player
2841 player 3212 player
2842 3213
2843 cf::player 3214 cf::player
2848 3219
2849=cut 3220=cut
2850 3221
2851for ( 3222for (
2852 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3223 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2853 insert remove inv name archname title slaying race 3224 insert remove inv nrof name archname title slaying race
2854 decrease_ob_nr)], 3225 decrease split destroy change_exp value msg lore send_msg)],
2855 ["cf::object::player" => qw(player)], 3226 ["cf::object::player" => qw(player)],
2856 ["cf::player" => qw(peaceful)], 3227 ["cf::player" => qw(peaceful send_msg)],
2857 ["cf::map" => qw(trigger)], 3228 ["cf::map" => qw(trigger)],
2858) { 3229) {
2859 no strict 'refs'; 3230 no strict 'refs';
2860 my ($pkg, @funs) = @$_; 3231 my ($pkg, @funs) = @$_;
2861 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2879 3250
2880 my $qcode = $code; 3251 my $qcode = $code;
2881 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3252 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2882 $qcode =~ s/\n/\\n/g; 3253 $qcode =~ s/\n/\\n/g;
2883 3254
3255 %vars = (_dummy => 0) unless %vars;
3256
3257 my @res;
2884 local $_; 3258 local $_;
2885 local @safe::cf::_safe_eval_args = values %vars;
2886 3259
2887 my $eval = 3260 my $eval =
2888 "do {\n" 3261 "do {\n"
2889 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3262 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2890 . "#line 0 \"{$qcode}\"\n" 3263 . "#line 0 \"{$qcode}\"\n"
2891 . $code 3264 . $code
2892 . "\n}" 3265 . "\n}"
2893 ; 3266 ;
2894 3267
3268 if ($CFG{safe_eval}) {
2895 sub_generation_inc; 3269 sub_generation_inc;
3270 local @safe::cf::_safe_eval_args = values %vars;
2896 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3271 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2897 sub_generation_inc; 3272 sub_generation_inc;
3273 } else {
3274 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval;
3276 }
2898 3277
2899 if ($@) { 3278 if ($@) {
2900 warn "$@"; 3279 warn "$@";
2901 warn "while executing safe code '$code'\n"; 3280 warn "while executing safe code '$code'\n";
2902 warn "with arguments " . (join " ", %vars) . "\n"; 3281 warn "with arguments " . (join " ", %vars) . "\n";
2921=cut 3300=cut
2922 3301
2923sub register_script_function { 3302sub register_script_function {
2924 my ($fun, $cb) = @_; 3303 my ($fun, $cb) = @_;
2925 3304
2926 no strict 'refs'; 3305 $fun = "safe::$fun" if $CFG{safe_eval};
2927 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3306 *$fun = $safe_hole->wrap ($cb);
2928} 3307}
2929 3308
2930=back 3309=back
2931 3310
2932=cut 3311=cut
2953 3332
2954 $facedata->{version} == 2 3333 $facedata->{version} == 2
2955 or cf::cleanup "$path: version mismatch, cannot proceed."; 3334 or cf::cleanup "$path: version mismatch, cannot proceed.";
2956 3335
2957 # patch in the exptable 3336 # patch in the exptable
3337 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2958 $facedata->{resource}{"res/exp_table"} = { 3338 $facedata->{resource}{"res/exp_table"} = {
2959 type => FT_RSRC, 3339 type => FT_RSRC,
2960 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3340 data => $exp_table,
3341 hash => (Digest::MD5::md5 $exp_table),
2961 }; 3342 };
2962 cf::cede_to_tick; 3343 cf::cede_to_tick;
2963 3344
2964 { 3345 {
2965 my $faces = $facedata->{faceinfo}; 3346 my $faces = $facedata->{faceinfo};
2966 3347
2967 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
2968 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3349 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3350
2969 cf::face::set_visibility $idx, $info->{visibility}; 3351 cf::face::set_visibility $idx, $info->{visibility};
2970 cf::face::set_magicmap $idx, $info->{magicmap}; 3352 cf::face::set_magicmap $idx, $info->{magicmap};
2971 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3353 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2972 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3354 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2973 3355
2974 cf::cede_to_tick; 3356 cf::cede_to_tick;
2975 } 3357 }
2976 3358
2977 while (my ($face, $info) = each %$faces) { 3359 while (my ($face, $info) = each %$faces) {
2978 next unless $info->{smooth}; 3360 next unless $info->{smooth};
3361
2979 my $idx = cf::face::find $face 3362 my $idx = cf::face::find $face
2980 or next; 3363 or next;
3364
2981 if (my $smooth = cf::face::find $info->{smooth}) { 3365 if (my $smooth = cf::face::find $info->{smooth}) {
2982 cf::face::set_smooth $idx, $smooth; 3366 cf::face::set_smooth $idx, $smooth;
2983 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3367 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2984 } else { 3368 } else {
2985 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3369 warn "smooth face '$info->{smooth}' not found for face '$face'";
2999 3383
3000 cf::anim::invalidate_all; # d'oh 3384 cf::anim::invalidate_all; # d'oh
3001 } 3385 }
3002 3386
3003 { 3387 {
3004 # TODO: for gcfclient pleasure, we should give resources
3005 # that gcfclient doesn't grok a >10000 face index.
3006 my $res = $facedata->{resource}; 3388 my $res = $facedata->{resource};
3007 3389
3008 my $soundconf = delete $res->{"res/sound.conf"};
3009
3010 while (my ($name, $info) = each %$res) { 3390 while (my ($name, $info) = each %$res) {
3391 if (defined $info->{type}) {
3011 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3392 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3012 my $data;
3013 3393
3014 if ($info->{type} & 1) { 3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3015 # prepend meta info 3395 cf::face::set_type $idx, $info->{type};
3016
3017 my $meta = $enc->encode ({
3018 name => $name,
3019 %{ $info->{meta} || {} },
3020 });
3021
3022 $data = pack "(w/a*)*", $meta, $info->{data};
3023 } else { 3396 } else {
3024 $data = $info->{data}; 3397 $RESOURCE{$name} = $info;
3025 } 3398 }
3026 3399
3027 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3028 cf::face::set_type $idx, $info->{type};
3029
3030 cf::cede_to_tick; 3400 cf::cede_to_tick;
3031 } 3401 }
3032
3033 if ($soundconf) {
3034 $soundconf = $enc->decode (delete $soundconf->{data});
3035
3036 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3037 my $sound = $soundconf->{compat}[$_]
3038 or next;
3039
3040 my $face = cf::face::find "sound/$sound->[1]";
3041 cf::sound::set $sound->[0] => $face;
3042 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3043 }
3044
3045 while (my ($k, $v) = each %{$soundconf->{event}}) {
3046 my $face = cf::face::find "sound/$v";
3047 cf::sound::set $k => $face;
3048 }
3049 }
3050 } 3402 }
3403
3404 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3051 3405
3052 1 3406 1
3053} 3407}
3408
3409cf::global->attach (on_resource_update => sub {
3410 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3411 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3412
3413 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3414 my $sound = $soundconf->{compat}[$_]
3415 or next;
3416
3417 my $face = cf::face::find "sound/$sound->[1]";
3418 cf::sound::set $sound->[0] => $face;
3419 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3420 }
3421
3422 while (my ($k, $v) = each %{$soundconf->{event}}) {
3423 my $face = cf::face::find "sound/$v";
3424 cf::sound::set $k => $face;
3425 }
3426 }
3427});
3054 3428
3055register_exticmd fx_want => sub { 3429register_exticmd fx_want => sub {
3056 my ($ns, $want) = @_; 3430 my ($ns, $want) = @_;
3057 3431
3058 while (my ($k, $v) = each %$want) { 3432 while (my ($k, $v) = each %$want) {
3059 $ns->fx_want ($k, $v); 3433 $ns->fx_want ($k, $v);
3060 } 3434 }
3061}; 3435};
3436
3437sub load_resource_file($) {
3438 my $guard = lock_acquire "load_resource_file";
3439
3440 my $status = load_resource_file_ $_[0];
3441 get_slot 0.1, 100;
3442 cf::arch::commit_load;
3443
3444 $status
3445}
3062 3446
3063sub reload_regions { 3447sub reload_regions {
3064 # HACK to clear player env face cache, we need some signal framework 3448 # HACK to clear player env face cache, we need some signal framework
3065 # for this (global event?) 3449 # for this (global event?)
3066 %ext::player_env::MUSIC_FACE_CACHE = (); 3450 %ext::player_env::MUSIC_FACE_CACHE = ();
3080} 3464}
3081 3465
3082sub reload_archetypes { 3466sub reload_archetypes {
3083 load_resource_file "$DATADIR/archetypes" 3467 load_resource_file "$DATADIR/archetypes"
3084 or die "unable to load archetypes\n"; 3468 or die "unable to load archetypes\n";
3085 #d# NEED to laod twice to resolve forward references
3086 # this really needs to be done in an extra post-pass
3087 # (which needs to be synchronous, so solve it differently)
3088 load_resource_file "$DATADIR/archetypes"
3089 or die "unable to load archetypes\n";
3090} 3469}
3091 3470
3092sub reload_treasures { 3471sub reload_treasures {
3093 load_resource_file "$DATADIR/treasures" 3472 load_resource_file "$DATADIR/treasures"
3094 or die "unable to load treasurelists\n"; 3473 or die "unable to load treasurelists\n";
3095} 3474}
3096 3475
3097sub reload_resources { 3476sub reload_resources {
3098 warn "reloading resource files...\n"; 3477 warn "reloading resource files...\n";
3099 3478
3479 reload_facedata;
3480 reload_archetypes;
3100 reload_regions; 3481 reload_regions;
3101 reload_facedata;
3102 #reload_archetypes;#d#
3103 reload_archetypes;
3104 reload_treasures; 3482 reload_treasures;
3105 3483
3106 warn "finished reloading resource files\n"; 3484 warn "finished reloading resource files\n";
3107} 3485}
3108 3486
3109sub init {
3110 reload_resources;
3111}
3112
3113sub reload_config { 3487sub reload_config {
3488 warn "reloading config file...\n";
3489
3114 open my $fh, "<:utf8", "$CONFDIR/config" 3490 open my $fh, "<:utf8", "$CONFDIR/config"
3115 or return; 3491 or return;
3116 3492
3117 local $/; 3493 local $/;
3118 *CFG = YAML::Syck::Load <$fh>; 3494 *CFG = YAML::XS::Load scalar <$fh>;
3119 3495
3120 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3121 3497
3122 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3498 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3123 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3499 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3127 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3128 and die "WARNING: m(un)lockall failed: $!\n"; 3504 and die "WARNING: m(un)lockall failed: $!\n";
3129 }; 3505 };
3130 warn $@ if $@; 3506 warn $@ if $@;
3131 } 3507 }
3508
3509 warn "finished reloading resource files\n";
3510}
3511
3512sub pidfile() {
3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3514 or die "$PIDFILE: $!";
3515 flock $fh, &Fcntl::LOCK_EX
3516 or die "$PIDFILE: flock: $!";
3517 $fh
3518}
3519
3520# make sure only one server instance is running at any one time
3521sub atomic {
3522 my $fh = pidfile;
3523
3524 my $pid = <$fh>;
3525 kill 9, $pid if $pid > 0;
3526
3527 seek $fh, 0, 0;
3528 print $fh $$;
3529}
3530
3531sub main_loop {
3532 warn "EV::loop starting\n";
3533 if (1) {
3534 EV::loop;
3535 }
3536 warn "EV::loop returned\n";
3537 goto &main_loop unless $REALLY_UNLOOP;
3132} 3538}
3133 3539
3134sub main { 3540sub main {
3541 cf::init_globals; # initialise logging
3542
3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3544 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547
3548 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3549
3135 # we must not ever block the main coroutine 3550 # we must not ever block the main coroutine
3136 local $Coro::idle = sub { 3551 local $Coro::idle = sub {
3137 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3552 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3138 (async { 3553 (async {
3139 Event::one_event; 3554 $Coro::current->{desc} = "IDLE BUG HANDLER";
3555 EV::loop EV::LOOP_ONESHOT;
3140 })->prio (Coro::PRIO_MAX); 3556 })->prio (Coro::PRIO_MAX);
3141 }; 3557 };
3142 3558
3559 evthread_start IO::AIO::poll_fileno;
3560
3561 cf::sync_job {
3562 cf::init_experience;
3563 cf::init_anim;
3564 cf::init_attackmess;
3565 cf::init_dynamic;
3566
3567 cf::load_settings;
3568 cf::load_materials;
3569
3570 reload_resources;
3143 reload_config; 3571 reload_config;
3144 db_init; 3572 db_init;
3573
3574 cf::init_uuid;
3575 cf::init_signals;
3576 cf::init_skills;
3577
3578 cf::init_beforeplay;
3579
3580 atomic;
3581
3145 load_extensions; 3582 load_extensions;
3146 3583
3147 $TICK_WATCHER->start; 3584 utime time, time, $RUNTIMEFILE;
3148 Event::loop; 3585
3586 # no (long-running) fork's whatsoever before this point(!)
3587 use POSIX ();
3588 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3589
3590 (pop @POST_INIT)->(0) while @POST_INIT;
3591 };
3592
3593 cf::object::thawer::errors_are_fatal 0;
3594
3595 main_loop;
3149} 3596}
3150 3597
3151############################################################################# 3598#############################################################################
3152# initialisation and cleanup 3599# initialisation and cleanup
3153 3600
3154# install some emergency cleanup handlers 3601# install some emergency cleanup handlers
3155BEGIN { 3602BEGIN {
3603 our %SIGWATCHER = ();
3156 for my $signal (qw(INT HUP TERM)) { 3604 for my $signal (qw(INT HUP TERM)) {
3157 Event->signal ( 3605 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3158 reentrant => 0,
3159 data => WF_AUTOCANCEL,
3160 signal => $signal,
3161 prio => 0,
3162 cb => sub {
3163 cf::cleanup "SIG$signal"; 3606 cf::cleanup "SIG$signal";
3164 },
3165 ); 3607 };
3166 } 3608 }
3167} 3609}
3168 3610
3169sub write_runtime { 3611sub write_runtime_sync {
3170 my $runtime = "$LOCALDIR/runtime"; 3612 my $t0 = AE::time;
3171 3613
3172 # first touch the runtime file to show we are still running: 3614 # first touch the runtime file to show we are still running:
3173 # the fsync below can take a very very long time. 3615 # the fsync below can take a very very long time.
3174 3616
3175 IO::AIO::aio_utime $runtime, undef, undef; 3617 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3176 3618
3177 my $guard = cf::lock_acquire "write_runtime"; 3619 my $guard = cf::lock_acquire "write_runtime";
3178 3620
3179 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3621 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3180 or return; 3622 or return;
3181 3623
3182 my $value = $cf::RUNTIME + 90 + 10; 3624 my $value = $cf::RUNTIME + 90 + 10;
3183 # 10 is the runtime save interval, for a monotonic clock 3625 # 10 is the runtime save interval, for a monotonic clock
3184 # 60 allows for the watchdog to kill the server. 3626 # 60 allows for the watchdog to kill the server.
3194 aio_utime $fh, undef, undef; 3636 aio_utime $fh, undef, undef;
3195 3637
3196 close $fh 3638 close $fh
3197 or return; 3639 or return;
3198 3640
3199 aio_rename "$runtime~", $runtime 3641 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3200 and return; 3642 and return;
3201 3643
3202 warn "runtime file written.\n"; 3644 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3203 3645
3204 1 3646 1
3647}
3648
3649our $uuid_lock;
3650our $uuid_skip;
3651
3652sub write_uuid_sync($) {
3653 $uuid_skip ||= $_[0];
3654
3655 return if $uuid_lock;
3656 local $uuid_lock = 1;
3657
3658 my $uuid = "$LOCALDIR/uuid";
3659
3660 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3661 or return;
3662
3663 my $value = uuid_seq uuid_cur;
3664
3665 unless ($value) {
3666 warn "cowardly refusing to write zero uuid value!\n";
3667 return;
3668 }
3669
3670 my $value = uuid_str $value + $uuid_skip;
3671 $uuid_skip = 0;
3672
3673 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3674 and return;
3675
3676 # always fsync - this file is important
3677 aio_fsync $fh
3678 and return;
3679
3680 close $fh
3681 or return;
3682
3683 aio_rename "$uuid~", $uuid
3684 and return;
3685
3686 warn "uuid file written ($value).\n";
3687
3688 1
3689
3690}
3691
3692sub write_uuid($$) {
3693 my ($skip, $sync) = @_;
3694
3695 $sync ? write_uuid_sync $skip
3696 : async { write_uuid_sync $skip };
3205} 3697}
3206 3698
3207sub emergency_save() { 3699sub emergency_save() {
3208 my $freeze_guard = cf::freeze_mainloop; 3700 my $freeze_guard = cf::freeze_mainloop;
3209 3701
3210 warn "enter emergency perl save\n"; 3702 warn "emergency_perl_save: enter\n";
3211 3703
3212 cf::sync_job { 3704 cf::sync_job {
3705 # this is a trade-off: we want to be very quick here, so
3706 # save all maps without fsync, and later call a global sync
3707 # (which in turn might be very very slow)
3708 local $USE_FSYNC = 0;
3709
3213 # use a peculiar iteration method to avoid tripping on perl 3710 # use a peculiar iteration method to avoid tripping on perl
3214 # refcount bugs in for. also avoids problems with players 3711 # refcount bugs in for. also avoids problems with players
3215 # and maps saved/destroyed asynchronously. 3712 # and maps saved/destroyed asynchronously.
3216 warn "begin emergency player save\n"; 3713 warn "emergency_perl_save: begin player save\n";
3217 for my $login (keys %cf::PLAYER) { 3714 for my $login (keys %cf::PLAYER) {
3218 my $pl = $cf::PLAYER{$login} or next; 3715 my $pl = $cf::PLAYER{$login} or next;
3219 $pl->valid or next; 3716 $pl->valid or next;
3717 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3220 $pl->save; 3718 $pl->save;
3221 } 3719 }
3222 warn "end emergency player save\n"; 3720 warn "emergency_perl_save: end player save\n";
3223 3721
3224 warn "begin emergency map save\n"; 3722 warn "emergency_perl_save: begin map save\n";
3225 for my $path (keys %cf::MAP) { 3723 for my $path (keys %cf::MAP) {
3226 my $map = $cf::MAP{$path} or next; 3724 my $map = $cf::MAP{$path} or next;
3227 $map->valid or next; 3725 $map->valid or next;
3228 $map->save; 3726 $map->save;
3229 } 3727 }
3230 warn "end emergency map save\n"; 3728 warn "emergency_perl_save: end map save\n";
3231 3729
3232 warn "begin emergency database checkpoint\n"; 3730 warn "emergency_perl_save: begin database checkpoint\n";
3233 BDB::db_env_txn_checkpoint $DB_ENV; 3731 BDB::db_env_txn_checkpoint $DB_ENV;
3234 warn "end emergency database checkpoint\n"; 3732 warn "emergency_perl_save: end database checkpoint\n";
3733
3734 warn "emergency_perl_save: begin write uuid\n";
3735 write_uuid_sync 1;
3736 warn "emergency_perl_save: end write uuid\n";
3235 }; 3737 };
3236 3738
3739 warn "emergency_perl_save: starting sync()\n";
3740 IO::AIO::aio_sync sub {
3741 warn "emergency_perl_save: finished sync()\n";
3742 };
3743
3237 warn "leave emergency perl save\n"; 3744 warn "emergency_perl_save: leave\n";
3238} 3745}
3239 3746
3240sub post_cleanup { 3747sub post_cleanup {
3241 my ($make_core) = @_; 3748 my ($make_core) = @_;
3242 3749
3243 warn Carp::longmess "post_cleanup backtrace" 3750 warn Carp::longmess "post_cleanup backtrace"
3244 if $make_core; 3751 if $make_core;
3752
3753 my $fh = pidfile;
3754 unlink $PIDFILE if <$fh> == $$;
3755}
3756
3757# a safer delete_package, copied from Symbol
3758sub clear_package($) {
3759 my $pkg = shift;
3760
3761 # expand to full symbol table name if needed
3762 unless ($pkg =~ /^main::.*::$/) {
3763 $pkg = "main$pkg" if $pkg =~ /^::/;
3764 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3765 $pkg .= '::' unless $pkg =~ /::$/;
3766 }
3767
3768 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3769 my $stem_symtab = *{$stem}{HASH};
3770
3771 defined $stem_symtab and exists $stem_symtab->{$leaf}
3772 or return;
3773
3774 # clear all symbols
3775 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3776 for my $name (keys %$leaf_symtab) {
3777 _gv_clear *{"$pkg$name"};
3778# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3779 }
3780 warn "cleared package $pkg\n";#d#
3245} 3781}
3246 3782
3247sub do_reload_perl() { 3783sub do_reload_perl() {
3248 # can/must only be called in main 3784 # can/must only be called in main
3249 if ($Coro::current != $Coro::main) { 3785 if ($Coro::current != $Coro::main) {
3250 warn "can only reload from main coroutine"; 3786 warn "can only reload from main coroutine";
3251 return; 3787 return;
3252 } 3788 }
3253 3789
3790 return if $RELOAD++;
3791
3792 my $t1 = AE::time;
3793
3794 while ($RELOAD) {
3254 warn "reloading..."; 3795 warn "reloading...";
3255 3796
3256 warn "entering sync_job"; 3797 warn "entering sync_job";
3257 3798
3258 cf::sync_job { 3799 cf::sync_job {
3259 cf::write_runtime; # external watchdog should not bark 3800 cf::write_runtime_sync; # external watchdog should not bark
3260 cf::emergency_save; 3801 cf::emergency_save;
3261 cf::write_runtime; # external watchdog should not bark 3802 cf::write_runtime_sync; # external watchdog should not bark
3262 3803
3263 warn "syncing database to disk"; 3804 warn "syncing database to disk";
3264 BDB::db_env_txn_checkpoint $DB_ENV; 3805 BDB::db_env_txn_checkpoint $DB_ENV;
3265 3806
3266 # if anything goes wrong in here, we should simply crash as we already saved 3807 # if anything goes wrong in here, we should simply crash as we already saved
3267 3808
3268 warn "cancelling all WF_AUTOCANCEL watchers";
3269 for (Event::all_watchers) {
3270 $_->cancel if $_->data & WF_AUTOCANCEL;
3271 }
3272
3273 warn "flushing outstanding aio requests"; 3809 warn "flushing outstanding aio requests";
3274 for (;;) {
3275 BDB::flush;
3276 IO::AIO::flush;
3277 Coro::cede;
3278 last unless IO::AIO::nreqs || BDB::nreqs; 3810 while (IO::AIO::nreqs || BDB::nreqs) {
3279 warn "iterate..."; 3811 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3280 }
3281
3282 ++$RELOAD;
3283
3284 warn "cancelling all extension coros";
3285 $_->cancel for values %EXT_CORO;
3286 %EXT_CORO = ();
3287
3288 warn "removing commands";
3289 %COMMAND = ();
3290
3291 warn "removing ext/exti commands";
3292 %EXTCMD = ();
3293 %EXTICMD = ();
3294
3295 warn "unloading/nuking all extensions";
3296 for my $pkg (@EXTS) {
3297 warn "... unloading $pkg";
3298
3299 if (my $cb = $pkg->can ("unload")) {
3300 eval {
3301 $cb->($pkg);
3302 1
3303 } or warn "$pkg unloaded, but with errors: $@";
3304 } 3812 }
3305 3813
3306 warn "... nuking $pkg"; 3814 warn "cancelling all extension coros";
3307 Symbol::delete_package $pkg; 3815 $_->cancel for values %EXT_CORO;
3308 } 3816 %EXT_CORO = ();
3309 3817
3310 warn "unloading all perl modules loaded from $LIBDIR"; 3818 warn "removing commands";
3311 while (my ($k, $v) = each %INC) { 3819 %COMMAND = ();
3312 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3313 3820
3821 warn "removing ext/exti commands";
3822 %EXTCMD = ();
3823 %EXTICMD = ();
3824
3825 warn "unloading/nuking all extensions";
3826 for my $pkg (@EXTS) {
3314 warn "... unloading $k"; 3827 warn "... unloading $pkg";
3315 delete $INC{$k};
3316 3828
3317 $k =~ s/\.pm$//;
3318 $k =~ s/\//::/g;
3319
3320 if (my $cb = $k->can ("unload_module")) { 3829 if (my $cb = $pkg->can ("unload")) {
3830 eval {
3321 $cb->(); 3831 $cb->($pkg);
3832 1
3833 } or warn "$pkg unloaded, but with errors: $@";
3834 }
3835
3836 warn "... clearing $pkg";
3837 clear_package $pkg;
3322 } 3838 }
3323 3839
3324 Symbol::delete_package $k; 3840 warn "unloading all perl modules loaded from $LIBDIR";
3841 while (my ($k, $v) = each %INC) {
3842 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3843
3844 warn "... unloading $k";
3845 delete $INC{$k};
3846
3847 $k =~ s/\.pm$//;
3848 $k =~ s/\//::/g;
3849
3850 if (my $cb = $k->can ("unload_module")) {
3851 $cb->();
3852 }
3853
3854 clear_package $k;
3325 } 3855 }
3326 3856
3327 warn "getting rid of safe::, as good as possible"; 3857 warn "getting rid of safe::, as good as possible";
3328 Symbol::delete_package "safe::$_" 3858 clear_package "safe::$_"
3329 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3859 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3330 3860
3331 warn "unloading cf.pm \"a bit\""; 3861 warn "unloading cf.pm \"a bit\"";
3332 delete $INC{"cf.pm"}; 3862 delete $INC{"cf.pm"};
3333 delete $INC{"cf/pod.pm"}; 3863 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3334 3864
3335 # don't, removes xs symbols, too, 3865 # don't, removes xs symbols, too,
3336 # and global variables created in xs 3866 # and global variables created in xs
3337 #Symbol::delete_package __PACKAGE__; 3867 #clear_package __PACKAGE__;
3338 3868
3339 warn "unload completed, starting to reload now"; 3869 warn "unload completed, starting to reload now";
3340 3870
3341 warn "reloading cf.pm"; 3871 warn "reloading cf.pm";
3342 require cf; 3872 require cf;
3343 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3873 cf::_connect_to_perl_1;
3344 3874
3345 warn "loading config and database again"; 3875 warn "loading config and database again";
3346 cf::reload_config; 3876 cf::reload_config;
3347 3877
3348 warn "loading extensions"; 3878 warn "loading extensions";
3349 cf::load_extensions; 3879 cf::load_extensions;
3350 3880
3881 if ($REATTACH_ON_RELOAD) {
3351 warn "reattaching attachments to objects/players"; 3882 warn "reattaching attachments to objects/players";
3352 _global_reattach; # objects, sockets 3883 _global_reattach; # objects, sockets
3353 warn "reattaching attachments to maps"; 3884 warn "reattaching attachments to maps";
3354 reattach $_ for values %MAP; 3885 reattach $_ for values %MAP;
3355 warn "reattaching attachments to players"; 3886 warn "reattaching attachments to players";
3356 reattach $_ for values %PLAYER; 3887 reattach $_ for values %PLAYER;
3888 }
3357 3889
3890 warn "running post_init jobs";
3891 (pop @POST_INIT)->(1) while @POST_INIT;
3892
3358 warn "leaving sync_job"; 3893 warn "leaving sync_job";
3359 3894
3360 1 3895 1
3361 } or do { 3896 } or do {
3362 warn $@; 3897 warn $@;
3363 warn "error while reloading, exiting."; 3898 cf::cleanup "error while reloading, exiting.";
3364 exit 1;
3365 }; 3899 };
3366 3900
3367 warn "reloaded"; 3901 warn "reloaded";
3902 --$RELOAD;
3903 }
3904
3905 $t1 = AE::time - $t1;
3906 warn "reload completed in ${t1}s\n";
3368}; 3907};
3369 3908
3370our $RELOAD_WATCHER; # used only during reload 3909our $RELOAD_WATCHER; # used only during reload
3371 3910
3372sub reload_perl() { 3911sub reload_perl() {
3373 # doing reload synchronously and two reloads happen back-to-back, 3912 # doing reload synchronously and two reloads happen back-to-back,
3374 # coro crashes during coro_state_free->destroy here. 3913 # coro crashes during coro_state_free->destroy here.
3375 3914
3376 $RELOAD_WATCHER ||= Event->timer ( 3915 $RELOAD_WATCHER ||= cf::async {
3377 reentrant => 0, 3916 Coro::AIO::aio_wait cache_extensions;
3378 after => 0, 3917
3379 data => WF_AUTOCANCEL, 3918 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3380 cb => sub {
3381 do_reload_perl; 3919 do_reload_perl;
3382 undef $RELOAD_WATCHER; 3920 undef $RELOAD_WATCHER;
3383 }, 3921 };
3384 ); 3922 };
3385} 3923}
3386 3924
3387register_command "reload" => sub { 3925register_command "reload" => sub {
3388 my ($who, $arg) = @_; 3926 my ($who, $arg) = @_;
3389 3927
3390 if ($who->flag (FLAG_WIZ)) { 3928 if ($who->flag (FLAG_WIZ)) {
3391 $who->message ("reloading server."); 3929 $who->message ("reloading server.");
3930 async {
3931 $Coro::current->{desc} = "perl_reload";
3392 async { reload_perl }; 3932 reload_perl;
3933 };
3393 } 3934 }
3394}; 3935};
3395 3936
3396unshift @INC, $LIBDIR; 3937unshift @INC, $LIBDIR;
3397 3938
3399 3940
3400our @WAIT_FOR_TICK; 3941our @WAIT_FOR_TICK;
3401our @WAIT_FOR_TICK_BEGIN; 3942our @WAIT_FOR_TICK_BEGIN;
3402 3943
3403sub wait_for_tick { 3944sub wait_for_tick {
3404 return unless $TICK_WATCHER->is_active;
3405 return if $Coro::current == $Coro::main; 3945 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3406 3946
3407 my $signal = new Coro::Signal; 3947 my $signal = new Coro::Signal;
3408 push @WAIT_FOR_TICK, $signal; 3948 push @WAIT_FOR_TICK, $signal;
3409 $signal->wait; 3949 $signal->wait;
3410} 3950}
3411 3951
3412sub wait_for_tick_begin { 3952sub wait_for_tick_begin {
3413 return unless $TICK_WATCHER->is_active;
3414 return if $Coro::current == $Coro::main; 3953 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3415 3954
3416 my $signal = new Coro::Signal; 3955 my $signal = new Coro::Signal;
3417 push @WAIT_FOR_TICK_BEGIN, $signal; 3956 push @WAIT_FOR_TICK_BEGIN, $signal;
3418 $signal->wait; 3957 $signal->wait;
3419} 3958}
3420 3959
3421 my $min = 1e6;#d# 3960sub tick {
3422 my $avg = 10;
3423$TICK_WATCHER = Event->timer (
3424 reentrant => 0,
3425 parked => 1,
3426 prio => 0,
3427 at => $NEXT_TICK || $TICK,
3428 data => WF_AUTOCANCEL,
3429 cb => sub {
3430 if ($Coro::current != $Coro::main) { 3961 if ($Coro::current != $Coro::main) {
3431 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3962 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3432 unless ++$bug_warning > 10; 3963 unless ++$bug_warning > 10;
3433 return; 3964 return;
3434 } 3965 }
3435 3966
3436 $NOW = $tick_start = Event::time;
3437
3438 cf::server_tick; # one server iteration 3967 cf::server_tick; # one server iteration
3439 3968
3440 0 && sync_job {#d# 3969 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3441 for(1..10) {
3442 my $t = Event::time;
3443 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3444 or die;
3445 3970
3446 $map->width (50); 3971 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3447 $map->height (50); 3972 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3448 $map->alloc; 3973 Coro::async_pool {
3449 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 3974 $Coro::current->{desc} = "runtime saver";
3450 my $t = Event::time - $t; 3975 write_runtime_sync
3451 3976 or warn "ERROR: unable to write runtime file: $!";
3452 #next unless $t < 0.0013;#d#
3453 if ($t < $min) {
3454 $min = $t;
3455 }
3456 $avg = $avg * 0.99 + $t * 0.01;
3457 }
3458 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3459 exit 0;
3460 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3461 }; 3977 };
3978 }
3462 3979
3463 $RUNTIME += $TICK;
3464 $NEXT_TICK += $TICK;
3465
3466 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3467 $NEXT_RUNTIME_WRITE = $NOW + 10;
3468 Coro::async_pool {
3469 write_runtime
3470 or warn "ERROR: unable to write runtime file: $!";
3471 };
3472 }
3473
3474# my $AFTER = Event::time;
3475# warn $AFTER - $NOW;#d#
3476
3477 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3980 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3478 $sig->send; 3981 $sig->send;
3479 } 3982 }
3480 while (my $sig = shift @WAIT_FOR_TICK) { 3983 while (my $sig = shift @WAIT_FOR_TICK) {
3481 $sig->send; 3984 $sig->send;
3482 } 3985 }
3483 3986
3484 $NOW = Event::time; 3987 $LOAD = ($NOW - $TICK_START) / $TICK;
3485
3486 # if we are delayed by four ticks or more, skip them all
3487 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3488
3489 $TICK_WATCHER->at ($NEXT_TICK);
3490 $TICK_WATCHER->start;
3491
3492 $LOAD = ($NOW - $tick_start) / $TICK;
3493 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3988 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3494 3989
3495 _post_tick; 3990 if (0) {
3496 3991 if ($NEXT_TICK) {
3497 3992 my $jitter = $TICK_START - $NEXT_TICK;
3993 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3994 warn "jitter $JITTER\n";#d#
3995 }
3498 }, 3996 }
3499); 3997}
3500 3998
3501{ 3999{
3502 BDB::max_poll_time $TICK * 0.1; 4000 # configure BDB
3503 $BDB_POLL_WATCHER = Event->io ( 4001
3504 reentrant => 0,
3505 fd => BDB::poll_fileno,
3506 poll => 'r',
3507 prio => 0,
3508 data => WF_AUTOCANCEL,
3509 cb => \&BDB::poll_cb,
3510 );
3511 BDB::min_parallel 8; 4002 BDB::min_parallel 16;
3512 4003 BDB::max_poll_reqs $TICK * 0.1;
3513 BDB::set_sync_prepare { 4004 $AnyEvent::BDB::WATCHER->priority (1);
3514 my $status;
3515 my $current = $Coro::current;
3516 (
3517 sub {
3518 $status = $!;
3519 $current->ready; undef $current;
3520 },
3521 sub {
3522 Coro::schedule while defined $current;
3523 $! = $status;
3524 },
3525 )
3526 };
3527 4005
3528 unless ($DB_ENV) { 4006 unless ($DB_ENV) {
3529 $DB_ENV = BDB::db_env_create; 4007 $DB_ENV = BDB::db_env_create;
4008 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4009 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4010 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4011 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4012 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3530 4013
3531 cf::sync_job { 4014 cf::sync_job {
3532 eval { 4015 eval {
3533 BDB::db_env_open 4016 BDB::db_env_open
3534 $DB_ENV, 4017 $DB_ENV,
3536 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4019 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3537 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4020 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3538 0666; 4021 0666;
3539 4022
3540 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4023 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3541
3542 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3543 $DB_ENV->set_lk_detect;
3544 }; 4024 };
3545 4025
3546 cf::cleanup "db_env_open(db): $@" if $@; 4026 cf::cleanup "db_env_open(db): $@" if $@;
3547 }; 4027 };
3548 } 4028 }
4029
4030 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4031 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4032 };
4033 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4034 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4035 };
4036 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4037 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4038 };
3549} 4039}
3550 4040
3551{ 4041{
4042 # configure IO::AIO
4043
3552 IO::AIO::min_parallel 8; 4044 IO::AIO::min_parallel 8;
3553
3554 undef $Coro::AIO::WATCHER;
3555 IO::AIO::max_poll_time $TICK * 0.1; 4045 IO::AIO::max_poll_time $TICK * 0.1;
3556 $AIO_POLL_WATCHER = Event->io ( 4046 undef $AnyEvent::AIO::WATCHER;
3557 reentrant => 0,
3558 data => WF_AUTOCANCEL,
3559 fd => IO::AIO::poll_fileno,
3560 poll => 'r',
3561 prio => 6,
3562 cb => \&IO::AIO::poll_cb,
3563 );
3564} 4047}
3565 4048
3566my $_log_backtrace; 4049my $_log_backtrace;
3567 4050
3568sub _log_backtrace { 4051sub _log_backtrace {
3571 $msg =~ s/\n//; 4054 $msg =~ s/\n//;
3572 4055
3573 # limit the # of concurrent backtraces 4056 # limit the # of concurrent backtraces
3574 if ($_log_backtrace < 2) { 4057 if ($_log_backtrace < 2) {
3575 ++$_log_backtrace; 4058 ++$_log_backtrace;
4059 my $perl_bt = Carp::longmess $msg;
3576 async { 4060 async {
4061 $Coro::current->{desc} = "abt $msg";
4062
3577 my @bt = fork_call { 4063 my @bt = fork_call {
3578 @addr = map { sprintf "%x", $_ } @addr; 4064 @addr = map { sprintf "%x", $_ } @addr;
3579 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4065 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3580 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4066 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3581 or die "addr2line: $!"; 4067 or die "addr2line: $!";
3589 } 4075 }
3590 4076
3591 @funcs 4077 @funcs
3592 }; 4078 };
3593 4079
3594 LOG llevInfo, "[ABT] $msg\n"; 4080 LOG llevInfo, "[ABT] $perl_bt\n";
4081 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3595 LOG llevInfo, "[ABT] $_\n" for @bt; 4082 LOG llevInfo, "[ABT] $_\n" for @bt;
3596 --$_log_backtrace; 4083 --$_log_backtrace;
3597 }; 4084 };
3598 } else { 4085 } else {
3599 LOG llevInfo, "[ABT] $msg\n"; 4086 LOG llevInfo, "[ABT] $msg\n";
3600 LOG llevInfo, "[ABT] [suppressed]\n"; 4087 LOG llevInfo, "[ABT] [suppressed]\n";
3601 } 4088 }
3602} 4089}
3603 4090
3604# load additional modules 4091# load additional modules
3605use cf::pod; 4092require "cf/$_.pm" for @EXTRA_MODULES;
4093cf::_connect_to_perl_2;
3606 4094
3607END { cf::emergency_save } 4095END { cf::emergency_save }
3608 4096
36091 40971
3610 4098

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines