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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines