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.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.458 by root, Sat Dec 13 20:34:37 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your 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 GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::AnyEvent;
22use Coro::AIO; 47use Coro::AIO;
48use Coro::BDB 1.6;
23use Coro::Storable; 49use Coro::Storable;
50use Coro::Util ();
24 51
25use JSON::XS 1.4 (); 52use JSON::XS 2.01 ();
26use BDB (); 53use BDB ();
27use Data::Dumper; 54use Data::Dumper;
28use Digest::MD5; 55use Digest::MD5;
29use Fcntl; 56use Fcntl;
30use YAML::Syck (); 57use YAML ();
31use IO::AIO 2.32 (); 58use IO::AIO ();
32use Time::HiRes; 59use Time::HiRes;
33use Compress::LZF; 60use Compress::LZF;
61use Digest::MD5 ();
62
63AnyEvent::detect;
34 64
35# configure various modules to our taste 65# configure various modules to our taste
36# 66#
37$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
39Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
40
41$Event::Eval = 1; # no idea why this is required, but it is
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 75
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 76sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 77
50our %COMMAND = (); 78our %COMMAND = ();
51our %COMMAND_TIME = (); 79our %COMMAND_TIME = ();
54our %EXTCMD = (); 82our %EXTCMD = ();
55our %EXTICMD = (); 83our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 84our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 85our %EXT_MAP = (); # pluggable maps
58 86
59our $RELOAD; # number of reloads so far 87our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 88our @EVENT;
61 89
62our $CONFDIR = confdir; 90our $CONFDIR = confdir;
63our $DATADIR = datadir; 91our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 92our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 93our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 94our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 95our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 96our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 97our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 98our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 99our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 100our $BDBDIR = "$LOCALDIR/db";
101our $PIDFILE = "$LOCALDIR/pid";
102our $RUNTIMEFILE = "$LOCALDIR/runtime";
103
104our %RESOURCE;
73 105
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 106our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 107our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 108our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 109our $USE_FSYNC = 1; # use fsync to write maps - default off
81 110
111our $BDB_DEADLOCK_WATCHER;
112our $BDB_CHECKPOINT_WATCHER;
82our $BDB_POLL_WATCHER; 113our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 114our $DB_ENV;
84 115
85our %CFG; 116our %CFG;
86 117
87our $UPTIME; $UPTIME ||= time; 118our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 119our $RUNTIME;
120our $NOW;
89 121
90our %PLAYER; # all users 122our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 123our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 124our $LINK_MAP; # the special {link} map, which is always available
93 125
94# used to convert map paths into valid unix filenames by replacing / by ∕ 126# used to convert map paths into valid unix filenames by replacing / by ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 127our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 128
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 129our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 130our $LOADAVG; # same thing, but with alpha-smoothing
131our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 132our $TICK_START; # for load detecting purposes
133
134our @POST_INIT;
135
136our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
100 137
101binmode STDOUT; 138binmode STDOUT;
102binmode STDERR; 139binmode STDERR;
103 140
104# read virtual server time, if available 141# read virtual server time, if available
105unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 142unless ($RUNTIME || !-e $RUNTIMEFILE) {
106 open my $fh, "<", "$LOCALDIR/runtime" 143 open my $fh, "<", $RUNTIMEFILE
107 or die "unable to read runtime file: $!"; 144 or die "unable to read $RUNTIMEFILE file: $!";
108 $RUNTIME = <$fh> + 0.; 145 $RUNTIME = <$fh> + 0.;
109} 146}
110 147
111mkdir $_ 148mkdir $_
112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 149 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
157 194
158The raw value load value from the last tick. 195The raw value load value from the last tick.
159 196
160=item %cf::CFG 197=item %cf::CFG
161 198
162Configuration for the server, loaded from C</etc/crossfire/config>, or 199Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 200from wherever your confdir points to.
164 201
165=item cf::wait_for_tick, cf::wait_for_tick_begin 202=item cf::wait_for_tick, cf::wait_for_tick_begin
166 203
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 204These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 205returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 206per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 207
208=item @cf::INVOKE_RESULTS
209
210This array contains the results of the last C<invoke ()> call. When
211C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
212that call.
213
171=back 214=back
172 215
173=cut 216=cut
174 217
175BEGIN { 218BEGIN {
179 $msg .= "\n" 222 $msg .= "\n"
180 unless $msg =~ /\n$/; 223 unless $msg =~ /\n$/;
181 224
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 225 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183 226
184 utf8::encode $msg;
185 LOG llevError, $msg; 227 LOG llevError, $msg;
186 }; 228 };
187} 229}
230
231$Coro::State::DIEHOOK = sub {
232 return unless $^S eq 0; # "eq", not "=="
233
234 if ($Coro::current == $Coro::main) {#d#
235 warn "DIEHOOK called in main context, Coro bug?\n";#d#
236 return;#d#
237 }#d#
238
239 # kill coroutine otherwise
240 warn Carp::longmess $_[0];
241 Coro::terminate
242};
243
244$SIG{__DIE__} = sub { }; #d#?
188 245
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 246@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 247@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 248@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 249@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
199for my $pkg (qw( 256for my $pkg (qw(
200 cf::global cf::attachable 257 cf::global cf::attachable
201 cf::object cf::object::player 258 cf::object cf::object::player
202 cf::client cf::player 259 cf::client cf::player
203 cf::arch cf::living 260 cf::arch cf::living
261 cf::map cf::mapspace
204 cf::map cf::party cf::region 262 cf::party cf::region
205)) { 263)) {
206 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 264 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 265}
209 266
210$Event::DIED = sub { 267$EV::DIED = sub {
211 warn "error in event callback: @_"; 268 warn "error in event callback: @_";
212}; 269};
213 270
214############################################################################# 271#############################################################################
215 272
238 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 295 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
239 $d 296 $d
240 } || "[unable to dump $_[0]: '$@']"; 297 } || "[unable to dump $_[0]: '$@']";
241} 298}
242 299
243=item $ref = cf::from_json $json 300=item $ref = cf::decode_json $json
244 301
245Converts a JSON string into the corresponding perl data structure. 302Converts a JSON string into the corresponding perl data structure.
246 303
247=item $json = cf::to_json $ref 304=item $json = cf::encode_json $ref
248 305
249Converts a perl data structure into its JSON representation. 306Converts a perl data structure into its JSON representation.
250 307
251=cut 308=cut
252 309
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 310our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 311
255sub to_json ($) { $json_coder->encode ($_[0]) } 312sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 313sub decode_json($) { $json_coder->decode ($_[0]) }
314
315=item cf::post_init { BLOCK }
316
317Execute the given codeblock, I<after> all extensions have been (re-)loaded,
318but I<before> the server starts ticking again.
319
320The cdoeblock will have a single boolean argument to indicate whether this
321is a reload or not.
322
323=cut
324
325sub post_init(&) {
326 push @POST_INIT, shift;
327}
257 328
258=item cf::lock_wait $string 329=item cf::lock_wait $string
259 330
260Wait until the given lock is available. See cf::lock_acquire. 331Wait until the given lock is available. See cf::lock_acquire.
261 332
262=item my $lock = cf::lock_acquire $string 333=item my $lock = cf::lock_acquire $string
263 334
264Wait until the given lock is available and then acquires it and returns 335Wait until the given lock is available and then acquires it and returns
265a Coro::guard object. If the guard object gets destroyed (goes out of scope, 336a L<Guard> object. If the guard object gets destroyed (goes out of scope,
266for example when the coroutine gets canceled), the lock is automatically 337for example when the coroutine gets canceled), the lock is automatically
267returned. 338returned.
268 339
340Locks are *not* recursive, locking from the same coro twice results in a
341deadlocked coro.
342
269Lock names should begin with a unique identifier (for example, cf::map::find 343Lock names should begin with a unique identifier (for example, cf::map::find
270uses map_find and cf::map::load uses map_load). 344uses map_find and cf::map::load uses map_load).
271 345
272=item $locked = cf::lock_active $string 346=item $locked = cf::lock_active $string
273 347
274Return true if the lock is currently active, i.e. somebody has locked it. 348Return true if the lock is currently active, i.e. somebody has locked it.
275 349
276=cut 350=cut
277 351
278our %LOCK; 352our %LOCK;
353our %LOCKER;#d#
279 354
280sub lock_wait($) { 355sub lock_wait($) {
281 my ($key) = @_; 356 my ($key) = @_;
282 357
358 if ($LOCKER{$key} == $Coro::current) {#d#
359 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
360 return;#d#
361 }#d#
362
283 # wait for lock, if any 363 # wait for lock, if any
284 while ($LOCK{$key}) { 364 while ($LOCK{$key}) {
365 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
285 push @{ $LOCK{$key} }, $Coro::current; 366 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 367 Coro::schedule;
287 } 368 }
288} 369}
289 370
292 373
293 # wait, to be sure we are not locked 374 # wait, to be sure we are not locked
294 lock_wait $key; 375 lock_wait $key;
295 376
296 $LOCK{$key} = []; 377 $LOCK{$key} = [];
378 $LOCKER{$key} = $Coro::current;#d#
297 379
298 Coro::guard { 380 Guard::guard {
381 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 382 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 383 $_->ready for @{ delete $LOCK{$key} };
301 } 384 }
302} 385}
303 386
306 389
307 ! ! $LOCK{$key} 390 ! ! $LOCK{$key}
308} 391}
309 392
310sub freeze_mainloop { 393sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 394 tick_inhibit_inc;
312 395
313 my $guard = Coro::guard { 396 &Guard::guard (\&tick_inhibit_dec);
314 $TICK_WATCHER->start; 397}
398
399=item cf::periodic $interval, $cb
400
401Like EV::periodic, but randomly selects a starting point so that the actions
402get spread over timer.
403
404=cut
405
406sub periodic($$) {
407 my ($interval, $cb) = @_;
408
409 my $start = rand List::Util::min 180, $interval;
410
411 EV::periodic $start, $interval, 0, $cb
412}
413
414=item cf::get_slot $time[, $priority[, $name]]
415
416Allocate $time seconds of blocking CPU time at priority C<$priority>:
417This call blocks and returns only when you have at least C<$time> seconds
418of cpu time till the next tick. The slot is only valid till the next cede.
419
420The optional C<$name> can be used to identify the job to run. It might be
421used for statistical purposes and should identify the same time-class.
422
423Useful for short background jobs.
424
425=cut
426
427our @SLOT_QUEUE;
428our $SLOT_QUEUE;
429
430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager");
433
434 my $signal = new Coro::Signal;
435
436 while () {
437 next_job:
438 my $avail = cf::till_tick;
439 if ($avail > 0.01) {
440 for (0 .. $#SLOT_QUEUE) {
441 if ($SLOT_QUEUE[$_][0] < $avail) {
442 my $job = splice @SLOT_QUEUE, $_, 1, ();
443 $job->[2]->send;
444 Coro::cede;
445 goto next_job;
446 }
447 }
448 }
449
450 if (@SLOT_QUEUE) {
451 # we do not use wait_for_tick() as it returns immediately when tick is inactive
452 push @cf::WAIT_FOR_TICK, $signal;
453 $signal->wait;
454 } else {
455 Coro::schedule;
456 }
315 }; 457 }
316 $TICK_WATCHER->stop; 458};
317 $guard 459
460sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main;
462
463 my ($time, $pri, $name) = @_;
464
465 $time = $TICK * .6 if $time > $TICK * .6;
466 my $sig = new Coro::Signal;
467
468 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
469 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
470 $SLOT_QUEUE->ready;
471 $sig->wait;
318} 472}
319 473
320=item cf::async { BLOCK } 474=item cf::async { BLOCK }
321 475
322Currently the same as Coro::async_pool, meaning you cannot use 476Currently the same as Coro::async_pool, meaning you cannot use
327 481
328BEGIN { *async = \&Coro::async_pool } 482BEGIN { *async = \&Coro::async_pool }
329 483
330=item cf::sync_job { BLOCK } 484=item cf::sync_job { BLOCK }
331 485
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 486The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 487is always able to handle events or runnable, as Deliantra is only
334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 488partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable. 489acceptable.
336 490
337If it must be done, put the blocking parts into C<sync_job>. This will run 491If it must be done, put the blocking parts into C<sync_job>. This will run
338the given BLOCK in another coroutine while waiting for the result. The 492the given BLOCK in another coroutine while waiting for the result. The
343 497
344sub sync_job(&) { 498sub sync_job(&) {
345 my ($job) = @_; 499 my ($job) = @_;
346 500
347 if ($Coro::current == $Coro::main) { 501 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 502 my $time = EV::time;
349 503
350 # this is the main coro, too bad, we have to block 504 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 505 # till the operation succeeds, freezing the server :/
352 506
353 # TODO: use suspend/resume instead 507 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 508
355 my $freeze_guard = freeze_mainloop; 509 my $freeze_guard = freeze_mainloop;
356 510
357 my $busy = 1; 511 my $busy = 1;
358 my @res; 512 my @res;
359 513
360 (async { 514 (async {
515 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 516 @res = eval { $job->() };
362 warn $@ if $@; 517 warn $@ if $@;
363 undef $busy; 518 undef $busy;
364 })->prio (Coro::PRIO_MAX); 519 })->prio (Coro::PRIO_MAX);
365 520
366 while ($busy) { 521 while ($busy) {
367 Coro::cede or Event::one_event; 522 if (Coro::nready) {
523 Coro::cede_notself;
524 } else {
525 EV::loop EV::LOOP_ONESHOT;
368 } 526 }
527 }
369 528
370 $time = Event::time - $time; 529 my $time = EV::time - $time;
371 530
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 531 $TICK_START += $time; # do not account sync jobs to server load
376 532
377 wantarray ? @res : $res[0] 533 wantarray ? @res : $res[0]
378 } else { 534 } else {
379 # we are in another coroutine, how wonderful, everything just works 535 # we are in another coroutine, how wonderful, everything just works
380 536
405=item fork_call { }, $args 561=item fork_call { }, $args
406 562
407Executes the given code block with the given arguments in a seperate 563Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 564process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 565Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 566never block itself or use any form of event handling.
411 567
412=cut 568=cut
413 569
414sub fork_call(&@) { 570sub fork_call(&@) {
415 my ($cb, @args) = @_; 571 my ($cb, @args) = @_;
416 572
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 573 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 574 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 575 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 576
422 if (my $pid = fork) { 577 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 warn "pst<$res>" unless $res =~ /^pst/;
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 Carp::confess $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 578 reset_signals;
436 local $SIG{__WARN__}; 579 &$cb
437 local $SIG{__DIE__}; 580 }, @args;
438 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX);
440 eval {
441 close $fh1;
442 581
443 my @res = eval { $cb->(@args) }; 582 wantarray ? @res : $res[-1]
583}
444 584
445 open my $fh, ">", \my $buf 585=item $coin = coin_from_name $name
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449 586
450 warn "writing ", length $buf; 587=cut
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2;
455 };
456 588
457 warn $@ if $@; 589our %coin_alias = (
458 _exit 0; 590 "silver" => "silvercoin",
459 } 591 "silvercoin" => "silvercoin",
592 "silvercoins" => "silvercoin",
593 "gold" => "goldcoin",
594 "goldcoin" => "goldcoin",
595 "goldcoins" => "goldcoin",
596 "platinum" => "platinacoin",
597 "platinumcoin" => "platinacoin",
598 "platinumcoins" => "platinacoin",
599 "platina" => "platinacoin",
600 "platinacoin" => "platinacoin",
601 "platinacoins" => "platinacoin",
602 "royalty" => "royalty",
603 "royalties" => "royalty",
604);
605
606sub coin_from_name($) {
607 $coin_alias{$_[0]}
608 ? cf::arch::find $coin_alias{$_[0]}
609 : undef
460} 610}
461 611
462=item $value = cf::db_get $family => $key 612=item $value = cf::db_get $family => $key
463 613
464Returns a single value from the environment database. 614Returns a single value from the environment database.
466=item cf::db_put $family => $key => $value 616=item cf::db_put $family => $key => $value
467 617
468Stores the given C<$value> in the family. It can currently store binary 618Stores the given C<$value> in the family. It can currently store binary
469data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 619data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
470 620
621=item $db = cf::db_table "name"
622
623Create and/or open a new database table. The string must not be "db" and must be unique
624within each server.
625
471=cut 626=cut
627
628sub db_table($) {
629 my ($name) = @_;
630 my $db = BDB::db_create $DB_ENV;
631
632 eval {
633 $db->set_flags (BDB::CHKSUM);
634
635 utf8::encode $name;
636 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
637 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
638 cf::cleanup "db_open(db): $!" if $!;
639 };
640 cf::cleanup "db_open(db): $@" if $@;
641
642 $db
643}
472 644
473our $DB; 645our $DB;
474 646
475sub db_init { 647sub db_init {
476 unless ($DB) {
477 $DB = BDB::db_create $DB_ENV;
478
479 cf::sync_job { 648 cf::sync_job {
480 eval { 649 $DB ||= db_table "db";
481 $DB->set_flags (BDB::CHKSUM);
482
483 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
484 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
485 cf::cleanup "db_open(db): $!" if $!;
486 };
487 cf::cleanup "db_open(db): $@" if $@;
488 };
489 } 650 };
490} 651}
491 652
492sub db_get($$) { 653sub db_get($$) {
493 my $key = "$_[0]/$_[1]"; 654 my $key = "$_[0]/$_[1]";
494 655
544 if (1) { 705 if (1) {
545 $md5 = 706 $md5 =
546 join "\x00", 707 join "\x00",
547 $processversion, 708 $processversion,
548 map { 709 map {
549 Coro::cede; 710 cf::cede_to_tick;
550 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 711 ($src->[$_], Digest::MD5::md5_hex $data[$_])
551 } 0.. $#$src; 712 } 0.. $#$src;
552 713
553 714
554 my $dbmd5 = db_get cache => "$id/md5"; 715 my $dbmd5 = db_get cache => "$id/md5";
592 753
593############################################################################# 754#############################################################################
594 755
595=head2 ATTACHABLE OBJECTS 756=head2 ATTACHABLE OBJECTS
596 757
597Many objects in crossfire are so-called attachable objects. That means you can 758Many objects in deliantra are so-called attachable objects. That means you can
598attach callbacks/event handlers (a collection of which is called an "attachment") 759attach callbacks/event handlers (a collection of which is called an "attachment")
599to it. All such attachable objects support the following methods. 760to it. All such attachable objects support the following methods.
600 761
601In the following description, CLASS can be any of C<global>, C<object> 762In the following description, CLASS can be any of C<global>, C<object>
602C<player>, C<client> or C<map> (i.e. the attachable objects in 763C<player>, C<client> or C<map> (i.e. the attachable objects in
603Crossfire TRT). 764Deliantra).
604 765
605=over 4 766=over 4
606 767
607=item $attachable->attach ($attachment, key => $value...) 768=item $attachable->attach ($attachment, key => $value...)
608 769
652=item cf::CLASS::attachment $name, ... 813=item cf::CLASS::attachment $name, ...
653 814
654Register an attachment by C<$name> through which attachable objects of the 815Register an attachment by C<$name> through which attachable objects of the
655given CLASS can refer to this attachment. 816given CLASS can refer to this attachment.
656 817
657Some classes such as crossfire maps and objects can specify attachments 818Some classes such as deliantra maps and objects can specify attachments
658that are attached at load/instantiate time, thus the need for a name. 819that are attached at load/instantiate time, thus the need for a name.
659 820
660These calls expect any number of the following handler/hook descriptions: 821These calls expect any number of the following handler/hook descriptions:
661 822
662=over 4 823=over 4
860 "; 1021 ";
861 die if $@; 1022 die if $@;
862} 1023}
863 1024
864our $override; 1025our $override;
865our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1026our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
866 1027
867sub override { 1028sub override {
868 $override = 1; 1029 $override = 1;
869 @invoke_results = (); 1030 @INVOKE_RESULTS = (@_);
870} 1031}
871 1032
872sub do_invoke { 1033sub do_invoke {
873 my $event = shift; 1034 my $event = shift;
874 my $callbacks = shift; 1035 my $callbacks = shift;
875 1036
876 @invoke_results = (); 1037 @INVOKE_RESULTS = ();
877 1038
878 local $override; 1039 local $override;
879 1040
880 for (@$callbacks) { 1041 for (@$callbacks) {
881 eval { &{$_->[1]} }; 1042 eval { &{$_->[1]} };
890 } 1051 }
891 1052
892 0 1053 0
893} 1054}
894 1055
895=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1056=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
896 1057
897=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1058=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
898 1059
899Generate an object-specific event with the given arguments. 1060Generate an object-specific event with the given arguments.
900 1061
901This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1062This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
902removed in future versions), and there is no public API to access override 1063removed in future versions), and there is no public API to access override
903results (if you must, access C<@cf::invoke_results> directly). 1064results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 1065
905=back 1066=back
906 1067
907=cut 1068=cut
908 1069
909############################################################################# 1070#############################################################################
910# object support 1071# object support
1072
1073sub _object_equal($$);
1074sub _object_equal($$) {
1075 my ($a, $b) = @_;
1076
1077 return 0 unless (ref $a) eq (ref $b);
1078
1079 if ("HASH" eq ref $a) {
1080 my @ka = keys %$a;
1081 my @kb = keys %$b;
1082
1083 return 0 if @ka != @kb;
1084
1085 for (0 .. $#ka) {
1086 return 0 unless $ka[$_] eq $kb[$_];
1087 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1088 }
1089
1090 } elsif ("ARRAY" eq ref $a) {
1091
1092 return 0 if @$a != @$b;
1093
1094 for (0 .. $#$a) {
1095 return 0 unless _object_equal $a->[$_], $b->[$_];
1096 }
1097
1098 } elsif ($a ne $b) {
1099 return 0;
1100 }
1101
1102 1
1103}
1104
1105our $SLOW_MERGES;#d#
1106sub _can_merge {
1107 my ($ob1, $ob2) = @_;
1108
1109 ++$SLOW_MERGES;#d#
1110
1111 # we do the slow way here
1112 return _object_equal $ob1, $ob2
1113}
911 1114
912sub reattach { 1115sub reattach {
913 # basically do the same as instantiate, without calling instantiate 1116 # basically do the same as instantiate, without calling instantiate
914 my ($obj) = @_; 1117 my ($obj) = @_;
915 1118
1119 # no longer needed after getting rid of delete_package?
916 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1120 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
917 1121
918 my $registry = $obj->registry; 1122 my $registry = $obj->registry;
919 1123
920 @$registry = (); 1124 @$registry = ();
921 1125
936cf::attachable->attach ( 1140cf::attachable->attach (
937 prio => -1000000, 1141 prio => -1000000,
938 on_instantiate => sub { 1142 on_instantiate => sub {
939 my ($obj, $data) = @_; 1143 my ($obj, $data) = @_;
940 1144
941 $data = from_json $data; 1145 $data = decode_json $data;
942 1146
943 for (@$data) { 1147 for (@$data) {
944 my ($name, $args) = @$_; 1148 my ($name, $args) = @$_;
945 1149
946 $obj->attach ($name, %{$args || {} }); 1150 $obj->attach ($name, %{$args || {} });
962sub object_freezer_save { 1166sub object_freezer_save {
963 my ($filename, $rdata, $objs) = @_; 1167 my ($filename, $rdata, $objs) = @_;
964 1168
965 sync_job { 1169 sync_job {
966 if (length $$rdata) { 1170 if (length $$rdata) {
1171 utf8::decode (my $decname = $filename);
967 warn sprintf "saving %s (%d,%d)\n", 1172 warn sprintf "saving %s (%d,%d)\n",
968 $filename, length $$rdata, scalar @$objs; 1173 $decname, length $$rdata, scalar @$objs;
969 1174
970 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
971 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
972 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
973 aio_fsync $fh if $cf::USE_FSYNC; 1178 aio_fsync $fh if $cf::USE_FSYNC;
974 close $fh; 1179 aio_close $fh;
975 1180
976 if (@$objs) { 1181 if (@$objs) {
977 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1182 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
978 chmod SAVE_MODE, $fh; 1183 aio_chmod $fh, SAVE_MODE;
979 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1184 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
980 aio_write $fh, 0, (length $data), $data, 0; 1185 aio_write $fh, 0, (length $data), $data, 0;
981 aio_fsync $fh if $cf::USE_FSYNC; 1186 aio_fsync $fh if $cf::USE_FSYNC;
982 close $fh; 1187 aio_close $fh;
983 aio_rename "$filename.pst~", "$filename.pst"; 1188 aio_rename "$filename.pst~", "$filename.pst";
984 } 1189 }
985 } else { 1190 } else {
986 aio_unlink "$filename.pst"; 1191 aio_unlink "$filename.pst";
987 } 1192 }
988 1193
989 aio_rename "$filename~", $filename; 1194 aio_rename "$filename~", $filename;
1195
1196 $filename =~ s%/[^/]+$%%;
1197 aio_pathsync $filename if $cf::USE_FSYNC;
990 } else { 1198 } else {
991 warn "FATAL: $filename~: $!\n"; 1199 warn "FATAL: $filename~: $!\n";
992 } 1200 }
993 } else { 1201 } else {
994 aio_unlink $filename; 1202 aio_unlink $filename;
995 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
996 } 1204 }
997 } 1205 };
998} 1206}
999 1207
1000sub object_freezer_as_string { 1208sub object_freezer_as_string {
1001 my ($rdata, $objs) = @_; 1209 my ($rdata, $objs) = @_;
1002 1210
1014 or return; 1222 or return;
1015 1223
1016 unless (aio_stat "$filename.pst") { 1224 unless (aio_stat "$filename.pst") {
1017 (aio_load "$filename.pst", $av) >= 0 1225 (aio_load "$filename.pst", $av) >= 0
1018 or return; 1226 or return;
1227
1019 $av = eval { (Storable::thaw $av)->{objs} }; 1228 my $st = eval { Coro::Storable::thaw $av };
1229 $av = $st->{objs};
1020 } 1230 }
1021 1231
1232 utf8::decode (my $decname = $filename);
1022 warn sprintf "loading %s (%d)\n", 1233 warn sprintf "loading %s (%d,%d)\n",
1023 $filename, length $data, scalar @{$av || []}; 1234 $decname, length $data, scalar @{$av || []};
1235
1024 return ($data, $av); 1236 ($data, $av)
1025} 1237}
1026 1238
1027=head2 COMMAND CALLBACKS 1239=head2 COMMAND CALLBACKS
1028 1240
1029=over 4 1241=over 4
1083 my ($name, $cb) = @_; 1295 my ($name, $cb) = @_;
1084 1296
1085 $EXTICMD{$name} = $cb; 1297 $EXTICMD{$name} = $cb;
1086} 1298}
1087 1299
1300use File::Glob ();
1301
1088cf::player->attach ( 1302cf::player->attach (
1089 on_command => sub { 1303 on_command => sub {
1090 my ($pl, $name, $params) = @_; 1304 my ($pl, $name, $params) = @_;
1091 1305
1092 my $cb = $COMMAND{$name} 1306 my $cb = $COMMAND{$name}
1102 my ($pl, $buf) = @_; 1316 my ($pl, $buf) = @_;
1103 1317
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1318 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1319
1106 if (ref $msg) { 1320 if (ref $msg) {
1321 my ($type, $reply, @payload) =
1322 "ARRAY" eq ref $msg
1323 ? @$msg
1324 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1325
1326 my @reply;
1327
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1328 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1329 @reply = $cb->($pl, @payload);
1109 $pl->ext_reply ($msg->{msgid}, %reply);
1110 }
1111 } 1330 }
1331
1332 $pl->ext_reply ($reply, @reply)
1333 if $reply;
1334
1112 } else { 1335 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1336 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1337 }
1115 1338
1116 cf::override; 1339 cf::override;
1117 }, 1340 },
1118); 1341);
1342
1343# "readahead" all extensions
1344sub cache_extensions {
1345 my $grp = IO::AIO::aio_group;
1346
1347 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1348 for (grep /\.ext$/, @{$_[0]}) {
1349 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1350 }
1351 };
1352
1353 $grp
1354}
1119 1355
1120sub load_extensions { 1356sub load_extensions {
1121 cf::sync_job { 1357 cf::sync_job {
1122 my %todo; 1358 my %todo;
1123 1359
1143 1379
1144 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1380 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1145 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1381 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1146 1382
1147 $ext{source} = 1383 $ext{source} =
1148 "package $pkg; use strict; use utf8;\n" 1384 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1149 . "#line 1 \"$path\"\n{\n" 1385 . "#line 1 \"$path\"\n{\n"
1150 . $source 1386 . $source
1151 . "\n};\n1"; 1387 . "\n};\n1";
1152 1388
1153 $todo{$base} = \%ext; 1389 $todo{$base} = \%ext;
1169 my $msg = $@ ? "$v->{path}: $@\n" 1405 my $msg = $@ ? "$v->{path}: $@\n"
1170 : "$v->{base}: extension inactive.\n"; 1406 : "$v->{base}: extension inactive.\n";
1171 1407
1172 if (exists $v->{meta}{mandatory}) { 1408 if (exists $v->{meta}{mandatory}) {
1173 warn $msg; 1409 warn $msg;
1174 warn "mandatory extension failed to load, exiting.\n"; 1410 cf::cleanup "mandatory extension failed to load, exiting.";
1175 exit 1;
1176 } 1411 }
1177 1412
1178 warn $msg; 1413 warn $msg;
1179 } 1414 }
1180 1415
1194 1429
1195=back 1430=back
1196 1431
1197=head2 CORE EXTENSIONS 1432=head2 CORE EXTENSIONS
1198 1433
1199Functions and methods that extend core crossfire objects. 1434Functions and methods that extend core deliantra objects.
1200 1435
1201=cut 1436=cut
1202 1437
1203package cf::player; 1438package cf::player;
1204 1439
1205use Coro::AIO; 1440use Coro::AIO;
1206 1441
1207=head3 cf::player 1442=head3 cf::player
1208 1443
1209=over 4 1444=over 4
1445
1446=item cf::player::num_playing
1447
1448Returns the official number of playing players, as per the Crossfire metaserver rules.
1449
1450=cut
1451
1452sub num_playing {
1453 scalar grep
1454 $_->ob->map
1455 && !$_->hidden
1456 && !$_->ob->flag (cf::FLAG_WIZ),
1457 cf::player::list
1458}
1210 1459
1211=item cf::player::find $login 1460=item cf::player::find $login
1212 1461
1213Returns the given player object, loading it if necessary (might block). 1462Returns the given player object, loading it if necessary (might block).
1214 1463
1233 1482
1234sub exists($) { 1483sub exists($) {
1235 my ($login) = @_; 1484 my ($login) = @_;
1236 1485
1237 $cf::PLAYER{$login} 1486 $cf::PLAYER{$login}
1238 or cf::sync_job { !aio_stat path $login } 1487 or !aio_stat path $login
1239} 1488}
1240 1489
1241sub find($) { 1490sub find($) {
1242 return $cf::PLAYER{$_[0]} || do { 1491 return $cf::PLAYER{$_[0]} || do {
1243 my $login = $_[0]; 1492 my $login = $_[0];
1250 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1499 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1500 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1501 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253 aio_unlink +(playerdir $login) . "/$login.pl"; 1502 aio_unlink +(playerdir $login) . "/$login.pl";
1254 1503
1255 my $pl = load_pl path $login 1504 my $f = new_from_file cf::object::thawer path $login
1256 or return; 1505 or return;
1506
1507 my $pl = cf::player::load_pl $f
1508 or return;
1509
1510 local $cf::PLAYER_LOADING{$login} = $pl;
1511 $f->resolve_delayed_derefs;
1257 $cf::PLAYER{$login} = $pl 1512 $cf::PLAYER{$login} = $pl
1258 } 1513 }
1259 } 1514 }
1260} 1515}
1261 1516
1270 return if $pl->{deny_save}; 1525 return if $pl->{deny_save};
1271 1526
1272 aio_mkdir playerdir $pl, 0770; 1527 aio_mkdir playerdir $pl, 0770;
1273 $pl->{last_save} = $cf::RUNTIME; 1528 $pl->{last_save} = $cf::RUNTIME;
1274 1529
1530 cf::get_slot 0.01;
1531
1275 $pl->save_pl ($path); 1532 $pl->save_pl ($path);
1276 Coro::cede; 1533 cf::cede_to_tick;
1277} 1534}
1278 1535
1279sub new($) { 1536sub new($) {
1280 my ($login) = @_; 1537 my ($login) = @_;
1281 1538
1287 $cf::PLAYER{$login} = $self; 1544 $cf::PLAYER{$login} = $self;
1288 1545
1289 $self 1546 $self
1290} 1547}
1291 1548
1549=item $player->send_msg ($channel, $msg, $color, [extra...])
1550
1551=cut
1552
1553sub send_msg {
1554 my $ns = shift->ns
1555 or return;
1556 $ns->send_msg (@_);
1557}
1558
1292=item $pl->quit_character 1559=item $pl->quit_character
1293 1560
1294Nukes the player without looking back. If logged in, the connection will 1561Nukes the player without looking back. If logged in, the connection will
1295be destroyed. May block for a long time. 1562be destroyed. May block for a long time.
1296 1563
1300 my ($pl) = @_; 1567 my ($pl) = @_;
1301 1568
1302 my $name = $pl->ob->name; 1569 my $name = $pl->ob->name;
1303 1570
1304 $pl->{deny_save} = 1; 1571 $pl->{deny_save} = 1;
1305 $pl->password ("*"); # this should lock out the player until we nuked the dir 1572 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1306 1573
1307 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1574 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1308 $pl->deactivate; 1575 $pl->deactivate;
1576 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1577 $pl->ob->check_score;
1309 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1578 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1310 $pl->ns->destroy if $pl->ns; 1579 $pl->ns->destroy if $pl->ns;
1311 1580
1312 my $path = playerdir $pl; 1581 my $path = playerdir $pl;
1313 my $temp = "$path~$cf::RUNTIME~deleting~"; 1582 my $temp = "$path~$cf::RUNTIME~deleting~";
1349 or return []; 1618 or return [];
1350 1619
1351 my @logins; 1620 my @logins;
1352 1621
1353 for my $login (@$dirs) { 1622 for my $login (@$dirs) {
1623 my $path = path $login;
1624
1625 # a .pst is a dead give-away for a valid player
1626 # if no pst file found, open and chekc for blocked users
1627 if (aio_stat "$path.pst") {
1354 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1628 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355 aio_read $fh, 0, 512, my $buf, 0 or next; 1629 aio_read $fh, 0, 512, my $buf, 0 or next;
1356 $buf !~ /^password -------------$/m or next; # official not-valid tag 1630 $buf !~ /^password -------------$/m or next; # official not-valid tag
1631 }
1357 1632
1358 utf8::decode $login; 1633 utf8::decode $login;
1359 push @logins, $login; 1634 push @logins, $login;
1360 } 1635 }
1361 1636
1388 } 1663 }
1389 1664
1390 \@paths 1665 \@paths
1391} 1666}
1392 1667
1393=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1668=item $protocol_xml = $player->expand_cfpod ($cfpod)
1394 1669
1395Expand crossfire pod fragments into protocol xml. 1670Expand deliantra pod fragments into protocol xml.
1396 1671
1397=cut
1398
1399sub expand_cfpod {
1400 ((my $self), (local $_)) = @_;
1401
1402 # escape & and <
1403 s/&/&amp;/g;
1404 s/(?<![BIUGH])</&lt;/g;
1405
1406 # this is buggy, it needs to properly take care of nested <'s
1407
1408 1 while
1409 # replace B<>, I<>, U<> etc.
1410 s/B<([^\>]*)>/<b>$1<\/b>/
1411 || s/I<([^\>]*)>/<i>$1<\/i>/
1412 || s/U<([^\>]*)>/<u>$1<\/u>/
1413 # replace G<male|female> tags
1414 || s{G<([^>|]*)\|([^>]*)>}{
1415 $self->gender ? $2 : $1
1416 }ge
1417 # replace H<hint text>
1418 || s{H<([^\>]*)>}
1419 {
1420 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1421 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1422 "")
1423 [$self->{hintmode}]
1424 }ge;
1425
1426 # create single paragraphs (very hackish)
1427 s/(?<=\S)\n(?=\w)/ /g;
1428
1429 # compress some whitespace
1430 s/\s+\n/\n/g; # ws line-ends
1431 s/\n\n+/\n/g; # double lines
1432 s/^\n+//; # beginning lines
1433 s/\n+$//; # ending lines
1434
1435 $_
1436}
1437
1438sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode}
1441}
1442
1443=item $player->ext_reply ($msgid, %msg) 1672=item $player->ext_reply ($msgid, @msg)
1444 1673
1445Sends an ext reply to the player. 1674Sends an ext reply to the player.
1446 1675
1447=cut 1676=cut
1448 1677
1449sub ext_reply($$%) { 1678sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1679 my ($self, $id, @msg) = @_;
1451 1680
1452 $msg{msgid} = $id; 1681 $self->ns->ext_reply ($id, @msg)
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454} 1682}
1455 1683
1456=item $player->ext_event ($type, %msg) 1684=item $player->ext_msg ($type, @msg)
1457 1685
1458Sends an ext event to the client. 1686Sends an ext event to the client.
1459 1687
1460=cut 1688=cut
1461 1689
1462sub ext_event($$%) { 1690sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1691 my ($self, $type, @msg) = @_;
1464 1692
1465 $self->ns->ext_event ($type, %msg); 1693 $self->ns->ext_msg ($type, @msg);
1466} 1694}
1467 1695
1468=head3 cf::region 1696=head3 cf::region
1469 1697
1470=over 4 1698=over 4
1483 my ($path) = @_; 1711 my ($path) = @_;
1484 1712
1485 my ($match, $specificity); 1713 my ($match, $specificity);
1486 1714
1487 for my $region (list) { 1715 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1716 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1717 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1718 if $region->specificity > $specificity;
1491 } 1719 }
1492 } 1720 }
1493 1721
1514our $MAX_RESET = 3600; 1742our $MAX_RESET = 3600;
1515our $DEFAULT_RESET = 3000; 1743our $DEFAULT_RESET = 3000;
1516 1744
1517sub generate_random_map { 1745sub generate_random_map {
1518 my ($self, $rmp) = @_; 1746 my ($self, $rmp) = @_;
1747
1748 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1749
1519 # mit "rum" bekleckern, nicht 1750 # mit "rum" bekleckern, nicht
1520 $self->_create_random_map ( 1751 $self->_create_random_map (
1521 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1752 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1522 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1753 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1523 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1754 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1613 $self->init; # pass $1 etc. 1844 $self->init; # pass $1 etc.
1614 return $self; 1845 return $self;
1615 } 1846 }
1616 } 1847 }
1617 1848
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1849 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1850 ()
1620} 1851}
1621 1852
1622sub init { 1853sub init {
1623 my ($self) = @_; 1854 my ($self) = @_;
1645 1876
1646# the temporary/swap location 1877# the temporary/swap location
1647sub save_path { 1878sub save_path {
1648 my ($self) = @_; 1879 my ($self) = @_;
1649 1880
1650 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1881 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1651 "$TMPDIR/$path.map" 1882 "$TMPDIR/$path.map"
1652} 1883}
1653 1884
1654# the unique path, undef == no special unique path 1885# the unique path, undef == no special unique path
1655sub uniq_path { 1886sub uniq_path {
1656 my ($self) = @_; 1887 my ($self) = @_;
1657 1888
1658 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1889 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1659 "$UNIQUEDIR/$path" 1890 "$UNIQUEDIR/$path"
1660} 1891}
1661 1892
1662# and all this just because we cannot iterate over 1893# and all this just because we cannot iterate over
1663# all maps in C++... 1894# all maps in C++...
1686 1917
1687sub load_header_from($) { 1918sub load_header_from($) {
1688 my ($self, $path) = @_; 1919 my ($self, $path) = @_;
1689 1920
1690 utf8::encode $path; 1921 utf8::encode $path;
1691 #aio_open $path, O_RDONLY, 0 1922 my $f = new_from_file cf::object::thawer $path
1692 # or return;
1693
1694 $self->_load_header ($path)
1695 or return; 1923 or return;
1924
1925 $self->_load_header ($f)
1926 or return;
1927
1928 local $MAP_LOADING{$self->{path}} = $self;
1929 $f->resolve_delayed_derefs;
1696 1930
1697 $self->{load_path} = $path; 1931 $self->{load_path} = $path;
1698 1932
1699 1 1933 1
1700} 1934}
1754sub find { 1988sub find {
1755 my ($path, $origin) = @_; 1989 my ($path, $origin) = @_;
1756 1990
1757 $path = normalise $path, $origin && $origin->path; 1991 $path = normalise $path, $origin && $origin->path;
1758 1992
1993 cf::lock_wait "map_data:$path";#d#remove
1759 cf::lock_wait "map_find:$path"; 1994 cf::lock_wait "map_find:$path";
1760 1995
1761 $cf::MAP{$path} || do { 1996 $cf::MAP{$path} || do {
1997 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1762 my $guard = cf::lock_acquire "map_find:$path"; 1998 my $guard2 = cf::lock_acquire "map_find:$path";
1999
1763 my $map = new_from_path cf::map $path 2000 my $map = new_from_path cf::map $path
1764 or return; 2001 or return;
1765 2002
1766 $map->{last_save} = $cf::RUNTIME; 2003 $map->{last_save} = $cf::RUNTIME;
1767 2004
1769 or return; 2006 or return;
1770 2007
1771 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2008 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1772 # doing this can freeze the server in a sync job, obviously 2009 # doing this can freeze the server in a sync job, obviously
1773 #$cf::WAIT_FOR_TICK->wait; 2010 #$cf::WAIT_FOR_TICK->wait;
2011 undef $guard2;
2012 undef $guard1;
1774 $map->reset; 2013 $map->reset;
1775 undef $guard;
1776 return find $path; 2014 return find $path;
1777 } 2015 }
1778 2016
1779 $cf::MAP{$path} = $map 2017 $cf::MAP{$path} = $map
1780 } 2018 }
1789 local $self->{deny_reset} = 1; # loading can take a long time 2027 local $self->{deny_reset} = 1; # loading can take a long time
1790 2028
1791 my $path = $self->{path}; 2029 my $path = $self->{path};
1792 2030
1793 { 2031 {
1794 my $guard = cf::lock_acquire "map_load:$path"; 2032 my $guard = cf::lock_acquire "map_data:$path";
1795 2033
2034 return unless $self->valid;
1796 return if $self->in_memory != cf::MAP_SWAPPED; 2035 return unless $self->in_memory == cf::MAP_SWAPPED;
1797 2036
1798 $self->in_memory (cf::MAP_LOADING); 2037 $self->in_memory (cf::MAP_LOADING);
1799 2038
1800 $self->alloc; 2039 $self->alloc;
1801 2040
1802 $self->pre_load; 2041 $self->pre_load;
1803 Coro::cede; 2042 cf::cede_to_tick;
1804 2043
2044 my $f = new_from_file cf::object::thawer $self->{load_path};
2045 $f->skip_block;
1805 $self->_load_objects ($self->{load_path}, 1) 2046 $self->_load_objects ($f)
1806 or return; 2047 or return;
1807 2048
1808 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2049 $self->post_load_original
1809 if delete $self->{load_original}; 2050 if delete $self->{load_original};
1810 2051
1811 if (my $uniq = $self->uniq_path) { 2052 if (my $uniq = $self->uniq_path) {
1812 utf8::encode $uniq; 2053 utf8::encode $uniq;
1813 if (aio_open $uniq, O_RDONLY, 0) { 2054 unless (aio_stat $uniq) {
2055 if (my $f = new_from_file cf::object::thawer $uniq) {
1814 $self->clear_unique_items; 2056 $self->clear_unique_items;
1815 $self->_load_objects ($uniq, 0); 2057 $self->_load_objects ($f);
2058 $f->resolve_delayed_derefs;
2059 }
1816 } 2060 }
1817 } 2061 }
1818 2062
1819 Coro::cede; 2063 $f->resolve_delayed_derefs;
2064
2065 cf::cede_to_tick;
1820 # now do the right thing for maps 2066 # now do the right thing for maps
1821 $self->link_multipart_objects; 2067 $self->link_multipart_objects;
1822 $self->difficulty ($self->estimate_difficulty) 2068 $self->difficulty ($self->estimate_difficulty)
1823 unless $self->difficulty; 2069 unless $self->difficulty;
1824 Coro::cede; 2070 cf::cede_to_tick;
1825 2071
1826 unless ($self->{deny_activate}) { 2072 unless ($self->{deny_activate}) {
1827 $self->decay_objects; 2073 $self->decay_objects;
1828 $self->fix_auto_apply; 2074 $self->fix_auto_apply;
1829 $self->update_buttons; 2075 $self->update_buttons;
1830 Coro::cede; 2076 cf::cede_to_tick;
1831 $self->set_darkness_map; 2077 $self->set_darkness_map;
1832 Coro::cede; 2078 cf::cede_to_tick;
1833 $self->activate; 2079 $self->activate;
1834 } 2080 }
1835 2081
2082 $self->{last_save} = $cf::RUNTIME;
2083 $self->last_access ($cf::RUNTIME);
2084
1836 $self->in_memory (cf::MAP_IN_MEMORY); 2085 $self->in_memory (cf::MAP_ACTIVE);
1837 } 2086 }
1838 2087
1839 $self->post_load; 2088 $self->post_load;
1840} 2089}
1841 2090
1850 2099
1851 $self 2100 $self
1852} 2101}
1853 2102
1854# find and load all maps in the 3x3 area around a map 2103# find and load all maps in the 3x3 area around a map
1855sub load_diag { 2104sub load_neighbours {
1856 my ($map) = @_; 2105 my ($map) = @_;
1857 2106
1858 my @diag; # diagonal neighbours 2107 my @neigh; # diagonal neighbours
1859 2108
1860 for (0 .. 3) { 2109 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_) 2110 my $neigh = $map->tile_path ($_)
1862 or next; 2111 or next;
1863 $neigh = find $neigh, $map 2112 $neigh = find $neigh, $map
1864 or next; 2113 or next;
1865 $neigh->load; 2114 $neigh->load;
1866 2115
2116 push @neigh,
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2117 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2118 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 } 2119 }
1870 2120
1871 for (@diag) { 2121 for (grep defined $_->[0], @neigh) {
2122 my ($path, $origin) = @$_;
1872 my $neigh = find @$_ 2123 my $neigh = find $path, $origin
1873 or next; 2124 or next;
1874 $neigh->load; 2125 $neigh->load;
1875 } 2126 }
1876} 2127}
1877 2128
1882} 2133}
1883 2134
1884sub do_load_sync { 2135sub do_load_sync {
1885 my ($map) = @_; 2136 my ($map) = @_;
1886 2137
2138 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2139 if $Coro::current == $Coro::main;
2140
1887 cf::sync_job { $map->load }; 2141 cf::sync_job { $map->load };
1888} 2142}
1889 2143
1890our %MAP_PREFETCH; 2144our %MAP_PREFETCH;
1891our $MAP_PREFETCHER = undef; 2145our $MAP_PREFETCHER = undef;
1892 2146
1893sub find_async { 2147sub find_async {
1894 my ($path, $origin) = @_; 2148 my ($path, $origin, $load) = @_;
1895 2149
1896 $path = normalise $path, $origin && $origin->{path}; 2150 $path = normalise $path, $origin && $origin->{path};
1897 2151
1898 if (my $map = $cf::MAP{$path}) { 2152 if (my $map = $cf::MAP{$path}) {
1899 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2153 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1900 } 2154 }
1901 2155
1902 undef $MAP_PREFETCH{$path}; 2156 $MAP_PREFETCH{$path} |= $load;
2157
1903 $MAP_PREFETCHER ||= cf::async { 2158 $MAP_PREFETCHER ||= cf::async {
2159 $Coro::current->{desc} = "map prefetcher";
2160
1904 while (%MAP_PREFETCH) { 2161 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 2162 while (my ($k, $v) = each %MAP_PREFETCH) {
1906 my $map = find $path 2163 if (my $map = find $k) {
1907 or next;
1908 $map->load; 2164 $map->load if $v;
2165 }
1909 2166
1910 delete $MAP_PREFETCH{$path}; 2167 delete $MAP_PREFETCH{$k};
1911 } 2168 }
1912 } 2169 }
1913 undef $MAP_PREFETCHER; 2170 undef $MAP_PREFETCHER;
1914 }; 2171 };
1915 $MAP_PREFETCHER->prio (6); 2172 $MAP_PREFETCHER->prio (6);
1918} 2175}
1919 2176
1920sub save { 2177sub save {
1921 my ($self) = @_; 2178 my ($self) = @_;
1922 2179
1923 my $lock = cf::lock_acquire "map_data:" . $self->path; 2180 my $lock = cf::lock_acquire "map_data:$self->{path}";
1924 2181
1925 $self->{last_save} = $cf::RUNTIME; 2182 $self->{last_save} = $cf::RUNTIME;
1926 2183
1927 return unless $self->dirty; 2184 return unless $self->dirty;
1928 2185
1934 return if $self->{deny_save}; 2191 return if $self->{deny_save};
1935 2192
1936 local $self->{last_access} = $self->last_access;#d# 2193 local $self->{last_access} = $self->last_access;#d#
1937 2194
1938 cf::async { 2195 cf::async {
2196 $Coro::current->{desc} = "map player save";
1939 $_->contr->save for $self->players; 2197 $_->contr->save for $self->players;
1940 }; 2198 };
2199
2200 cf::get_slot 0.02;
1941 2201
1942 if ($uniq) { 2202 if ($uniq) {
1943 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2203 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1944 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2204 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1945 } else { 2205 } else {
1951 my ($self) = @_; 2211 my ($self) = @_;
1952 2212
1953 # save first because save cedes 2213 # save first because save cedes
1954 $self->save; 2214 $self->save;
1955 2215
1956 my $lock = cf::lock_acquire "map_data:" . $self->path; 2216 my $lock = cf::lock_acquire "map_data:$self->{path}";
1957 2217
1958 return if $self->players; 2218 return if $self->players;
1959 return if $self->in_memory != cf::MAP_IN_MEMORY; 2219 return if $self->in_memory != cf::MAP_ACTIVE;
1960 return if $self->{deny_save}; 2220 return if $self->{deny_save};
1961 2221
2222 $self->in_memory (cf::MAP_SWAPPED);
2223
2224 $self->deactivate;
2225 $_->clear_links_to ($self) for values %cf::MAP;
1962 $self->clear; 2226 $self->clear;
1963 $self->in_memory (cf::MAP_SWAPPED);
1964} 2227}
1965 2228
1966sub reset_at { 2229sub reset_at {
1967 my ($self) = @_; 2230 my ($self) = @_;
1968 2231
2000 if $uniq; 2263 if $uniq;
2001 } 2264 }
2002 2265
2003 delete $cf::MAP{$self->path}; 2266 delete $cf::MAP{$self->path};
2004 2267
2268 $self->deactivate;
2269 $_->clear_links_to ($self) for values %cf::MAP;
2005 $self->clear; 2270 $self->clear;
2006
2007 $_->clear_links_to ($self) for values %cf::MAP;
2008 2271
2009 $self->unlink_save; 2272 $self->unlink_save;
2010 $self->destroy; 2273 $self->destroy;
2011} 2274}
2012 2275
2013my $nuke_counter = "aaaa"; 2276my $nuke_counter = "aaaa";
2014 2277
2015sub nuke { 2278sub nuke {
2016 my ($self) = @_; 2279 my ($self) = @_;
2017 2280
2281 {
2282 my $lock = cf::lock_acquire "map_data:$self->{path}";
2283
2018 delete $cf::MAP{$self->path}; 2284 delete $cf::MAP{$self->path};
2019 2285
2020 $self->unlink_save; 2286 $self->unlink_save;
2021 2287
2022 bless $self, "cf::map"; 2288 bless $self, "cf::map";
2023 delete $self->{deny_reset}; 2289 delete $self->{deny_reset};
2024 $self->{deny_save} = 1; 2290 $self->{deny_save} = 1;
2025 $self->reset_timeout (1); 2291 $self->reset_timeout (1);
2026 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2292 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027 2293
2028 $cf::MAP{$self->path} = $self; 2294 $cf::MAP{$self->path} = $self;
2295 }
2029 2296
2030 $self->reset; # polite request, might not happen 2297 $self->reset; # polite request, might not happen
2031} 2298}
2032 2299
2033=item $maps = cf::map::tmp_maps 2300=item $maps = cf::map::tmp_maps
2075 2342
2076sub unique_maps() { 2343sub unique_maps() {
2077 [ 2344 [
2078 map { 2345 map {
2079 utf8::decode $_; 2346 utf8::decode $_;
2080 /\.map$/ 2347 s/\.map$//; # TODO future compatibility hack
2348 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2349 ? ()
2081 ? normalise $_ 2350 : normalise $_
2082 : ()
2083 } @{ aio_readdir $UNIQUEDIR or [] } 2351 } @{ aio_readdir $UNIQUEDIR or [] }
2084 ] 2352 ]
2085} 2353}
2086 2354
2087package cf;
2088
2089=back 2355=back
2090 2356
2091=head3 cf::object 2357=head3 cf::object
2092 2358
2093=cut 2359=cut
2096 2362
2097=over 4 2363=over 4
2098 2364
2099=item $ob->inv_recursive 2365=item $ob->inv_recursive
2100 2366
2101Returns the inventory of the object _and_ their inventories, recursively. 2367Returns the inventory of the object I<and> their inventories, recursively,
2368but I<not> the object itself.
2102 2369
2103=cut 2370=cut
2104 2371
2105sub inv_recursive_; 2372sub inv_recursive_;
2106sub inv_recursive_ { 2373sub inv_recursive_ {
2109 2376
2110sub inv_recursive { 2377sub inv_recursive {
2111 inv_recursive_ inv $_[0] 2378 inv_recursive_ inv $_[0]
2112} 2379}
2113 2380
2381=item $ref = $ob->ref
2382
2383Creates and returns a persistent reference to an object that can be stored as a string.
2384
2385=item $ob = cf::object::deref ($refstring)
2386
2387returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2388even if the object actually exists. May block.
2389
2390=cut
2391
2392sub deref {
2393 my ($ref) = @_;
2394
2395 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2396 my ($uuid, $name) = ($1, $2);
2397 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2398 or return;
2399 $pl->ob->uuid eq $uuid
2400 or return;
2401
2402 $pl->ob
2403 } else {
2404 warn "$ref: cannot resolve object reference\n";
2405 undef
2406 }
2407}
2408
2114package cf; 2409package cf;
2115 2410
2116=back 2411=back
2117 2412
2118=head3 cf::object::player 2413=head3 cf::object::player
2124Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2419Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2125can be C<undef>. Does the right thing when the player is currently in a 2420can be C<undef>. Does the right thing when the player is currently in a
2126dialogue with the given NPC character. 2421dialogue with the given NPC character.
2127 2422
2128=cut 2423=cut
2424
2425our $SAY_CHANNEL = {
2426 id => "say",
2427 title => "Map",
2428 reply => "say ",
2429 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2430};
2431
2432our $CHAT_CHANNEL = {
2433 id => "chat",
2434 title => "Chat",
2435 reply => "chat ",
2436 tooltip => "Player chat and shouts, global to the server.",
2437};
2129 2438
2130# rough implementation of a future "reply" method that works 2439# rough implementation of a future "reply" method that works
2131# with dialog boxes. 2440# with dialog boxes.
2132#TODO: the first argument must go, split into a $npc->reply_to ( method 2441#TODO: the first argument must go, split into a $npc->reply_to ( method
2133sub cf::object::player::reply($$$;$) { 2442sub cf::object::player::reply($$$;$) {
2140 2449
2141 } else { 2450 } else {
2142 my $pl = $self->contr; 2451 my $pl = $self->contr;
2143 2452
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2453 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2454 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2455 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147 $diag->{id},
2148 msgtype => "reply",
2149 msg => $diag->{pl}->expand_cfpod ($msg),
2150 add_topics => []
2151 );
2152 2456
2153 } else { 2457 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2458 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2459 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2156 } 2460 }
2157 } 2461 }
2462}
2463
2464=item $object->send_msg ($channel, $msg, $color, [extra...])
2465
2466=cut
2467
2468sub cf::object::send_msg {
2469 my $pl = shift->contr
2470 or return;
2471 $pl->send_msg (@_);
2158} 2472}
2159 2473
2160=item $player_object->may ("access") 2474=item $player_object->may ("access")
2161 2475
2162Returns wether the given player is authorized to access resource "access" 2476Returns wether the given player is authorized to access resource "access"
2175 2489
2176=item $player_object->enter_link 2490=item $player_object->enter_link
2177 2491
2178Freezes the player and moves him/her to a special map (C<{link}>). 2492Freezes the player and moves him/her to a special map (C<{link}>).
2179 2493
2180The player should be reasonably safe there for short amounts of time. You 2494The player should be reasonably safe there for short amounts of time (e.g.
2181I<MUST> call C<leave_link> as soon as possible, though. 2495for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2496though, as the palyer cannot control the character while it is on the link
2497map.
2182 2498
2183Will never block. 2499Will never block.
2184 2500
2185=item $player_object->leave_link ($map, $x, $y) 2501=item $player_object->leave_link ($map, $x, $y)
2186 2502
2241 # use -1 or undef as default coordinates, not 0, 0 2557 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2558 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2559 if $x <=0 && $y <= 0;
2244 2560
2245 $map->load; 2561 $map->load;
2246 $map->load_diag; 2562 $map->load_neighbours;
2247 2563
2248 return unless $self->contr->active; 2564 return unless $self->contr->active;
2565 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2249 $self->activate_recursive; 2566 $self->activate_recursive;
2250 2567
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2568 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2569 $self->enter_map ($map, $x, $y);
2253} 2570}
2254 2571
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2572=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2573
2257Moves the player to the given map-path and coordinates by first freezing 2574Moves the player to the given map-path and coordinates by first freezing
2258her, loading and preparing them map, calling the provided $check callback 2575her, loading and preparing them map, calling the provided $check callback
2259that has to return the map if sucecssful, and then unfreezes the player on 2576that has to return the map if sucecssful, and then unfreezes the player on
2260the new (success) or old (failed) map position. 2577the new (success) or old (failed) map position. In either case, $done will
2578be called at the end of this process.
2579
2580Note that $check will be called with a potentially non-loaded map, so if
2581it needs a loaded map it has to call C<< ->load >>.
2261 2582
2262=cut 2583=cut
2263 2584
2264our $GOTOGEN; 2585our $GOTOGEN;
2265 2586
2266sub cf::object::player::goto { 2587sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2588 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2589
2269 # do generation counting so two concurrent goto's will be executed in-order 2590 # do generation counting so two concurrent goto's will be executed in-order
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2591 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2592
2272 $self->enter_link; 2593 $self->enter_link;
2273 2594
2274 (async { 2595 (async {
2596 $Coro::current->{desc} = "player::goto $path $x $y";
2597
2598 # *tag paths override both path and x|y
2599 if ($path =~ /^\*(.*)$/) {
2600 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2601 my $ob = $obs[rand @obs];
2602
2603 # see if we actually can go there
2604 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2605 $ob = $obs[rand @obs];
2606 } else {
2607 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2608 }
2609 # else put us there anyways for now #d#
2610
2611 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2612 } else {
2613 ($path, $x, $y) = (undef, undef, undef);
2614 }
2615 }
2616
2275 my $map = eval { 2617 my $map = eval {
2276 my $map = cf::map::find $path; 2618 my $map = defined $path ? cf::map::find $path : undef;
2277 2619
2278 if ($map) { 2620 if ($map) {
2279 $map = $map->customise_for ($self); 2621 $map = $map->customise_for ($self);
2280 $map = $check->($map) if $check && $map; 2622 $map = $check->($map) if $check && $map;
2281 } else { 2623 } else {
2282 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2624 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2283 } 2625 }
2284 2626
2285 $map 2627 $map
2286 }; 2628 };
2287 2629
2292 2634
2293 if ($gen == $self->{_goto_generation}) { 2635 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2636 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2637 $self->leave_link ($map, $x, $y);
2296 } 2638 }
2639
2640 $done->() if $done;
2297 })->prio (1); 2641 })->prio (1);
2298} 2642}
2299 2643
2300=item $player_object->enter_exit ($exit_object) 2644=item $player_object->enter_exit ($exit_object)
2301 2645
2321} 2665}
2322 2666
2323sub prepare_random_map { 2667sub prepare_random_map {
2324 my ($exit) = @_; 2668 my ($exit) = @_;
2325 2669
2326 my $guard = cf::lock_acquire "exit_prepare:$exit";
2327
2328 # all this does is basically replace the /! path by 2670 # all this does is basically replace the /! path by
2329 # a new random map path (?random/...) with a seed 2671 # a new random map path (?random/...) with a seed
2330 # that depends on the exit object 2672 # that depends on the exit object
2331 2673
2332 my $rmp = parse_random_map_params $exit->msg; 2674 my $rmp = parse_random_map_params $exit->msg;
2334 if ($exit->map) { 2676 if ($exit->map) {
2335 $rmp->{region} = $exit->region->name; 2677 $rmp->{region} = $exit->region->name;
2336 $rmp->{origin_map} = $exit->map->path; 2678 $rmp->{origin_map} = $exit->map->path;
2337 $rmp->{origin_x} = $exit->x; 2679 $rmp->{origin_x} = $exit->x;
2338 $rmp->{origin_y} = $exit->y; 2680 $rmp->{origin_y} = $exit->y;
2681
2682 $exit->map->touch;
2339 } 2683 }
2340 2684
2341 $rmp->{random_seed} ||= $exit->random_seed; 2685 $rmp->{random_seed} ||= $exit->random_seed;
2342 2686
2343 my $data = cf::to_json $rmp; 2687 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2344 my $md5 = Digest::MD5::md5_hex $data; 2688 my $md5 = Digest::MD5::md5_hex $data;
2345 my $meta = "$RANDOMDIR/$md5.meta"; 2689 my $meta = "$RANDOMDIR/$md5.meta";
2346 2690
2347 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2691 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2348 aio_write $fh, 0, (length $data), $data, 0; 2692 aio_write $fh, 0, (length $data), $data, 0;
2349 undef $fh; 2693 undef $fh;
2350 aio_rename "$meta~", $meta; 2694 aio_rename "$meta~", $meta;
2351 2695
2696 my $slaying = "?random/$md5";
2697
2698 if ($exit->valid) {
2352 $exit->slaying ("?random/$md5"); 2699 $exit->slaying ("?random/$md5");
2353 $exit->msg (undef); 2700 $exit->msg (undef);
2701 }
2354 } 2702 }
2355} 2703}
2356 2704
2357sub cf::object::player::enter_exit { 2705sub cf::object::player::enter_exit {
2358 my ($self, $exit) = @_; 2706 my ($self, $exit) = @_;
2359 2707
2360 return unless $self->type == cf::PLAYER; 2708 return unless $self->type == cf::PLAYER;
2361 2709
2362 if ($exit->slaying eq "/!") {
2363 #TODO: this should de-fi-ni-te-ly not be a sync-job
2364 # the problem is that $exit might not survive long enough
2365 # so it needs to be done right now, right here
2366 cf::sync_job { prepare_random_map $exit };
2367 }
2368
2369 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2370 my $hp = $exit->stats->hp;
2371 my $sp = $exit->stats->sp;
2372
2373 $self->enter_link; 2710 $self->enter_link;
2374 2711
2375 # if exit is damned, update players death & WoR home-position
2376 $self->contr->savebed ($slaying, $hp, $sp)
2377 if $exit->flag (FLAG_DAMNED);
2378
2379 (async { 2712 (async {
2380 $self->deactivate_recursive; # just to be sure 2713 $Coro::current->{desc} = "enter_exit";
2714
2381 unless (eval { 2715 unless (eval {
2716 $self->deactivate_recursive; # just to be sure
2717
2718 # random map handling
2719 {
2720 my $guard = cf::lock_acquire "exit_prepare:$exit";
2721
2722 prepare_random_map $exit
2723 if $exit->slaying eq "/!";
2724 }
2725
2726 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2727 my $x = $exit->stats->hp;
2728 my $y = $exit->stats->sp;
2729
2382 $self->goto ($slaying, $hp, $sp); 2730 $self->goto ($map, $x, $y);
2383 2731
2732 # if exit is damned, update players death & WoR home-position
2733 $self->contr->savebed ($map, $x, $y)
2734 if $exit->flag (cf::FLAG_DAMNED);
2735
2384 1; 2736 1
2385 }) { 2737 }) {
2386 $self->message ("Something went wrong deep within the crossfire server. " 2738 $self->message ("Something went wrong deep within the deliantra server. "
2387 . "I'll try to bring you back to the map you were before. " 2739 . "I'll try to bring you back to the map you were before. "
2388 . "Please report this to the dungeon master!", 2740 . "Please report this to the dungeon master!",
2389 cf::NDI_UNIQUE | cf::NDI_RED); 2741 cf::NDI_UNIQUE | cf::NDI_RED);
2390 2742
2391 warn "ERROR in enter_exit: $@"; 2743 warn "ERROR in enter_exit: $@";
2410 2762
2411 utf8::encode $text; 2763 utf8::encode $text;
2412 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2764 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2413} 2765}
2414 2766
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2767=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2768
2417Send a drawinfo or msg packet to the client, formatting the msg for the 2769Send a drawinfo or msg packet to the client, formatting the msg for the
2418client if neccessary. C<$type> should be a string identifying the type of 2770client if neccessary. C<$type> should be a string identifying the type of
2419the message, with C<log> being the default. If C<$color> is negative, suppress 2771the message, with C<log> being the default. If C<$color> is negative, suppress
2420the message unless the client supports the msg packet. 2772the message unless the client supports the msg packet.
2421 2773
2422=cut 2774=cut
2423 2775
2776# non-persistent channels (usually the info channel)
2777our %CHANNEL = (
2778 "c/identify" => {
2779 id => "infobox",
2780 title => "Identify",
2781 reply => undef,
2782 tooltip => "Items recently identified",
2783 },
2784 "c/examine" => {
2785 id => "infobox",
2786 title => "Examine",
2787 reply => undef,
2788 tooltip => "Signs and other items you examined",
2789 },
2790 "c/book" => {
2791 id => "infobox",
2792 title => "Book",
2793 reply => undef,
2794 tooltip => "The contents of a note or book",
2795 },
2796 "c/lookat" => {
2797 id => "infobox",
2798 title => "Look",
2799 reply => undef,
2800 tooltip => "What you saw there",
2801 },
2802 "c/who" => {
2803 id => "infobox",
2804 title => "Players",
2805 reply => undef,
2806 tooltip => "Shows players who are currently online",
2807 },
2808 "c/body" => {
2809 id => "infobox",
2810 title => "Body Parts",
2811 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available",
2813 },
2814 "c/skills" => {
2815 id => "infobox",
2816 title => "Skills",
2817 reply => undef,
2818 tooltip => "Shows your experience per skill and item power",
2819 },
2820 "c/uptime" => {
2821 id => "infobox",
2822 title => "Uptime",
2823 reply => undef,
2824 tooltip => "How long the server has been running since last restart",
2825 },
2826 "c/mapinfo" => {
2827 id => "infobox",
2828 title => "Map Info",
2829 reply => undef,
2830 tooltip => "Information related to the maps",
2831 },
2832 "c/party" => {
2833 id => "party",
2834 title => "Party",
2835 reply => "gsay ",
2836 tooltip => "Messages and chat related to your party",
2837 },
2838);
2839
2424sub cf::client::send_msg { 2840sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2841 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2842
2427 $msg = $self->pl->expand_cfpod ($msg); 2843 $msg = $self->pl->expand_cfpod ($msg)
2844 unless $color & cf::NDI_VERBATIM;
2845
2846 $color &= cf::NDI_CLIENT_MASK; # just in case...
2847
2848 # check predefined channels, for the benefit of C
2849 if ($CHANNEL{$channel}) {
2850 $channel = $CHANNEL{$channel};
2851
2852 $self->ext_msg (channel_info => $channel)
2853 if $self->can_msg;
2854
2855 $channel = $channel->{id};
2856
2857 } elsif (ref $channel) {
2858 # send meta info to client, if not yet sent
2859 unless (exists $self->{channel}{$channel->{id}}) {
2860 $self->{channel}{$channel->{id}} = $channel;
2861 $self->ext_msg (channel_info => $channel)
2862 if $self->can_msg;
2863 }
2864
2865 $channel = $channel->{id};
2866 }
2428 2867
2429 return unless @extra || length $msg; 2868 return unless @extra || length $msg;
2430 2869
2431 if ($self->can_msg) { 2870 if ($self->can_msg) {
2432 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2871 # default colour, mask it out
2872 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2873 if $color & cf::NDI_DEF;
2874
2875 my $pkt = "msg "
2876 . $self->{json_coder}->encode (
2877 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2878 );
2879
2880 # try lzf for large packets
2881 $pkt = "lzf " . Compress::LZF::compress $pkt
2882 if 1024 <= length $pkt and $self->{can_lzf};
2883
2884 # split very large packets
2885 if (8192 < length $pkt and $self->{can_lzf}) {
2886 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2887 $pkt = "frag";
2888 }
2889
2890 $self->send_packet ($pkt);
2433 } else { 2891 } else {
2434 # replace some tags by gcfclient-compatible ones
2435 for ($msg) {
2436 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442 }
2443
2444 if ($color >= 0) { 2892 if ($color >= 0) {
2893 # replace some tags by gcfclient-compatible ones
2894 for ($msg) {
2895 1 while
2896 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2897 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2898 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2899 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2900 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2901 }
2902
2903 $color &= cf::NDI_COLOR_MASK;
2904
2905 utf8::encode $msg;
2906
2445 if (0 && $msg =~ /\[/) { 2907 if (0 && $msg =~ /\[/) {
2908 # COMMAND/INFO
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2909 $self->send_packet ("drawextinfo $color 10 8 $msg")
2447 } else { 2910 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2911 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg") 2912 $self->send_packet ("drawinfo $color $msg")
2450 } 2913 }
2451 } 2914 }
2452 } 2915 }
2453} 2916}
2454 2917
2455=item $client->ext_event ($type, %msg) 2918=item $client->ext_msg ($type, @msg)
2456 2919
2457Sends an ext event to the client. 2920Sends an ext event to the client.
2458 2921
2459=cut 2922=cut
2460 2923
2461sub cf::client::ext_event($$%) { 2924sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2925 my ($self, $type, @msg) = @_;
2463 2926
2927 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove
2464 $msg{msgtype} = "event_$type"; 2930 push @msg, msgtype => "event_$type";
2465 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 }
2933}
2934
2935=item $client->ext_reply ($msgid, @msg)
2936
2937Sends an ext reply to the client.
2938
2939=cut
2940
2941sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_;
2943
2944 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 }
2466} 2951}
2467 2952
2468=item $success = $client->query ($flags, "text", \&cb) 2953=item $success = $client->query ($flags, "text", \&cb)
2469 2954
2470Queues a query to the client, calling the given callback with 2955Queues a query to the client, calling the given callback with
2525 my ($ns, $buf) = @_; 3010 my ($ns, $buf) = @_;
2526 3011
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3012 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 3013
2529 if (ref $msg) { 3014 if (ref $msg) {
3015 my ($type, $reply, @payload) =
3016 "ARRAY" eq ref $msg
3017 ? @$msg
3018 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3019
3020 my @reply;
3021
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3022 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 3023 @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 } 3024 }
3025
3026 $ns->ext_reply ($reply, @reply)
3027 if $reply;
3028
2536 } else { 3029 } else {
2537 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3030 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2538 } 3031 }
2539 3032
2540 cf::override; 3033 cf::override;
2587our $safe = new Safe "safe"; 3080our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 3081our $safe_hole = new Safe::Hole;
2589 3082
2590$SIG{FPE} = 'IGNORE'; 3083$SIG{FPE} = 'IGNORE';
2591 3084
2592$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3085$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math
3087 grepstart grepwhile mapstart mapwhile
3088 sort time
3089));
2593 3090
2594# here we export the classes and methods available to script code 3091# here we export the classes and methods available to script code
2595 3092
2596=pod 3093=pod
2597 3094
2598The following functions and methods are available within a safe environment: 3095The following functions and methods are available within a safe environment:
2599 3096
2600 cf::object 3097 cf::object
2601 contr pay_amount pay_player map x y force_find force_add 3098 contr pay_amount pay_player map x y force_find force_add destroy
2602 insert remove 3099 insert remove name archname title slaying race decrease split
2603 3100
2604 cf::object::player 3101 cf::object::player
2605 player 3102 player
2606 3103
2607 cf::player 3104 cf::player
2612 3109
2613=cut 3110=cut
2614 3111
2615for ( 3112for (
2616 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3113 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2617 insert remove)], 3114 insert remove inv nrof name archname title slaying race
3115 decrease split destroy change_exp)],
2618 ["cf::object::player" => qw(player)], 3116 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 3117 ["cf::player" => qw(peaceful)],
2620 ["cf::map" => qw(trigger)], 3118 ["cf::map" => qw(trigger)],
2621) { 3119) {
2622 no strict 'refs'; 3120 no strict 'refs';
2698# the server's init and main functions 3196# the server's init and main functions
2699 3197
2700sub load_facedata($) { 3198sub load_facedata($) {
2701 my ($path) = @_; 3199 my ($path) = @_;
2702 3200
3201 # HACK to clear player env face cache, we need some signal framework
3202 # for this (global event?)
3203 %ext::player_env::MUSIC_FACE_CACHE = ();
3204
3205 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3206
2703 warn "loading facedata from $path\n"; 3207 warn "loading facedata from $path\n";
2704 3208
2705 my $facedata; 3209 my $facedata;
2706 0 < aio_load $path, $facedata 3210 0 < aio_load $path, $facedata
2707 or die "$path: $!"; 3211 or die "$path: $!";
2709 $facedata = Coro::Storable::thaw $facedata; 3213 $facedata = Coro::Storable::thaw $facedata;
2710 3214
2711 $facedata->{version} == 2 3215 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 3216 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 3217
3218 # patch in the exptable
3219 $facedata->{resource}{"res/exp_table"} = {
3220 type => FT_RSRC,
3221 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3222 };
3223 cf::cede_to_tick;
3224
2714 { 3225 {
2715 my $faces = $facedata->{faceinfo}; 3226 my $faces = $facedata->{faceinfo};
2716 3227
2717 while (my ($face, $info) = each %$faces) { 3228 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3229 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3230
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3231 cf::face::set_visibility $idx, $info->{visibility};
3232 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3233 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3234 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722 Coro::cede; 3235
3236 cf::cede_to_tick;
2723 } 3237 }
2724 3238
2725 while (my ($face, $info) = each %$faces) { 3239 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 3240 next unless $info->{smooth};
3241
2727 my $idx = cf::face::find $face 3242 my $idx = cf::face::find $face
2728 or next; 3243 or next;
3244
2729 if (my $smooth = cf::face::find $info->{smooth}) { 3245 if (my $smooth = cf::face::find $info->{smooth}) {
3246 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3247 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 3248 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3249 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 3250 }
2734 Coro::cede; 3251
3252 cf::cede_to_tick;
2735 } 3253 }
2736 } 3254 }
2737 3255
2738 { 3256 {
2739 my $anims = $facedata->{animinfo}; 3257 my $anims = $facedata->{animinfo};
2740 3258
2741 while (my ($anim, $info) = each %$anims) { 3259 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3260 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 3261 cf::cede_to_tick;
2744 } 3262 }
2745 3263
2746 cf::anim::invalidate_all; # d'oh 3264 cf::anim::invalidate_all; # d'oh
2747 } 3265 }
2748 3266
3267 {
3268 # TODO: for gcfclient pleasure, we should give resources
3269 # that gcfclient doesn't grok a >10000 face index.
3270 my $res = $facedata->{resource};
3271
3272 while (my ($name, $info) = each %$res) {
3273 if (defined $info->{type}) {
3274 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3275 my $data;
3276
3277 if ($info->{type} & 1) {
3278 # prepend meta info
3279
3280 my $meta = $enc->encode ({
3281 name => $name,
3282 %{ $info->{meta} || {} },
3283 });
3284
3285 $data = pack "(w/a*)*", $meta, $info->{data};
3286 } else {
3287 $data = $info->{data};
3288 }
3289
3290 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3291 cf::face::set_type $idx, $info->{type};
3292 } else {
3293 $RESOURCE{$name} = $info;
3294 }
3295
3296 cf::cede_to_tick;
3297 }
3298 }
3299
3300 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3301
2749 1 3302 1
2750} 3303}
2751 3304
3305cf::global->attach (on_resource_update => sub {
3306 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3307 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3308
3309 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3310 my $sound = $soundconf->{compat}[$_]
3311 or next;
3312
3313 my $face = cf::face::find "sound/$sound->[1]";
3314 cf::sound::set $sound->[0] => $face;
3315 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3316 }
3317
3318 while (my ($k, $v) = each %{$soundconf->{event}}) {
3319 my $face = cf::face::find "sound/$v";
3320 cf::sound::set $k => $face;
3321 }
3322 }
3323});
3324
3325register_exticmd fx_want => sub {
3326 my ($ns, $want) = @_;
3327
3328 while (my ($k, $v) = each %$want) {
3329 $ns->fx_want ($k, $v);
3330 }
3331};
3332
3333sub load_resource_file($) {
3334 my $guard = lock_acquire "load_resource_file";
3335
3336 my $status = load_resource_file_ $_[0];
3337 get_slot 0.1, 100;
3338 cf::arch::commit_load;
3339
3340 $status
3341}
3342
2752sub reload_regions { 3343sub reload_regions {
3344 # HACK to clear player env face cache, we need some signal framework
3345 # for this (global event?)
3346 %ext::player_env::MUSIC_FACE_CACHE = ();
3347
2753 load_resource_file "$MAPDIR/regions" 3348 load_resource_file "$MAPDIR/regions"
2754 or die "unable to load regions file\n"; 3349 or die "unable to load regions file\n";
3350
3351 for (cf::region::list) {
3352 $_->{match} = qr/$_->{match}/
3353 if exists $_->{match};
3354 }
2755} 3355}
2756 3356
2757sub reload_facedata { 3357sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 3358 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 3359 or die "unable to load facedata\n";
2760} 3360}
2761 3361
2762sub reload_archetypes { 3362sub reload_archetypes {
2763 load_resource_file "$DATADIR/archetypes" 3363 load_resource_file "$DATADIR/archetypes"
2764 or die "unable to load archetypes\n"; 3364 or die "unable to load archetypes\n";
2765 #d# NEED to laod twice to resolve forward references
2766 # this really needs to be done in an extra post-pass
2767 # (which needs to be synchronous, so solve it differently)
2768 load_resource_file "$DATADIR/archetypes"
2769 or die "unable to load archetypes\n";
2770} 3365}
2771 3366
2772sub reload_treasures { 3367sub reload_treasures {
2773 load_resource_file "$DATADIR/treasures" 3368 load_resource_file "$DATADIR/treasures"
2774 or die "unable to load treasurelists\n"; 3369 or die "unable to load treasurelists\n";
2775} 3370}
2776 3371
2777sub reload_resources { 3372sub reload_resources {
2778 warn "reloading resource files...\n"; 3373 warn "reloading resource files...\n";
2779 3374
3375 reload_facedata;
3376 reload_archetypes;
2780 reload_regions; 3377 reload_regions;
2781 reload_facedata;
2782 #reload_archetypes;#d#
2783 reload_archetypes;
2784 reload_treasures; 3378 reload_treasures;
2785 3379
2786 warn "finished reloading resource files\n"; 3380 warn "finished reloading resource files\n";
2787} 3381}
2788 3382
2789sub init { 3383sub reload_config {
2790 reload_resources;
2791}
2792
2793sub cfg_load {
2794 open my $fh, "<:utf8", "$CONFDIR/config" 3384 open my $fh, "<:utf8", "$CONFDIR/config"
2795 or return; 3385 or return;
2796 3386
2797 local $/; 3387 local $/;
2798 *CFG = YAML::Syck::Load <$fh>; 3388 *CFG = YAML::Load <$fh>;
2799 3389
2800 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3390 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2801 3391
2802 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3392 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2803 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3393 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2809 }; 3399 };
2810 warn $@ if $@; 3400 warn $@ if $@;
2811 } 3401 }
2812} 3402}
2813 3403
3404sub pidfile() {
3405 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3406 or die "$PIDFILE: $!";
3407 flock $fh, &Fcntl::LOCK_EX
3408 or die "$PIDFILE: flock: $!";
3409 $fh
3410}
3411
3412# make sure only one server instance is running at any one time
3413sub atomic {
3414 my $fh = pidfile;
3415
3416 my $pid = <$fh>;
3417 kill 9, $pid if $pid > 0;
3418
3419 seek $fh, 0, 0;
3420 print $fh $$;
3421}
3422
2814sub main { 3423sub main {
3424 cf::init_globals; # initialise logging
3425
3426 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3427 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3428 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3429 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3430
3431 cf::init_experience;
3432 cf::init_anim;
3433 cf::init_attackmess;
3434 cf::init_dynamic;
3435 cf::init_block;
3436
3437 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3438
2815 # we must not ever block the main coroutine 3439 # we must not ever block the main coroutine
2816 local $Coro::idle = sub { 3440 local $Coro::idle = sub {
2817 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3441 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2818 (async { 3442 (async {
2819 Event::one_event; 3443 $Coro::current->{desc} = "IDLE BUG HANDLER";
3444 EV::loop EV::LOOP_ONESHOT;
2820 })->prio (Coro::PRIO_MAX); 3445 })->prio (Coro::PRIO_MAX);
2821 }; 3446 };
2822 3447
2823 cfg_load; 3448 evthread_start IO::AIO::poll_fileno;
3449
3450 cf::sync_job {
3451 reload_resources;
3452 reload_config;
2824 db_init; 3453 db_init;
3454
3455 cf::load_settings;
3456 cf::load_materials;
3457 cf::init_uuid;
3458 cf::init_signals;
3459 cf::init_commands;
3460 cf::init_skills;
3461
3462 cf::init_beforeplay;
3463
3464 atomic;
3465
2825 load_extensions; 3466 load_extensions;
2826 3467
2827 $TICK_WATCHER->start; 3468 utime time, time, $RUNTIMEFILE;
3469
3470 # no (long-running) fork's whatsoever before this point(!)
3471 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3472
3473 (pop @POST_INIT)->(0) while @POST_INIT;
3474 };
3475
2828 Event::loop; 3476 EV::loop;
2829} 3477}
2830 3478
2831############################################################################# 3479#############################################################################
2832# initialisation and cleanup 3480# initialisation and cleanup
2833 3481
2834# install some emergency cleanup handlers 3482# install some emergency cleanup handlers
2835BEGIN { 3483BEGIN {
3484 our %SIGWATCHER = ();
2836 for my $signal (qw(INT HUP TERM)) { 3485 for my $signal (qw(INT HUP TERM)) {
2837 Event->signal ( 3486 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2838 reentrant => 0,
2839 data => WF_AUTOCANCEL,
2840 signal => $signal,
2841 prio => 0,
2842 cb => sub {
2843 cf::cleanup "SIG$signal"; 3487 cf::cleanup "SIG$signal";
2844 },
2845 ); 3488 };
2846 } 3489 }
2847} 3490}
2848 3491
2849sub write_runtime { 3492sub write_runtime_sync {
2850 my $runtime = "$LOCALDIR/runtime";
2851
2852 # first touch the runtime file to show we are still running: 3493 # first touch the runtime file to show we are still running:
2853 # the fsync below can take a very very long time. 3494 # the fsync below can take a very very long time.
2854 3495
2855 IO::AIO::aio_utime $runtime, undef, undef; 3496 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2856 3497
2857 my $guard = cf::lock_acquire "write_runtime"; 3498 my $guard = cf::lock_acquire "write_runtime";
2858 3499
2859 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3500 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2860 or return; 3501 or return;
2861 3502
2862 my $value = $cf::RUNTIME + 90 + 10; 3503 my $value = $cf::RUNTIME + 90 + 10;
2863 # 10 is the runtime save interval, for a monotonic clock 3504 # 10 is the runtime save interval, for a monotonic clock
2864 # 60 allows for the watchdog to kill the server. 3505 # 60 allows for the watchdog to kill the server.
2874 aio_utime $fh, undef, undef; 3515 aio_utime $fh, undef, undef;
2875 3516
2876 close $fh 3517 close $fh
2877 or return; 3518 or return;
2878 3519
2879 aio_rename "$runtime~", $runtime 3520 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2880 and return; 3521 and return;
2881 3522
2882 warn "runtime file written.\n"; 3523 warn "runtime file written.\n";
2883 3524
2884 1 3525 1
3526}
3527
3528our $uuid_lock;
3529our $uuid_skip;
3530
3531sub write_uuid_sync($) {
3532 $uuid_skip ||= $_[0];
3533
3534 return if $uuid_lock;
3535 local $uuid_lock = 1;
3536
3537 my $uuid = "$LOCALDIR/uuid";
3538
3539 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3540 or return;
3541
3542 my $value = uuid_seq uuid_cur;
3543
3544 unless ($value) {
3545 warn "cowardly refusing to write zero uuid value!\n";
3546 return;
3547 }
3548
3549 my $value = uuid_str $value + $uuid_skip;
3550 $uuid_skip = 0;
3551
3552 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3553 and return;
3554
3555 # always fsync - this file is important
3556 aio_fsync $fh
3557 and return;
3558
3559 close $fh
3560 or return;
3561
3562 aio_rename "$uuid~", $uuid
3563 and return;
3564
3565 warn "uuid file written ($value).\n";
3566
3567 1
3568
3569}
3570
3571sub write_uuid($$) {
3572 my ($skip, $sync) = @_;
3573
3574 $sync ? write_uuid_sync $skip
3575 : async { write_uuid_sync $skip };
2885} 3576}
2886 3577
2887sub emergency_save() { 3578sub emergency_save() {
2888 my $freeze_guard = cf::freeze_mainloop; 3579 my $freeze_guard = cf::freeze_mainloop;
2889 3580
2890 warn "enter emergency perl save\n"; 3581 warn "emergency_perl_save: enter\n";
2891 3582
2892 cf::sync_job { 3583 cf::sync_job {
3584 # this is a trade-off: we want to be very quick here, so
3585 # save all maps without fsync, and later call a global sync
3586 # (which in turn might be very very slow)
3587 local $USE_FSYNC = 0;
3588
2893 # use a peculiar iteration method to avoid tripping on perl 3589 # use a peculiar iteration method to avoid tripping on perl
2894 # refcount bugs in for. also avoids problems with players 3590 # refcount bugs in for. also avoids problems with players
2895 # and maps saved/destroyed asynchronously. 3591 # and maps saved/destroyed asynchronously.
2896 warn "begin emergency player save\n"; 3592 warn "emergency_perl_save: begin player save\n";
2897 for my $login (keys %cf::PLAYER) { 3593 for my $login (keys %cf::PLAYER) {
2898 my $pl = $cf::PLAYER{$login} or next; 3594 my $pl = $cf::PLAYER{$login} or next;
2899 $pl->valid or next; 3595 $pl->valid or next;
3596 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2900 $pl->save; 3597 $pl->save;
2901 } 3598 }
2902 warn "end emergency player save\n"; 3599 warn "emergency_perl_save: end player save\n";
2903 3600
2904 warn "begin emergency map save\n"; 3601 warn "emergency_perl_save: begin map save\n";
2905 for my $path (keys %cf::MAP) { 3602 for my $path (keys %cf::MAP) {
2906 my $map = $cf::MAP{$path} or next; 3603 my $map = $cf::MAP{$path} or next;
2907 $map->valid or next; 3604 $map->valid or next;
2908 $map->save; 3605 $map->save;
2909 } 3606 }
2910 warn "end emergency map save\n"; 3607 warn "emergency_perl_save: end map save\n";
2911 3608
2912 warn "begin emergency database checkpoint\n"; 3609 warn "emergency_perl_save: begin database checkpoint\n";
2913 BDB::db_env_txn_checkpoint $DB_ENV; 3610 BDB::db_env_txn_checkpoint $DB_ENV;
2914 warn "end emergency database checkpoint\n"; 3611 warn "emergency_perl_save: end database checkpoint\n";
3612
3613 warn "emergency_perl_save: begin write uuid\n";
3614 write_uuid_sync 1;
3615 warn "emergency_perl_save: end write uuid\n";
2915 }; 3616 };
2916 3617
3618 warn "emergency_perl_save: starting sync()\n";
3619 IO::AIO::aio_sync sub {
3620 warn "emergency_perl_save: finished sync()\n";
3621 };
3622
2917 warn "leave emergency perl save\n"; 3623 warn "emergency_perl_save: leave\n";
2918} 3624}
2919 3625
2920sub post_cleanup { 3626sub post_cleanup {
2921 my ($make_core) = @_; 3627 my ($make_core) = @_;
2922 3628
2923 warn Carp::longmess "post_cleanup backtrace" 3629 warn Carp::longmess "post_cleanup backtrace"
2924 if $make_core; 3630 if $make_core;
3631
3632 my $fh = pidfile;
3633 unlink $PIDFILE if <$fh> == $$;
3634}
3635
3636# a safer delete_package, copied from Symbol
3637sub clear_package($) {
3638 my $pkg = shift;
3639
3640 # expand to full symbol table name if needed
3641 unless ($pkg =~ /^main::.*::$/) {
3642 $pkg = "main$pkg" if $pkg =~ /^::/;
3643 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3644 $pkg .= '::' unless $pkg =~ /::$/;
3645 }
3646
3647 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3648 my $stem_symtab = *{$stem}{HASH};
3649
3650 defined $stem_symtab and exists $stem_symtab->{$leaf}
3651 or return;
3652
3653 # clear all symbols
3654 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3655 for my $name (keys %$leaf_symtab) {
3656 _gv_clear *{"$pkg$name"};
3657# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3658 }
3659 warn "cleared package $pkg\n";#d#
2925} 3660}
2926 3661
2927sub do_reload_perl() { 3662sub do_reload_perl() {
2928 # can/must only be called in main 3663 # can/must only be called in main
2929 if ($Coro::current != $Coro::main) { 3664 if ($Coro::current != $Coro::main) {
2930 warn "can only reload from main coroutine"; 3665 warn "can only reload from main coroutine";
2931 return; 3666 return;
2932 } 3667 }
2933 3668
3669 return if $RELOAD++;
3670
3671 my $t1 = EV::time;
3672
3673 while ($RELOAD) {
2934 warn "reloading..."; 3674 warn "reloading...";
2935 3675
2936 warn "entering sync_job"; 3676 warn "entering sync_job";
2937 3677
2938 cf::sync_job { 3678 cf::sync_job {
2939 cf::write_runtime; # external watchdog should not bark 3679 cf::write_runtime_sync; # external watchdog should not bark
2940 cf::emergency_save; 3680 cf::emergency_save;
2941 cf::write_runtime; # external watchdog should not bark 3681 cf::write_runtime_sync; # external watchdog should not bark
2942 3682
2943 warn "syncing database to disk"; 3683 warn "syncing database to disk";
2944 BDB::db_env_txn_checkpoint $DB_ENV; 3684 BDB::db_env_txn_checkpoint $DB_ENV;
2945 3685
2946 # if anything goes wrong in here, we should simply crash as we already saved 3686 # if anything goes wrong in here, we should simply crash as we already saved
2947 3687
2948 warn "cancelling all WF_AUTOCANCEL watchers";
2949 for (Event::all_watchers) {
2950 $_->cancel if $_->data & WF_AUTOCANCEL;
2951 }
2952
2953 warn "flushing outstanding aio requests"; 3688 warn "flushing outstanding aio requests";
2954 for (;;) {
2955 BDB::flush;
2956 IO::AIO::flush;
2957 Coro::cede;
2958 last unless IO::AIO::nreqs || BDB::nreqs; 3689 while (IO::AIO::nreqs || BDB::nreqs) {
2959 warn "iterate..."; 3690 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2960 }
2961
2962 ++$RELOAD;
2963
2964 warn "cancelling all extension coros";
2965 $_->cancel for values %EXT_CORO;
2966 %EXT_CORO = ();
2967
2968 warn "removing commands";
2969 %COMMAND = ();
2970
2971 warn "removing ext/exti commands";
2972 %EXTCMD = ();
2973 %EXTICMD = ();
2974
2975 warn "unloading/nuking all extensions";
2976 for my $pkg (@EXTS) {
2977 warn "... unloading $pkg";
2978
2979 if (my $cb = $pkg->can ("unload")) {
2980 eval {
2981 $cb->($pkg);
2982 1
2983 } or warn "$pkg unloaded, but with errors: $@";
2984 } 3691 }
2985 3692
2986 warn "... nuking $pkg"; 3693 warn "cancelling all extension coros";
2987 Symbol::delete_package $pkg; 3694 $_->cancel for values %EXT_CORO;
2988 } 3695 %EXT_CORO = ();
2989 3696
2990 warn "unloading all perl modules loaded from $LIBDIR"; 3697 warn "removing commands";
2991 while (my ($k, $v) = each %INC) { 3698 %COMMAND = ();
2992 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2993 3699
3700 warn "removing ext/exti commands";
3701 %EXTCMD = ();
3702 %EXTICMD = ();
3703
3704 warn "unloading/nuking all extensions";
3705 for my $pkg (@EXTS) {
2994 warn "... unloading $k"; 3706 warn "... unloading $pkg";
2995 delete $INC{$k};
2996 3707
2997 $k =~ s/\.pm$//;
2998 $k =~ s/\//::/g;
2999
3000 if (my $cb = $k->can ("unload_module")) { 3708 if (my $cb = $pkg->can ("unload")) {
3709 eval {
3001 $cb->(); 3710 $cb->($pkg);
3711 1
3712 } or warn "$pkg unloaded, but with errors: $@";
3713 }
3714
3715 warn "... clearing $pkg";
3716 clear_package $pkg;
3002 } 3717 }
3003 3718
3004 Symbol::delete_package $k; 3719 warn "unloading all perl modules loaded from $LIBDIR";
3720 while (my ($k, $v) = each %INC) {
3721 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3722
3723 warn "... unloading $k";
3724 delete $INC{$k};
3725
3726 $k =~ s/\.pm$//;
3727 $k =~ s/\//::/g;
3728
3729 if (my $cb = $k->can ("unload_module")) {
3730 $cb->();
3731 }
3732
3733 clear_package $k;
3005 } 3734 }
3006 3735
3007 warn "getting rid of safe::, as good as possible"; 3736 warn "getting rid of safe::, as good as possible";
3008 Symbol::delete_package "safe::$_" 3737 clear_package "safe::$_"
3009 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3738 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3010 3739
3011 warn "unloading cf.pm \"a bit\""; 3740 warn "unloading cf.pm \"a bit\"";
3012 delete $INC{"cf.pm"}; 3741 delete $INC{"cf.pm"};
3013 delete $INC{"cf/pod.pm"}; 3742 delete $INC{"cf/pod.pm"};
3014 3743
3015 # don't, removes xs symbols, too, 3744 # don't, removes xs symbols, too,
3016 # and global variables created in xs 3745 # and global variables created in xs
3017 #Symbol::delete_package __PACKAGE__; 3746 #clear_package __PACKAGE__;
3018 3747
3019 warn "unload completed, starting to reload now"; 3748 warn "unload completed, starting to reload now";
3020 3749
3021 warn "reloading cf.pm"; 3750 warn "reloading cf.pm";
3022 require cf; 3751 require cf;
3023 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3752 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024 3753
3025 warn "loading config and database again"; 3754 warn "loading config and database again";
3026 cf::cfg_load; 3755 cf::reload_config;
3027 3756
3028 warn "loading extensions"; 3757 warn "loading extensions";
3029 cf::load_extensions; 3758 cf::load_extensions;
3030 3759
3760 if ($REATTACH_ON_RELOAD) {
3031 warn "reattaching attachments to objects/players"; 3761 warn "reattaching attachments to objects/players";
3032 _global_reattach; # objects, sockets 3762 _global_reattach; # objects, sockets
3033 warn "reattaching attachments to maps"; 3763 warn "reattaching attachments to maps";
3034 reattach $_ for values %MAP; 3764 reattach $_ for values %MAP;
3035 warn "reattaching attachments to players"; 3765 warn "reattaching attachments to players";
3036 reattach $_ for values %PLAYER; 3766 reattach $_ for values %PLAYER;
3767 }
3037 3768
3769 warn "running post_init jobs";
3770 (pop @POST_INIT)->(1) while @POST_INIT;
3771
3038 warn "leaving sync_job"; 3772 warn "leaving sync_job";
3039 3773
3040 1 3774 1
3041 } or do { 3775 } or do {
3042 warn $@; 3776 warn $@;
3043 warn "error while reloading, exiting."; 3777 cf::cleanup "error while reloading, exiting.";
3044 exit 1;
3045 }; 3778 };
3046 3779
3047 warn "reloaded"; 3780 warn "reloaded";
3781 --$RELOAD;
3782 }
3783
3784 $t1 = EV::time - $t1;
3785 warn "reload completed in ${t1}s\n";
3048}; 3786};
3049 3787
3050our $RELOAD_WATCHER; # used only during reload 3788our $RELOAD_WATCHER; # used only during reload
3051 3789
3052sub reload_perl() { 3790sub reload_perl() {
3053 # doing reload synchronously and two reloads happen back-to-back, 3791 # doing reload synchronously and two reloads happen back-to-back,
3054 # coro crashes during coro_state_free->destroy here. 3792 # coro crashes during coro_state_free->destroy here.
3055 3793
3056 $RELOAD_WATCHER ||= Event->timer ( 3794 $RELOAD_WATCHER ||= cf::async {
3057 reentrant => 0, 3795 Coro::AIO::aio_wait cache_extensions;
3058 after => 0, 3796
3059 data => WF_AUTOCANCEL, 3797 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3060 cb => sub {
3061 do_reload_perl; 3798 do_reload_perl;
3062 undef $RELOAD_WATCHER; 3799 undef $RELOAD_WATCHER;
3063 }, 3800 };
3064 ); 3801 };
3065} 3802}
3066 3803
3067register_command "reload" => sub { 3804register_command "reload" => sub {
3068 my ($who, $arg) = @_; 3805 my ($who, $arg) = @_;
3069 3806
3070 if ($who->flag (FLAG_WIZ)) { 3807 if ($who->flag (FLAG_WIZ)) {
3071 $who->message ("reloading server."); 3808 $who->message ("reloading server.");
3809 async {
3810 $Coro::current->{desc} = "perl_reload";
3072 async { reload_perl }; 3811 reload_perl;
3812 };
3073 } 3813 }
3074}; 3814};
3075 3815
3076unshift @INC, $LIBDIR; 3816unshift @INC, $LIBDIR;
3077 3817
3079 3819
3080our @WAIT_FOR_TICK; 3820our @WAIT_FOR_TICK;
3081our @WAIT_FOR_TICK_BEGIN; 3821our @WAIT_FOR_TICK_BEGIN;
3082 3822
3083sub wait_for_tick { 3823sub wait_for_tick {
3084 return unless $TICK_WATCHER->is_active;
3085 return if $Coro::current == $Coro::main; 3824 return if tick_inhibit || $Coro::current == $Coro::main;
3086 3825
3087 my $signal = new Coro::Signal; 3826 my $signal = new Coro::Signal;
3088 push @WAIT_FOR_TICK, $signal; 3827 push @WAIT_FOR_TICK, $signal;
3089 $signal->wait; 3828 $signal->wait;
3090} 3829}
3091 3830
3092sub wait_for_tick_begin { 3831sub wait_for_tick_begin {
3093 return unless $TICK_WATCHER->is_active;
3094 return if $Coro::current == $Coro::main; 3832 return if tick_inhibit || $Coro::current == $Coro::main;
3095 3833
3096 my $signal = new Coro::Signal; 3834 my $signal = new Coro::Signal;
3097 push @WAIT_FOR_TICK_BEGIN, $signal; 3835 push @WAIT_FOR_TICK_BEGIN, $signal;
3098 $signal->wait; 3836 $signal->wait;
3099} 3837}
3100 3838
3101 my $min = 1e6;#d# 3839sub tick {
3102 my $avg = 10;
3103$TICK_WATCHER = Event->timer (
3104 reentrant => 0,
3105 parked => 1,
3106 prio => 0,
3107 at => $NEXT_TICK || $TICK,
3108 data => WF_AUTOCANCEL,
3109 cb => sub {
3110 if ($Coro::current != $Coro::main) { 3840 if ($Coro::current != $Coro::main) {
3111 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3841 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3112 unless ++$bug_warning > 10; 3842 unless ++$bug_warning > 10;
3113 return; 3843 return;
3114 } 3844 }
3115 3845
3116 $NOW = $tick_start = Event::time;
3117
3118 cf::server_tick; # one server iteration 3846 cf::server_tick; # one server iteration
3119 3847
3120 0 && sync_job {#d# 3848 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3121 for(1..10) { 3849 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3122 my $t = Event::time; 3850 Coro::async_pool {
3123 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3851 $Coro::current->{desc} = "runtime saver";
3124 or die; 3852 write_runtime_sync
3125 3853 or warn "ERROR: unable to write runtime file: $!";
3126 $map->width (50);
3127 $map->height (50);
3128 $map->alloc;
3129 $map->_load_objects ("/tmp/x.map", 1);
3130 my $t = Event::time - $t;
3131
3132 #next unless $t < 0.0013;#d#
3133 if ($t < $min) {
3134 $min = $t;
3135 }
3136 $avg = $avg * 0.99 + $t * 0.01;
3137 }
3138 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3139 exit 0;
3140 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3141 }; 3854 };
3855 }
3142 3856
3143 $RUNTIME += $TICK;
3144 $NEXT_TICK += $TICK;
3145
3146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3147 $NEXT_RUNTIME_WRITE = $NOW + 10;
3148 Coro::async_pool {
3149 write_runtime
3150 or warn "ERROR: unable to write runtime file: $!";
3151 };
3152 }
3153
3154# my $AFTER = Event::time;
3155# warn $AFTER - $NOW;#d#
3156
3157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3857 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3158 $sig->send; 3858 $sig->send;
3159 } 3859 }
3160 while (my $sig = shift @WAIT_FOR_TICK) { 3860 while (my $sig = shift @WAIT_FOR_TICK) {
3161 $sig->send; 3861 $sig->send;
3162 } 3862 }
3163 3863
3164 $NOW = Event::time; 3864 $LOAD = ($NOW - $TICK_START) / $TICK;
3165
3166 # if we are delayed by four ticks or more, skip them all
3167 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3168
3169 $TICK_WATCHER->at ($NEXT_TICK);
3170 $TICK_WATCHER->start;
3171
3172 $LOAD = ($NOW - $tick_start) / $TICK;
3173 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3865 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3174 3866
3175 _post_tick; 3867 if (0) {
3176 3868 if ($NEXT_TICK) {
3177 3869 my $jitter = $TICK_START - $NEXT_TICK;
3870 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3871 warn "jitter $JITTER\n";#d#
3872 }
3178 }, 3873 }
3179); 3874}
3180 3875
3181{ 3876{
3182 BDB::max_poll_time $TICK * 0.1; 3877 # configure BDB
3183 $BDB_POLL_WATCHER = Event->io ( 3878
3184 reentrant => 0,
3185 fd => BDB::poll_fileno,
3186 poll => 'r',
3187 prio => 0,
3188 data => WF_AUTOCANCEL,
3189 cb => \&BDB::poll_cb,
3190 );
3191 BDB::min_parallel 8; 3879 BDB::min_parallel 8;
3192 3880 BDB::max_poll_reqs $TICK * 0.1;
3193 BDB::set_sync_prepare { 3881 $AnyEvent::BDB::WATCHER->priority (1);
3194 my $status;
3195 my $current = $Coro::current;
3196 (
3197 sub {
3198 $status = $!;
3199 $current->ready; undef $current;
3200 },
3201 sub {
3202 Coro::schedule while defined $current;
3203 $! = $status;
3204 },
3205 )
3206 };
3207 3882
3208 unless ($DB_ENV) { 3883 unless ($DB_ENV) {
3209 $DB_ENV = BDB::db_env_create; 3884 $DB_ENV = BDB::db_env_create;
3885 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3886 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3887 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3888 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3889 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3210 3890
3211 cf::sync_job { 3891 cf::sync_job {
3212 eval { 3892 eval {
3213 BDB::db_env_open 3893 BDB::db_env_open
3214 $DB_ENV, 3894 $DB_ENV,
3216 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3896 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3217 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3897 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3218 0666; 3898 0666;
3219 3899
3220 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3900 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3221
3222 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3223 $DB_ENV->set_lk_detect;
3224 }; 3901 };
3225 3902
3226 cf::cleanup "db_env_open(db): $@" if $@; 3903 cf::cleanup "db_env_open(db): $@" if $@;
3227 }; 3904 };
3228 } 3905 }
3906
3907 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3908 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3909 };
3910 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3911 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3912 };
3913 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3914 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3915 };
3229} 3916}
3230 3917
3231{ 3918{
3919 # configure IO::AIO
3920
3232 IO::AIO::min_parallel 8; 3921 IO::AIO::min_parallel 8;
3233
3234 undef $Coro::AIO::WATCHER;
3235 IO::AIO::max_poll_time $TICK * 0.1; 3922 IO::AIO::max_poll_time $TICK * 0.1;
3236 $AIO_POLL_WATCHER = Event->io ( 3923 undef $AnyEvent::AIO::WATCHER;
3237 reentrant => 0,
3238 data => WF_AUTOCANCEL,
3239 fd => IO::AIO::poll_fileno,
3240 poll => 'r',
3241 prio => 6,
3242 cb => \&IO::AIO::poll_cb,
3243 );
3244} 3924}
3245 3925
3246my $_log_backtrace; 3926my $_log_backtrace;
3247 3927
3248sub _log_backtrace { 3928sub _log_backtrace {
3251 $msg =~ s/\n//; 3931 $msg =~ s/\n//;
3252 3932
3253 # limit the # of concurrent backtraces 3933 # limit the # of concurrent backtraces
3254 if ($_log_backtrace < 2) { 3934 if ($_log_backtrace < 2) {
3255 ++$_log_backtrace; 3935 ++$_log_backtrace;
3936 my $perl_bt = Carp::longmess $msg;
3256 async { 3937 async {
3938 $Coro::current->{desc} = "abt $msg";
3939
3257 my @bt = fork_call { 3940 my @bt = fork_call {
3258 @addr = map { sprintf "%x", $_ } @addr; 3941 @addr = map { sprintf "%x", $_ } @addr;
3259 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3942 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3260 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3943 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3261 or die "addr2line: $!"; 3944 or die "addr2line: $!";
3269 } 3952 }
3270 3953
3271 @funcs 3954 @funcs
3272 }; 3955 };
3273 3956
3274 LOG llevInfo, "[ABT] $msg\n"; 3957 LOG llevInfo, "[ABT] $perl_bt\n";
3958 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3275 LOG llevInfo, "[ABT] $_\n" for @bt; 3959 LOG llevInfo, "[ABT] $_\n" for @bt;
3276 --$_log_backtrace; 3960 --$_log_backtrace;
3277 }; 3961 };
3278 } else { 3962 } else {
3279 LOG llevInfo, "[ABT] $msg\n"; 3963 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines