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.310 by elmex, Mon Jul 16 15:43:49 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;
34use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
35 64
36# configure various modules to our taste 65# configure various modules to our taste
37# 66#
38$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
39Coro::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";
40Compress::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
41
42$Event::Eval = 1; # no idea why this is required, but it is
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 75
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 76sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 77
51our %COMMAND = (); 78our %COMMAND = ();
52our %COMMAND_TIME = (); 79our %COMMAND_TIME = ();
55our %EXTCMD = (); 82our %EXTCMD = ();
56our %EXTICMD = (); 83our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 84our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 85our %EXT_MAP = (); # pluggable maps
59 86
60our $RELOAD; # number of reloads so far 87our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 88our @EVENT;
62 89
63our $CONFDIR = confdir; 90our $CONFDIR = confdir;
64our $DATADIR = datadir; 91our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 92our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 93our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 94our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 95our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 96our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 97our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 98our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 99our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 100our $BDBDIR = "$LOCALDIR/db";
101our $PIDFILE = "$LOCALDIR/pid";
102our $RUNTIMEFILE = "$LOCALDIR/runtime";
103
104our %RESOURCE;
74 105
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 106our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 107our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 108our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 109our $USE_FSYNC = 1; # use fsync to write maps - default off
82 110
111our $BDB_DEADLOCK_WATCHER;
112our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 113our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 114our $DB_ENV;
85 115
86our %CFG; 116our %CFG;
87 117
88our $UPTIME; $UPTIME ||= time; 118our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 119our $RUNTIME;
120our $NOW;
90 121
91our %PLAYER; # all users 122our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 123our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 124our $LINK_MAP; # the special {link} map, which is always available
94 125
95# 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 ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 127our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 128
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 129our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 130our $LOADAVG; # same thing, but with alpha-smoothing
131our $JITTER; # average jitter
100our $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)
101 137
102binmode STDOUT; 138binmode STDOUT;
103binmode STDERR; 139binmode STDERR;
104 140
105# read virtual server time, if available 141# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 142unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 143 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 144 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 145 $RUNTIME = <$fh> + 0.;
110} 146}
111 147
112mkdir $_ 148mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 149 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
158 194
159The raw value load value from the last tick. 195The raw value load value from the last tick.
160 196
161=item %cf::CFG 197=item %cf::CFG
162 198
163Configuration for the server, loaded from C</etc/crossfire/config>, or 199Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 200from wherever your confdir points to.
165 201
166=item cf::wait_for_tick, cf::wait_for_tick_begin 202=item cf::wait_for_tick, cf::wait_for_tick_begin
167 203
168These 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
186 $msg .= "\n" 222 $msg .= "\n"
187 unless $msg =~ /\n$/; 223 unless $msg =~ /\n$/;
188 224
189 $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;
190 226
191 utf8::encode $msg;
192 LOG llevError, $msg; 227 LOG llevError, $msg;
193 }; 228 };
194} 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#?
195 245
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 246@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 247@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 248@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 249@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206for my $pkg (qw( 256for my $pkg (qw(
207 cf::global cf::attachable 257 cf::global cf::attachable
208 cf::object cf::object::player 258 cf::object cf::object::player
209 cf::client cf::player 259 cf::client cf::player
210 cf::arch cf::living 260 cf::arch cf::living
261 cf::map cf::mapspace
211 cf::map cf::party cf::region 262 cf::party cf::region
212)) { 263)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 264 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 265}
216 266
217$Event::DIED = sub { 267$EV::DIED = sub {
218 warn "error in event callback: @_"; 268 warn "error in event callback: @_";
219}; 269};
220 270
221############################################################################# 271#############################################################################
222 272
245 $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;
246 $d 296 $d
247 } || "[unable to dump $_[0]: '$@']"; 297 } || "[unable to dump $_[0]: '$@']";
248} 298}
249 299
250=item $ref = cf::from_json $json 300=item $ref = cf::decode_json $json
251 301
252Converts a JSON string into the corresponding perl data structure. 302Converts a JSON string into the corresponding perl data structure.
253 303
254=item $json = cf::to_json $ref 304=item $json = cf::encode_json $ref
255 305
256Converts a perl data structure into its JSON representation. 306Converts a perl data structure into its JSON representation.
257 307
258=cut 308=cut
259 309
260our $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
261 311
262sub to_json ($) { $json_coder->encode ($_[0]) } 312sub encode_json($) { $json_coder->encode ($_[0]) }
263sub 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}
264 328
265=item cf::lock_wait $string 329=item cf::lock_wait $string
266 330
267Wait until the given lock is available. See cf::lock_acquire. 331Wait until the given lock is available. See cf::lock_acquire.
268 332
269=item my $lock = cf::lock_acquire $string 333=item my $lock = cf::lock_acquire $string
270 334
271Wait 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
272a 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,
273for example when the coroutine gets canceled), the lock is automatically 337for example when the coroutine gets canceled), the lock is automatically
274returned. 338returned.
275 339
340Locks are *not* recursive, locking from the same coro twice results in a
341deadlocked coro.
342
276Lock 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
277uses map_find and cf::map::load uses map_load). 344uses map_find and cf::map::load uses map_load).
278 345
279=item $locked = cf::lock_active $string 346=item $locked = cf::lock_active $string
280 347
281Return 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.
282 349
283=cut 350=cut
284 351
285our %LOCK; 352our %LOCK;
353our %LOCKER;#d#
286 354
287sub lock_wait($) { 355sub lock_wait($) {
288 my ($key) = @_; 356 my ($key) = @_;
289 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
290 # wait for lock, if any 363 # wait for lock, if any
291 while ($LOCK{$key}) { 364 while ($LOCK{$key}) {
365 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
292 push @{ $LOCK{$key} }, $Coro::current; 366 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 367 Coro::schedule;
294 } 368 }
295} 369}
296 370
299 373
300 # wait, to be sure we are not locked 374 # wait, to be sure we are not locked
301 lock_wait $key; 375 lock_wait $key;
302 376
303 $LOCK{$key} = []; 377 $LOCK{$key} = [];
378 $LOCKER{$key} = $Coro::current;#d#
304 379
305 Coro::guard { 380 Guard::guard {
381 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 382 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 383 $_->ready for @{ delete $LOCK{$key} };
308 } 384 }
309} 385}
310 386
313 389
314 ! ! $LOCK{$key} 390 ! ! $LOCK{$key}
315} 391}
316 392
317sub freeze_mainloop { 393sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 394 tick_inhibit_inc;
319 395
320 my $guard = Coro::guard { 396 &Guard::guard (\&tick_inhibit_dec);
321 $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 }
322 }; 457 }
323 $TICK_WATCHER->stop; 458};
324 $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;
325} 472}
326 473
327=item cf::async { BLOCK } 474=item cf::async { BLOCK }
328 475
329Currently the same as Coro::async_pool, meaning you cannot use 476Currently the same as Coro::async_pool, meaning you cannot use
334 481
335BEGIN { *async = \&Coro::async_pool } 482BEGIN { *async = \&Coro::async_pool }
336 483
337=item cf::sync_job { BLOCK } 484=item cf::sync_job { BLOCK }
338 485
339The design of Crossfire TRT requires that the main coroutine ($Coro::main) 486The design of Deliantra requires that the main coroutine ($Coro::main)
340is always able to handle events or runnable, as Crossfire TRT is only 487is always able to handle events or runnable, as Deliantra is only
341partly 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
342acceptable. 489acceptable.
343 490
344If 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
345the given BLOCK in another coroutine while waiting for the result. The 492the given BLOCK in another coroutine while waiting for the result. The
350 497
351sub sync_job(&) { 498sub sync_job(&) {
352 my ($job) = @_; 499 my ($job) = @_;
353 500
354 if ($Coro::current == $Coro::main) { 501 if ($Coro::current == $Coro::main) {
355 my $time = Event::time; 502 my $time = EV::time;
356 503
357 # this is the main coro, too bad, we have to block 504 # this is the main coro, too bad, we have to block
358 # till the operation succeeds, freezing the server :/ 505 # till the operation succeeds, freezing the server :/
359 506
360 # TODO: use suspend/resume instead 507 LOG llevError, Carp::longmess "sync job";#d#
361 # (but this is cancel-safe) 508
362 my $freeze_guard = freeze_mainloop; 509 my $freeze_guard = freeze_mainloop;
363 510
364 my $busy = 1; 511 my $busy = 1;
365 my @res; 512 my @res;
366 513
367 (async { 514 (async {
515 $Coro::current->desc ("sync job coro");
368 @res = eval { $job->() }; 516 @res = eval { $job->() };
369 warn $@ if $@; 517 warn $@ if $@;
370 undef $busy; 518 undef $busy;
371 })->prio (Coro::PRIO_MAX); 519 })->prio (Coro::PRIO_MAX);
372 520
373 while ($busy) { 521 while ($busy) {
374 Coro::cede or Event::one_event; 522 if (Coro::nready) {
523 Coro::cede_notself;
524 } else {
525 EV::loop EV::LOOP_ONESHOT;
375 } 526 }
527 }
376 528
377 $time = Event::time - $time; 529 my $time = EV::time - $time;
378 530
379 LOG llevError | logBacktrace, Carp::longmess "long sync job"
380 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
381
382 $tick_start += $time; # do not account sync jobs to server load 531 $TICK_START += $time; # do not account sync jobs to server load
383 532
384 wantarray ? @res : $res[0] 533 wantarray ? @res : $res[0]
385 } else { 534 } else {
386 # we are in another coroutine, how wonderful, everything just works 535 # we are in another coroutine, how wonderful, everything just works
387 536
412=item fork_call { }, $args 561=item fork_call { }, $args
413 562
414Executes the given code block with the given arguments in a seperate 563Executes the given code block with the given arguments in a seperate
415process, returning the results. Everything must be serialisable with 564process, returning the results. Everything must be serialisable with
416Coro::Storable. May, of course, block. Note that the executed sub may 565Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 566never block itself or use any form of event handling.
418 567
419=cut 568=cut
420
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429 569
430sub fork_call(&@) { 570sub fork_call(&@) {
431 my ($cb, @args) = @_; 571 my ($cb, @args) = @_;
432 572
433# 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,
434# or die "socketpair: $!"; 574 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 575 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 576
438 if (my $pid = fork) { 577 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 578 reset_signals;
452 local $SIG{__WARN__}; 579 &$cb
453 local $SIG{__DIE__}; 580 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 581
460 eval { 582 wantarray ? @res : $res[-1]
461 close $fh1; 583}
462 584
463 my @res = eval { $cb->(@args) }; 585=item $coin = coin_from_name $name
464 586
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 587=cut
466 close $fh2;
467 };
468 588
469 warn $@ if $@; 589our %coin_alias = (
470 _exit 0; 590 "silver" => "silvercoin",
471 } 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
472} 610}
473 611
474=item $value = cf::db_get $family => $key 612=item $value = cf::db_get $family => $key
475 613
476Returns a single value from the environment database. 614Returns a single value from the environment database.
478=item cf::db_put $family => $key => $value 616=item cf::db_put $family => $key => $value
479 617
480Stores 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
481data 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).
482 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
483=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}
484 644
485our $DB; 645our $DB;
486 646
487sub db_init { 647sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job { 648 cf::sync_job {
492 eval { 649 $DB ||= db_table "db";
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 } 650 };
502} 651}
503 652
504sub db_get($$) { 653sub db_get($$) {
505 my $key = "$_[0]/$_[1]"; 654 my $key = "$_[0]/$_[1]";
506 655
556 if (1) { 705 if (1) {
557 $md5 = 706 $md5 =
558 join "\x00", 707 join "\x00",
559 $processversion, 708 $processversion,
560 map { 709 map {
561 Coro::cede; 710 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 711 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 712 } 0.. $#$src;
564 713
565 714
566 my $dbmd5 = db_get cache => "$id/md5"; 715 my $dbmd5 = db_get cache => "$id/md5";
604 753
605############################################################################# 754#############################################################################
606 755
607=head2 ATTACHABLE OBJECTS 756=head2 ATTACHABLE OBJECTS
608 757
609Many 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
610attach callbacks/event handlers (a collection of which is called an "attachment") 759attach callbacks/event handlers (a collection of which is called an "attachment")
611to it. All such attachable objects support the following methods. 760to it. All such attachable objects support the following methods.
612 761
613In 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>
614C<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
615Crossfire TRT). 764Deliantra).
616 765
617=over 4 766=over 4
618 767
619=item $attachable->attach ($attachment, key => $value...) 768=item $attachable->attach ($attachment, key => $value...)
620 769
664=item cf::CLASS::attachment $name, ... 813=item cf::CLASS::attachment $name, ...
665 814
666Register an attachment by C<$name> through which attachable objects of the 815Register an attachment by C<$name> through which attachable objects of the
667given CLASS can refer to this attachment. 816given CLASS can refer to this attachment.
668 817
669Some classes such as crossfire maps and objects can specify attachments 818Some classes such as deliantra maps and objects can specify attachments
670that 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.
671 820
672These calls expect any number of the following handler/hook descriptions: 821These calls expect any number of the following handler/hook descriptions:
673 822
674=over 4 823=over 4
902 } 1051 }
903 1052
904 0 1053 0
905} 1054}
906 1055
907=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1056=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
908 1057
909=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1058=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
910 1059
911Generate an object-specific event with the given arguments. 1060Generate an object-specific event with the given arguments.
912 1061
919=cut 1068=cut
920 1069
921############################################################################# 1070#############################################################################
922# object support 1071# object support
923 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}
1114
924sub reattach { 1115sub reattach {
925 # basically do the same as instantiate, without calling instantiate 1116 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 1117 my ($obj) = @_;
927 1118
1119 # no longer needed after getting rid of delete_package?
928 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
929 1121
930 my $registry = $obj->registry; 1122 my $registry = $obj->registry;
931 1123
932 @$registry = (); 1124 @$registry = ();
933 1125
948cf::attachable->attach ( 1140cf::attachable->attach (
949 prio => -1000000, 1141 prio => -1000000,
950 on_instantiate => sub { 1142 on_instantiate => sub {
951 my ($obj, $data) = @_; 1143 my ($obj, $data) = @_;
952 1144
953 $data = from_json $data; 1145 $data = decode_json $data;
954 1146
955 for (@$data) { 1147 for (@$data) {
956 my ($name, $args) = @$_; 1148 my ($name, $args) = @$_;
957 1149
958 $obj->attach ($name, %{$args || {} }); 1150 $obj->attach ($name, %{$args || {} });
974sub object_freezer_save { 1166sub object_freezer_save {
975 my ($filename, $rdata, $objs) = @_; 1167 my ($filename, $rdata, $objs) = @_;
976 1168
977 sync_job { 1169 sync_job {
978 if (length $$rdata) { 1170 if (length $$rdata) {
1171 utf8::decode (my $decname = $filename);
979 warn sprintf "saving %s (%d,%d)\n", 1172 warn sprintf "saving %s (%d,%d)\n",
980 $filename, length $$rdata, scalar @$objs; 1173 $decname, length $$rdata, scalar @$objs;
981 1174
982 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
983 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
984 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
985 aio_fsync $fh if $cf::USE_FSYNC; 1178 aio_fsync $fh if $cf::USE_FSYNC;
986 close $fh; 1179 aio_close $fh;
987 1180
988 if (@$objs) { 1181 if (@$objs) {
989 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) {
990 chmod SAVE_MODE, $fh; 1183 aio_chmod $fh, SAVE_MODE;
991 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1184 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
992 aio_write $fh, 0, (length $data), $data, 0; 1185 aio_write $fh, 0, (length $data), $data, 0;
993 aio_fsync $fh if $cf::USE_FSYNC; 1186 aio_fsync $fh if $cf::USE_FSYNC;
994 close $fh; 1187 aio_close $fh;
995 aio_rename "$filename.pst~", "$filename.pst"; 1188 aio_rename "$filename.pst~", "$filename.pst";
996 } 1189 }
997 } else { 1190 } else {
998 aio_unlink "$filename.pst"; 1191 aio_unlink "$filename.pst";
999 } 1192 }
1000 1193
1001 aio_rename "$filename~", $filename; 1194 aio_rename "$filename~", $filename;
1195
1196 $filename =~ s%/[^/]+$%%;
1197 aio_pathsync $filename if $cf::USE_FSYNC;
1002 } else { 1198 } else {
1003 warn "FATAL: $filename~: $!\n"; 1199 warn "FATAL: $filename~: $!\n";
1004 } 1200 }
1005 } else { 1201 } else {
1006 aio_unlink $filename; 1202 aio_unlink $filename;
1007 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1008 } 1204 }
1009 } 1205 };
1010} 1206}
1011 1207
1012sub object_freezer_as_string { 1208sub object_freezer_as_string {
1013 my ($rdata, $objs) = @_; 1209 my ($rdata, $objs) = @_;
1014 1210
1026 or return; 1222 or return;
1027 1223
1028 unless (aio_stat "$filename.pst") { 1224 unless (aio_stat "$filename.pst") {
1029 (aio_load "$filename.pst", $av) >= 0 1225 (aio_load "$filename.pst", $av) >= 0
1030 or return; 1226 or return;
1227
1031 $av = eval { (Storable::thaw $av)->{objs} }; 1228 my $st = eval { Coro::Storable::thaw $av };
1229 $av = $st->{objs};
1032 } 1230 }
1033 1231
1232 utf8::decode (my $decname = $filename);
1034 warn sprintf "loading %s (%d)\n", 1233 warn sprintf "loading %s (%d,%d)\n",
1035 $filename, length $data, scalar @{$av || []}; 1234 $decname, length $data, scalar @{$av || []};
1235
1036 return ($data, $av); 1236 ($data, $av)
1037} 1237}
1038 1238
1039=head2 COMMAND CALLBACKS 1239=head2 COMMAND CALLBACKS
1040 1240
1041=over 4 1241=over 4
1095 my ($name, $cb) = @_; 1295 my ($name, $cb) = @_;
1096 1296
1097 $EXTICMD{$name} = $cb; 1297 $EXTICMD{$name} = $cb;
1098} 1298}
1099 1299
1300use File::Glob ();
1301
1100cf::player->attach ( 1302cf::player->attach (
1101 on_command => sub { 1303 on_command => sub {
1102 my ($pl, $name, $params) = @_; 1304 my ($pl, $name, $params) = @_;
1103 1305
1104 my $cb = $COMMAND{$name} 1306 my $cb = $COMMAND{$name}
1114 my ($pl, $buf) = @_; 1316 my ($pl, $buf) = @_;
1115 1317
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1318 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1319
1118 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
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1328 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1329 @reply = $cb->($pl, @payload);
1121 $pl->ext_reply ($msg->{msgid}, %reply);
1122 }
1123 } 1330 }
1331
1332 $pl->ext_reply ($reply, @reply)
1333 if $reply;
1334
1124 } else { 1335 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1336 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1337 }
1127 1338
1128 cf::override; 1339 cf::override;
1129 }, 1340 },
1130); 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}
1131 1355
1132sub load_extensions { 1356sub load_extensions {
1133 cf::sync_job { 1357 cf::sync_job {
1134 my %todo; 1358 my %todo;
1135 1359
1155 1379
1156 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1380 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1157 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1381 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1158 1382
1159 $ext{source} = 1383 $ext{source} =
1160 "package $pkg; use strict; use utf8;\n" 1384 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1161 . "#line 1 \"$path\"\n{\n" 1385 . "#line 1 \"$path\"\n{\n"
1162 . $source 1386 . $source
1163 . "\n};\n1"; 1387 . "\n};\n1";
1164 1388
1165 $todo{$base} = \%ext; 1389 $todo{$base} = \%ext;
1181 my $msg = $@ ? "$v->{path}: $@\n" 1405 my $msg = $@ ? "$v->{path}: $@\n"
1182 : "$v->{base}: extension inactive.\n"; 1406 : "$v->{base}: extension inactive.\n";
1183 1407
1184 if (exists $v->{meta}{mandatory}) { 1408 if (exists $v->{meta}{mandatory}) {
1185 warn $msg; 1409 warn $msg;
1186 warn "mandatory extension failed to load, exiting.\n"; 1410 cf::cleanup "mandatory extension failed to load, exiting.";
1187 exit 1;
1188 } 1411 }
1189 1412
1190 warn $msg; 1413 warn $msg;
1191 } 1414 }
1192 1415
1206 1429
1207=back 1430=back
1208 1431
1209=head2 CORE EXTENSIONS 1432=head2 CORE EXTENSIONS
1210 1433
1211Functions and methods that extend core crossfire objects. 1434Functions and methods that extend core deliantra objects.
1212 1435
1213=cut 1436=cut
1214 1437
1215package cf::player; 1438package cf::player;
1216 1439
1217use Coro::AIO; 1440use Coro::AIO;
1218 1441
1219=head3 cf::player 1442=head3 cf::player
1220 1443
1221=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}
1222 1459
1223=item cf::player::find $login 1460=item cf::player::find $login
1224 1461
1225Returns the given player object, loading it if necessary (might block). 1462Returns the given player object, loading it if necessary (might block).
1226 1463
1245 1482
1246sub exists($) { 1483sub exists($) {
1247 my ($login) = @_; 1484 my ($login) = @_;
1248 1485
1249 $cf::PLAYER{$login} 1486 $cf::PLAYER{$login}
1250 or cf::sync_job { !aio_stat path $login } 1487 or !aio_stat path $login
1251} 1488}
1252 1489
1253sub find($) { 1490sub find($) {
1254 return $cf::PLAYER{$_[0]} || do { 1491 return $cf::PLAYER{$_[0]} || do {
1255 my $login = $_[0]; 1492 my $login = $_[0];
1262 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1499 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1500 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1501 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265 aio_unlink +(playerdir $login) . "/$login.pl"; 1502 aio_unlink +(playerdir $login) . "/$login.pl";
1266 1503
1267 my $pl = load_pl path $login 1504 my $f = new_from_file cf::object::thawer path $login
1268 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;
1269 $cf::PLAYER{$login} = $pl 1512 $cf::PLAYER{$login} = $pl
1270 } 1513 }
1271 } 1514 }
1272} 1515}
1273 1516
1282 return if $pl->{deny_save}; 1525 return if $pl->{deny_save};
1283 1526
1284 aio_mkdir playerdir $pl, 0770; 1527 aio_mkdir playerdir $pl, 0770;
1285 $pl->{last_save} = $cf::RUNTIME; 1528 $pl->{last_save} = $cf::RUNTIME;
1286 1529
1530 cf::get_slot 0.01;
1531
1287 $pl->save_pl ($path); 1532 $pl->save_pl ($path);
1288 Coro::cede; 1533 cf::cede_to_tick;
1289} 1534}
1290 1535
1291sub new($) { 1536sub new($) {
1292 my ($login) = @_; 1537 my ($login) = @_;
1293 1538
1299 $cf::PLAYER{$login} = $self; 1544 $cf::PLAYER{$login} = $self;
1300 1545
1301 $self 1546 $self
1302} 1547}
1303 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
1304=item $pl->quit_character 1559=item $pl->quit_character
1305 1560
1306Nukes the player without looking back. If logged in, the connection will 1561Nukes the player without looking back. If logged in, the connection will
1307be destroyed. May block for a long time. 1562be destroyed. May block for a long time.
1308 1563
1312 my ($pl) = @_; 1567 my ($pl) = @_;
1313 1568
1314 my $name = $pl->ob->name; 1569 my $name = $pl->ob->name;
1315 1570
1316 $pl->{deny_save} = 1; 1571 $pl->{deny_save} = 1;
1317 $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
1318 1573
1319 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1574 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1320 $pl->deactivate; 1575 $pl->deactivate;
1576 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1577 $pl->ob->check_score;
1321 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1578 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1322 $pl->ns->destroy if $pl->ns; 1579 $pl->ns->destroy if $pl->ns;
1323 1580
1324 my $path = playerdir $pl; 1581 my $path = playerdir $pl;
1325 my $temp = "$path~$cf::RUNTIME~deleting~"; 1582 my $temp = "$path~$cf::RUNTIME~deleting~";
1361 or return []; 1618 or return [];
1362 1619
1363 my @logins; 1620 my @logins;
1364 1621
1365 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") {
1366 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1628 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367 aio_read $fh, 0, 512, my $buf, 0 or next; 1629 aio_read $fh, 0, 512, my $buf, 0 or next;
1368 $buf !~ /^password -------------$/m or next; # official not-valid tag 1630 $buf !~ /^password -------------$/m or next; # official not-valid tag
1631 }
1369 1632
1370 utf8::decode $login; 1633 utf8::decode $login;
1371 push @logins, $login; 1634 push @logins, $login;
1372 } 1635 }
1373 1636
1400 } 1663 }
1401 1664
1402 \@paths 1665 \@paths
1403} 1666}
1404 1667
1405=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1668=item $protocol_xml = $player->expand_cfpod ($cfpod)
1406 1669
1407Expand crossfire pod fragments into protocol xml. 1670Expand deliantra pod fragments into protocol xml.
1408 1671
1409=cut
1410
1411sub expand_cfpod {
1412 ((my $self), (local $_)) = @_;
1413
1414 # escape & and <
1415 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g;
1417
1418 # this is buggy, it needs to properly take care of nested <'s
1419
1420 1 while
1421 # replace B<>, I<>, U<> etc.
1422 s/B<([^\>]*)>/<b>$1<\/b>/
1423 || s/I<([^\>]*)>/<i>$1<\/i>/
1424 || s/U<([^\>]*)>/<u>$1<\/u>/
1425 # replace G<male|female> tags
1426 || s{G<([^>|]*)\|([^>]*)>}{
1427 $self->gender ? $2 : $1
1428 }ge
1429 # replace H<hint text>
1430 || s{H<([^\>]*)>}
1431 {
1432 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1433 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1434 "")
1435 [$self->{hintmode}]
1436 }ge;
1437
1438 # create single paragraphs (very hackish)
1439 s/(?<=\S)\n(?=\w)/ /g;
1440
1441 # compress some whitespace
1442 s/\s+\n/\n/g; # ws line-ends
1443 s/\n\n+/\n/g; # double lines
1444 s/^\n+//; # beginning lines
1445 s/\n+$//; # ending lines
1446
1447 $_
1448}
1449
1450sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode}
1453}
1454
1455=item $player->ext_reply ($msgid, %msg) 1672=item $player->ext_reply ($msgid, @msg)
1456 1673
1457Sends an ext reply to the player. 1674Sends an ext reply to the player.
1458 1675
1459=cut 1676=cut
1460 1677
1461sub ext_reply($$%) { 1678sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1679 my ($self, $id, @msg) = @_;
1463 1680
1464 $msg{msgid} = $id; 1681 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1682}
1467 1683
1468=item $player->ext_event ($type, %msg) 1684=item $player->ext_msg ($type, @msg)
1469 1685
1470Sends an ext event to the client. 1686Sends an ext event to the client.
1471 1687
1472=cut 1688=cut
1473 1689
1474sub ext_event($$%) { 1690sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1691 my ($self, $type, @msg) = @_;
1476 1692
1477 $self->ns->ext_event ($type, %msg); 1693 $self->ns->ext_msg ($type, @msg);
1478} 1694}
1479 1695
1480=head3 cf::region 1696=head3 cf::region
1481 1697
1482=over 4 1698=over 4
1526our $MAX_RESET = 3600; 1742our $MAX_RESET = 3600;
1527our $DEFAULT_RESET = 3000; 1743our $DEFAULT_RESET = 3000;
1528 1744
1529sub generate_random_map { 1745sub generate_random_map {
1530 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
1531 # mit "rum" bekleckern, nicht 1750 # mit "rum" bekleckern, nicht
1532 $self->_create_random_map ( 1751 $self->_create_random_map (
1533 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1752 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1534 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1753 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1535 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1754 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1657 1876
1658# the temporary/swap location 1877# the temporary/swap location
1659sub save_path { 1878sub save_path {
1660 my ($self) = @_; 1879 my ($self) = @_;
1661 1880
1662 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1881 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1663 "$TMPDIR/$path.map" 1882 "$TMPDIR/$path.map"
1664} 1883}
1665 1884
1666# the unique path, undef == no special unique path 1885# the unique path, undef == no special unique path
1667sub uniq_path { 1886sub uniq_path {
1668 my ($self) = @_; 1887 my ($self) = @_;
1669 1888
1670 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1889 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1671 "$UNIQUEDIR/$path" 1890 "$UNIQUEDIR/$path"
1672} 1891}
1673 1892
1674# and all this just because we cannot iterate over 1893# and all this just because we cannot iterate over
1675# all maps in C++... 1894# all maps in C++...
1698 1917
1699sub load_header_from($) { 1918sub load_header_from($) {
1700 my ($self, $path) = @_; 1919 my ($self, $path) = @_;
1701 1920
1702 utf8::encode $path; 1921 utf8::encode $path;
1703 #aio_open $path, O_RDONLY, 0 1922 my $f = new_from_file cf::object::thawer $path
1704 # or return;
1705
1706 $self->_load_header ($path)
1707 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;
1708 1930
1709 $self->{load_path} = $path; 1931 $self->{load_path} = $path;
1710 1932
1711 1 1933 1
1712} 1934}
1766sub find { 1988sub find {
1767 my ($path, $origin) = @_; 1989 my ($path, $origin) = @_;
1768 1990
1769 $path = normalise $path, $origin && $origin->path; 1991 $path = normalise $path, $origin && $origin->path;
1770 1992
1993 cf::lock_wait "map_data:$path";#d#remove
1771 cf::lock_wait "map_find:$path"; 1994 cf::lock_wait "map_find:$path";
1772 1995
1773 $cf::MAP{$path} || do { 1996 $cf::MAP{$path} || do {
1997 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1774 my $guard = cf::lock_acquire "map_find:$path"; 1998 my $guard2 = cf::lock_acquire "map_find:$path";
1999
1775 my $map = new_from_path cf::map $path 2000 my $map = new_from_path cf::map $path
1776 or return; 2001 or return;
1777 2002
1778 $map->{last_save} = $cf::RUNTIME; 2003 $map->{last_save} = $cf::RUNTIME;
1779 2004
1781 or return; 2006 or return;
1782 2007
1783 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2008 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784 # doing this can freeze the server in a sync job, obviously 2009 # doing this can freeze the server in a sync job, obviously
1785 #$cf::WAIT_FOR_TICK->wait; 2010 #$cf::WAIT_FOR_TICK->wait;
2011 undef $guard2;
2012 undef $guard1;
1786 $map->reset; 2013 $map->reset;
1787 undef $guard;
1788 return find $path; 2014 return find $path;
1789 } 2015 }
1790 2016
1791 $cf::MAP{$path} = $map 2017 $cf::MAP{$path} = $map
1792 } 2018 }
1801 local $self->{deny_reset} = 1; # loading can take a long time 2027 local $self->{deny_reset} = 1; # loading can take a long time
1802 2028
1803 my $path = $self->{path}; 2029 my $path = $self->{path};
1804 2030
1805 { 2031 {
1806 my $guard = cf::lock_acquire "map_load:$path"; 2032 my $guard = cf::lock_acquire "map_data:$path";
1807 2033
2034 return unless $self->valid;
1808 return if $self->in_memory != cf::MAP_SWAPPED; 2035 return unless $self->in_memory == cf::MAP_SWAPPED;
1809 2036
1810 $self->in_memory (cf::MAP_LOADING); 2037 $self->in_memory (cf::MAP_LOADING);
1811 2038
1812 $self->alloc; 2039 $self->alloc;
1813 2040
1814 $self->pre_load; 2041 $self->pre_load;
1815 Coro::cede; 2042 cf::cede_to_tick;
1816 2043
2044 my $f = new_from_file cf::object::thawer $self->{load_path};
2045 $f->skip_block;
1817 $self->_load_objects ($self->{load_path}, 1) 2046 $self->_load_objects ($f)
1818 or return; 2047 or return;
1819 2048
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2049 $self->post_load_original
1821 if delete $self->{load_original}; 2050 if delete $self->{load_original};
1822 2051
1823 if (my $uniq = $self->uniq_path) { 2052 if (my $uniq = $self->uniq_path) {
1824 utf8::encode $uniq; 2053 utf8::encode $uniq;
1825 if (aio_open $uniq, O_RDONLY, 0) { 2054 unless (aio_stat $uniq) {
2055 if (my $f = new_from_file cf::object::thawer $uniq) {
1826 $self->clear_unique_items; 2056 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 2057 $self->_load_objects ($f);
2058 $f->resolve_delayed_derefs;
2059 }
1828 } 2060 }
1829 } 2061 }
1830 2062
1831 Coro::cede; 2063 $f->resolve_delayed_derefs;
2064
2065 cf::cede_to_tick;
1832 # now do the right thing for maps 2066 # now do the right thing for maps
1833 $self->link_multipart_objects; 2067 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 2068 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 2069 unless $self->difficulty;
1836 Coro::cede; 2070 cf::cede_to_tick;
1837 2071
1838 unless ($self->{deny_activate}) { 2072 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 2073 $self->decay_objects;
1840 $self->fix_auto_apply; 2074 $self->fix_auto_apply;
1841 $self->update_buttons; 2075 $self->update_buttons;
1842 Coro::cede; 2076 cf::cede_to_tick;
1843 $self->set_darkness_map; 2077 $self->set_darkness_map;
1844 Coro::cede; 2078 cf::cede_to_tick;
1845 $self->activate; 2079 $self->activate;
1846 } 2080 }
1847 2081
2082 $self->{last_save} = $cf::RUNTIME;
2083 $self->last_access ($cf::RUNTIME);
2084
1848 $self->in_memory (cf::MAP_IN_MEMORY); 2085 $self->in_memory (cf::MAP_ACTIVE);
1849 } 2086 }
1850 2087
1851 $self->post_load; 2088 $self->post_load;
1852} 2089}
1853 2090
1862 2099
1863 $self 2100 $self
1864} 2101}
1865 2102
1866# 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
1867sub load_diag { 2104sub load_neighbours {
1868 my ($map) = @_; 2105 my ($map) = @_;
1869 2106
1870 my @diag; # diagonal neighbours 2107 my @neigh; # diagonal neighbours
1871 2108
1872 for (0 .. 3) { 2109 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 2110 my $neigh = $map->tile_path ($_)
1874 or next; 2111 or next;
1875 $neigh = find $neigh, $map 2112 $neigh = find $neigh, $map
1876 or next; 2113 or next;
1877 $neigh->load; 2114 $neigh->load;
1878 2115
2116 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2117 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2118 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 2119 }
1882 2120
1883 for (@diag) { 2121 for (grep defined $_->[0], @neigh) {
2122 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 2123 my $neigh = find $path, $origin
1885 or next; 2124 or next;
1886 $neigh->load; 2125 $neigh->load;
1887 } 2126 }
1888} 2127}
1889 2128
1894} 2133}
1895 2134
1896sub do_load_sync { 2135sub do_load_sync {
1897 my ($map) = @_; 2136 my ($map) = @_;
1898 2137
2138 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2139 if $Coro::current == $Coro::main;
2140
1899 cf::sync_job { $map->load }; 2141 cf::sync_job { $map->load };
1900} 2142}
1901 2143
1902our %MAP_PREFETCH; 2144our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 2145our $MAP_PREFETCHER = undef;
1904 2146
1905sub find_async { 2147sub find_async {
1906 my ($path, $origin) = @_; 2148 my ($path, $origin, $load) = @_;
1907 2149
1908 $path = normalise $path, $origin && $origin->{path}; 2150 $path = normalise $path, $origin && $origin->{path};
1909 2151
1910 if (my $map = $cf::MAP{$path}) { 2152 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2153 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1912 } 2154 }
1913 2155
1914 undef $MAP_PREFETCH{$path}; 2156 $MAP_PREFETCH{$path} |= $load;
2157
1915 $MAP_PREFETCHER ||= cf::async { 2158 $MAP_PREFETCHER ||= cf::async {
2159 $Coro::current->{desc} = "map prefetcher";
2160
1916 while (%MAP_PREFETCH) { 2161 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 2162 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 2163 if (my $map = find $k) {
1919 $map->load; 2164 $map->load if $v;
1920 } 2165 }
1921 2166
1922 delete $MAP_PREFETCH{$path}; 2167 delete $MAP_PREFETCH{$k};
1923 } 2168 }
1924 } 2169 }
1925 undef $MAP_PREFETCHER; 2170 undef $MAP_PREFETCHER;
1926 }; 2171 };
1927 $MAP_PREFETCHER->prio (6); 2172 $MAP_PREFETCHER->prio (6);
1930} 2175}
1931 2176
1932sub save { 2177sub save {
1933 my ($self) = @_; 2178 my ($self) = @_;
1934 2179
1935 my $lock = cf::lock_acquire "map_data:" . $self->path; 2180 my $lock = cf::lock_acquire "map_data:$self->{path}";
1936 2181
1937 $self->{last_save} = $cf::RUNTIME; 2182 $self->{last_save} = $cf::RUNTIME;
1938 2183
1939 return unless $self->dirty; 2184 return unless $self->dirty;
1940 2185
1946 return if $self->{deny_save}; 2191 return if $self->{deny_save};
1947 2192
1948 local $self->{last_access} = $self->last_access;#d# 2193 local $self->{last_access} = $self->last_access;#d#
1949 2194
1950 cf::async { 2195 cf::async {
2196 $Coro::current->{desc} = "map player save";
1951 $_->contr->save for $self->players; 2197 $_->contr->save for $self->players;
1952 }; 2198 };
2199
2200 cf::get_slot 0.02;
1953 2201
1954 if ($uniq) { 2202 if ($uniq) {
1955 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2203 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1956 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2204 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1957 } else { 2205 } else {
1963 my ($self) = @_; 2211 my ($self) = @_;
1964 2212
1965 # save first because save cedes 2213 # save first because save cedes
1966 $self->save; 2214 $self->save;
1967 2215
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2216 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2217
1970 return if $self->players; 2218 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY; 2219 return if $self->in_memory != cf::MAP_ACTIVE;
1972 return if $self->{deny_save}; 2220 return if $self->{deny_save};
1973 2221
2222 $self->in_memory (cf::MAP_SWAPPED);
2223
2224 $self->deactivate;
2225 $_->clear_links_to ($self) for values %cf::MAP;
1974 $self->clear; 2226 $self->clear;
1975 $self->in_memory (cf::MAP_SWAPPED);
1976} 2227}
1977 2228
1978sub reset_at { 2229sub reset_at {
1979 my ($self) = @_; 2230 my ($self) = @_;
1980 2231
2012 if $uniq; 2263 if $uniq;
2013 } 2264 }
2014 2265
2015 delete $cf::MAP{$self->path}; 2266 delete $cf::MAP{$self->path};
2016 2267
2268 $self->deactivate;
2269 $_->clear_links_to ($self) for values %cf::MAP;
2017 $self->clear; 2270 $self->clear;
2018
2019 $_->clear_links_to ($self) for values %cf::MAP;
2020 2271
2021 $self->unlink_save; 2272 $self->unlink_save;
2022 $self->destroy; 2273 $self->destroy;
2023} 2274}
2024 2275
2025my $nuke_counter = "aaaa"; 2276my $nuke_counter = "aaaa";
2026 2277
2027sub nuke { 2278sub nuke {
2028 my ($self) = @_; 2279 my ($self) = @_;
2029 2280
2281 {
2282 my $lock = cf::lock_acquire "map_data:$self->{path}";
2283
2030 delete $cf::MAP{$self->path}; 2284 delete $cf::MAP{$self->path};
2031 2285
2032 $self->unlink_save; 2286 $self->unlink_save;
2033 2287
2034 bless $self, "cf::map"; 2288 bless $self, "cf::map";
2035 delete $self->{deny_reset}; 2289 delete $self->{deny_reset};
2036 $self->{deny_save} = 1; 2290 $self->{deny_save} = 1;
2037 $self->reset_timeout (1); 2291 $self->reset_timeout (1);
2038 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2292 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039 2293
2040 $cf::MAP{$self->path} = $self; 2294 $cf::MAP{$self->path} = $self;
2295 }
2041 2296
2042 $self->reset; # polite request, might not happen 2297 $self->reset; # polite request, might not happen
2043} 2298}
2044 2299
2045=item $maps = cf::map::tmp_maps 2300=item $maps = cf::map::tmp_maps
2087 2342
2088sub unique_maps() { 2343sub unique_maps() {
2089 [ 2344 [
2090 map { 2345 map {
2091 utf8::decode $_; 2346 utf8::decode $_;
2092 /\.map$/ 2347 s/\.map$//; # TODO future compatibility hack
2348 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2349 ? ()
2093 ? normalise $_ 2350 : normalise $_
2094 : ()
2095 } @{ aio_readdir $UNIQUEDIR or [] } 2351 } @{ aio_readdir $UNIQUEDIR or [] }
2096 ] 2352 ]
2097} 2353}
2098 2354
2099package cf;
2100
2101=back 2355=back
2102 2356
2103=head3 cf::object 2357=head3 cf::object
2104 2358
2105=cut 2359=cut
2108 2362
2109=over 4 2363=over 4
2110 2364
2111=item $ob->inv_recursive 2365=item $ob->inv_recursive
2112 2366
2113Returns 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.
2114 2369
2115=cut 2370=cut
2116 2371
2117sub inv_recursive_; 2372sub inv_recursive_;
2118sub inv_recursive_ { 2373sub inv_recursive_ {
2121 2376
2122sub inv_recursive { 2377sub inv_recursive {
2123 inv_recursive_ inv $_[0] 2378 inv_recursive_ inv $_[0]
2124} 2379}
2125 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
2126package cf; 2409package cf;
2127 2410
2128=back 2411=back
2129 2412
2130=head3 cf::object::player 2413=head3 cf::object::player
2136Sends 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>
2137can 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
2138dialogue with the given NPC character. 2421dialogue with the given NPC character.
2139 2422
2140=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};
2141 2438
2142# rough implementation of a future "reply" method that works 2439# rough implementation of a future "reply" method that works
2143# with dialog boxes. 2440# with dialog boxes.
2144#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
2145sub cf::object::player::reply($$$;$) { 2442sub cf::object::player::reply($$$;$) {
2152 2449
2153 } else { 2450 } else {
2154 my $pl = $self->contr; 2451 my $pl = $self->contr;
2155 2452
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2453 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2454 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2455 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164 2456
2165 } else { 2457 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2458 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2459 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2168 } 2460 }
2169 } 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 (@_);
2170} 2472}
2171 2473
2172=item $player_object->may ("access") 2474=item $player_object->may ("access")
2173 2475
2174Returns wether the given player is authorized to access resource "access" 2476Returns wether the given player is authorized to access resource "access"
2187 2489
2188=item $player_object->enter_link 2490=item $player_object->enter_link
2189 2491
2190Freezes 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}>).
2191 2493
2192The 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.
2193I<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.
2194 2498
2195Will never block. 2499Will never block.
2196 2500
2197=item $player_object->leave_link ($map, $x, $y) 2501=item $player_object->leave_link ($map, $x, $y)
2198 2502
2253 # use -1 or undef as default coordinates, not 0, 0 2557 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2558 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2559 if $x <=0 && $y <= 0;
2256 2560
2257 $map->load; 2561 $map->load;
2258 $map->load_diag; 2562 $map->load_neighbours;
2259 2563
2260 return unless $self->contr->active; 2564 return unless $self->contr->active;
2565 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2261 $self->activate_recursive; 2566 $self->activate_recursive;
2262 2567
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2568 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2264 $self->enter_map ($map, $x, $y); 2569 $self->enter_map ($map, $x, $y);
2265} 2570}
2270her, loading and preparing them map, calling the provided $check callback 2575her, loading and preparing them map, calling the provided $check callback
2271that 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
2272the new (success) or old (failed) map position. In either case, $done will 2577the new (success) or old (failed) map position. In either case, $done will
2273be called at the end of this process. 2578be called at the end of this process.
2274 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 >>.
2582
2275=cut 2583=cut
2276 2584
2277our $GOTOGEN; 2585our $GOTOGEN;
2278 2586
2279sub cf::object::player::goto { 2587sub cf::object::player::goto {
2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2591 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2284 2592
2285 $self->enter_link; 2593 $self->enter_link;
2286 2594
2287 (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
2288 my $map = eval { 2617 my $map = eval {
2289 my $map = cf::map::find $path; 2618 my $map = defined $path ? cf::map::find $path : undef;
2290 2619
2291 if ($map) { 2620 if ($map) {
2292 $map = $map->customise_for ($self); 2621 $map = $map->customise_for ($self);
2293 $map = $check->($map) if $check && $map; 2622 $map = $check->($map) if $check && $map;
2294 } else { 2623 } else {
2295 $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);
2296 } 2625 }
2297 2626
2298 $map 2627 $map
2299 }; 2628 };
2300 2629
2336} 2665}
2337 2666
2338sub prepare_random_map { 2667sub prepare_random_map {
2339 my ($exit) = @_; 2668 my ($exit) = @_;
2340 2669
2341 my $guard = cf::lock_acquire "exit_prepare:$exit";
2342
2343 # all this does is basically replace the /! path by 2670 # all this does is basically replace the /! path by
2344 # a new random map path (?random/...) with a seed 2671 # a new random map path (?random/...) with a seed
2345 # that depends on the exit object 2672 # that depends on the exit object
2346 2673
2347 my $rmp = parse_random_map_params $exit->msg; 2674 my $rmp = parse_random_map_params $exit->msg;
2349 if ($exit->map) { 2676 if ($exit->map) {
2350 $rmp->{region} = $exit->region->name; 2677 $rmp->{region} = $exit->region->name;
2351 $rmp->{origin_map} = $exit->map->path; 2678 $rmp->{origin_map} = $exit->map->path;
2352 $rmp->{origin_x} = $exit->x; 2679 $rmp->{origin_x} = $exit->x;
2353 $rmp->{origin_y} = $exit->y; 2680 $rmp->{origin_y} = $exit->y;
2681
2682 $exit->map->touch;
2354 } 2683 }
2355 2684
2356 $rmp->{random_seed} ||= $exit->random_seed; 2685 $rmp->{random_seed} ||= $exit->random_seed;
2357 2686
2358 my $data = cf::to_json $rmp; 2687 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2359 my $md5 = Digest::MD5::md5_hex $data; 2688 my $md5 = Digest::MD5::md5_hex $data;
2360 my $meta = "$RANDOMDIR/$md5.meta"; 2689 my $meta = "$RANDOMDIR/$md5.meta";
2361 2690
2362 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2691 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2363 aio_write $fh, 0, (length $data), $data, 0; 2692 aio_write $fh, 0, (length $data), $data, 0;
2364 undef $fh; 2693 undef $fh;
2365 aio_rename "$meta~", $meta; 2694 aio_rename "$meta~", $meta;
2366 2695
2696 my $slaying = "?random/$md5";
2697
2698 if ($exit->valid) {
2367 $exit->slaying ("?random/$md5"); 2699 $exit->slaying ("?random/$md5");
2368 $exit->msg (undef); 2700 $exit->msg (undef);
2701 }
2369 } 2702 }
2370} 2703}
2371 2704
2372sub cf::object::player::enter_exit { 2705sub cf::object::player::enter_exit {
2373 my ($self, $exit) = @_; 2706 my ($self, $exit) = @_;
2374 2707
2375 return unless $self->type == cf::PLAYER; 2708 return unless $self->type == cf::PLAYER;
2376 2709
2377 if ($exit->slaying eq "/!") {
2378 #TODO: this should de-fi-ni-te-ly not be a sync-job
2379 # the problem is that $exit might not survive long enough
2380 # so it needs to be done right now, right here
2381 cf::sync_job { prepare_random_map $exit };
2382 }
2383
2384 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2385 my $hp = $exit->stats->hp;
2386 my $sp = $exit->stats->sp;
2387
2388 $self->enter_link; 2710 $self->enter_link;
2389 2711
2390 # if exit is damned, update players death & WoR home-position
2391 $self->contr->savebed ($slaying, $hp, $sp)
2392 if $exit->flag (FLAG_DAMNED);
2393
2394 (async { 2712 (async {
2395 $self->deactivate_recursive; # just to be sure 2713 $Coro::current->{desc} = "enter_exit";
2714
2396 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
2397 $self->goto ($slaying, $hp, $sp); 2730 $self->goto ($map, $x, $y);
2398 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
2399 1; 2736 1
2400 }) { 2737 }) {
2401 $self->message ("Something went wrong deep within the crossfire server. " 2738 $self->message ("Something went wrong deep within the deliantra server. "
2402 . "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. "
2403 . "Please report this to the dungeon master!", 2740 . "Please report this to the dungeon master!",
2404 cf::NDI_UNIQUE | cf::NDI_RED); 2741 cf::NDI_UNIQUE | cf::NDI_RED);
2405 2742
2406 warn "ERROR in enter_exit: $@"; 2743 warn "ERROR in enter_exit: $@";
2425 2762
2426 utf8::encode $text; 2763 utf8::encode $text;
2427 $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);
2428} 2765}
2429 2766
2430=item $client->send_msg ($color, $type, $msg, [extra...]) 2767=item $client->send_msg ($channel, $msg, $color, [extra...])
2431 2768
2432Send 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
2433client 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
2434the 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
2435the message unless the client supports the msg packet. 2772the message unless the client supports the msg packet.
2436 2773
2437=cut 2774=cut
2438 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
2439sub cf::client::send_msg { 2840sub cf::client::send_msg {
2440 my ($self, $color, $type, $msg, @extra) = @_; 2841 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2842
2442 $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 }
2443 2867
2444 return unless @extra || length $msg; 2868 return unless @extra || length $msg;
2445 2869
2446 if ($self->can_msg) { 2870 if ($self->can_msg) {
2447 $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);
2448 } else { 2891 } else {
2449 # replace some tags by gcfclient-compatible ones
2450 for ($msg) {
2451 1 while
2452 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2453 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2454 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2455 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2456 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2457 }
2458
2459 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
2460 if (0 && $msg =~ /\[/) { 2907 if (0 && $msg =~ /\[/) {
2908 # COMMAND/INFO
2461 $self->send_packet ("drawextinfo $color 4 0 $msg") 2909 $self->send_packet ("drawextinfo $color 10 8 $msg")
2462 } else { 2910 } else {
2463 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2911 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2464 $self->send_packet ("drawinfo $color $msg") 2912 $self->send_packet ("drawinfo $color $msg")
2465 } 2913 }
2466 } 2914 }
2467 } 2915 }
2468} 2916}
2469 2917
2470=item $client->ext_event ($type, %msg) 2918=item $client->ext_msg ($type, @msg)
2471 2919
2472Sends an ext event to the client. 2920Sends an ext event to the client.
2473 2921
2474=cut 2922=cut
2475 2923
2476sub cf::client::ext_event($$%) { 2924sub cf::client::ext_msg($$@) {
2477 my ($self, $type, %msg) = @_; 2925 my ($self, $type, @msg) = @_;
2478 2926
2479 return unless $self->extcmd; 2927 if ($self->extcmd == 2) {
2480 2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove
2481 $msg{msgtype} = "event_$type"; 2930 push @msg, msgtype => "event_$type";
2482 $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 }
2483} 2951}
2484 2952
2485=item $success = $client->query ($flags, "text", \&cb) 2953=item $success = $client->query ($flags, "text", \&cb)
2486 2954
2487Queues a query to the client, calling the given callback with 2955Queues a query to the client, calling the given callback with
2542 my ($ns, $buf) = @_; 3010 my ($ns, $buf) = @_;
2543 3011
2544 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3012 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2545 3013
2546 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
2547 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3022 if (my $cb = $EXTICMD{$type}) {
2548 if (my %reply = $cb->($ns, $msg)) { 3023 @reply = $cb->($ns, @payload);
2549 $reply{msgid} = $msg->{msgid};
2550 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2551 }
2552 } 3024 }
3025
3026 $ns->ext_reply ($reply, @reply)
3027 if $reply;
3028
2553 } else { 3029 } else {
2554 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";
2555 } 3031 }
2556 3032
2557 cf::override; 3033 cf::override;
2604our $safe = new Safe "safe"; 3080our $safe = new Safe "safe";
2605our $safe_hole = new Safe::Hole; 3081our $safe_hole = new Safe::Hole;
2606 3082
2607$SIG{FPE} = 'IGNORE'; 3083$SIG{FPE} = 'IGNORE';
2608 3084
2609$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));
2610 3090
2611# here we export the classes and methods available to script code 3091# here we export the classes and methods available to script code
2612 3092
2613=pod 3093=pod
2614 3094
2615The following functions and methods are available within a safe environment: 3095The following functions and methods are available within a safe environment:
2616 3096
2617 cf::object 3097 cf::object
2618 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
2619 insert remove 3099 insert remove name archname title slaying race decrease split
2620 3100
2621 cf::object::player 3101 cf::object::player
2622 player 3102 player
2623 3103
2624 cf::player 3104 cf::player
2629 3109
2630=cut 3110=cut
2631 3111
2632for ( 3112for (
2633 ["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
2634 insert remove)], 3114 insert remove inv nrof name archname title slaying race
3115 decrease split destroy change_exp)],
2635 ["cf::object::player" => qw(player)], 3116 ["cf::object::player" => qw(player)],
2636 ["cf::player" => qw(peaceful)], 3117 ["cf::player" => qw(peaceful)],
2637 ["cf::map" => qw(trigger)], 3118 ["cf::map" => qw(trigger)],
2638) { 3119) {
2639 no strict 'refs'; 3120 no strict 'refs';
2715# the server's init and main functions 3196# the server's init and main functions
2716 3197
2717sub load_facedata($) { 3198sub load_facedata($) {
2718 my ($path) = @_; 3199 my ($path) = @_;
2719 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
2720 warn "loading facedata from $path\n"; 3207 warn "loading facedata from $path\n";
2721 3208
2722 my $facedata; 3209 my $facedata;
2723 0 < aio_load $path, $facedata 3210 0 < aio_load $path, $facedata
2724 or die "$path: $!"; 3211 or die "$path: $!";
2726 $facedata = Coro::Storable::thaw $facedata; 3213 $facedata = Coro::Storable::thaw $facedata;
2727 3214
2728 $facedata->{version} == 2 3215 $facedata->{version} == 2
2729 or cf::cleanup "$path: version mismatch, cannot proceed."; 3216 or cf::cleanup "$path: version mismatch, cannot proceed.";
2730 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
2731 { 3225 {
2732 my $faces = $facedata->{faceinfo}; 3226 my $faces = $facedata->{faceinfo};
2733 3227
2734 while (my ($face, $info) = each %$faces) { 3228 while (my ($face, $info) = each %$faces) {
2735 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3229 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3230
2736 cf::face::set_visibility $idx, $info->{visibility}; 3231 cf::face::set_visibility $idx, $info->{visibility};
2737 cf::face::set_magicmap $idx, $info->{magicmap}; 3232 cf::face::set_magicmap $idx, $info->{magicmap};
2738 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3233 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2739 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3234 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2740 3235
2741 cf::cede_to_tick; 3236 cf::cede_to_tick;
2742 } 3237 }
2743 3238
2744 while (my ($face, $info) = each %$faces) { 3239 while (my ($face, $info) = each %$faces) {
2745 next unless $info->{smooth}; 3240 next unless $info->{smooth};
3241
2746 my $idx = cf::face::find $face 3242 my $idx = cf::face::find $face
2747 or next; 3243 or next;
3244
2748 if (my $smooth = cf::face::find $info->{smooth}) { 3245 if (my $smooth = cf::face::find $info->{smooth}) {
2749 cf::face::set_smooth $idx, $smooth; 3246 cf::face::set_smooth $idx, $smooth;
2750 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3247 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2751 } else { 3248 } else {
2752 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3249 warn "smooth face '$info->{smooth}' not found for face '$face'";
2769 3266
2770 { 3267 {
2771 # TODO: for gcfclient pleasure, we should give resources 3268 # TODO: for gcfclient pleasure, we should give resources
2772 # that gcfclient doesn't grok a >10000 face index. 3269 # that gcfclient doesn't grok a >10000 face index.
2773 my $res = $facedata->{resource}; 3270 my $res = $facedata->{resource};
2774 my $enc = JSON::XS->new->utf8->canonical;
2775 3271
2776 while (my ($name, $info) = each %$res) { 3272 while (my ($name, $info) = each %$res) {
2777 my $meta = $enc->encode ({ 3273 if (defined $info->{type}) {
2778 name => $name,
2779 type => $info->{type},
2780 copyright => $info->{copyright}, #TODO#
2781 });
2782
2783 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3274 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3275 my $data;
2784 3276
2785 if ($name =~ /\.jpg$/) { 3277 if ($info->{type} & 1) {
2786 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3278 # prepend meta info
2787 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 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};
2788 } else { 3292 } else {
2789 my $data = pack "(w/a*)*", $meta, $info->{data}; 3293 $RESOURCE{$name} = $info;
2790 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2791
2792 cf::face::set_type $idx, 1;
2793 cf::face::set_data $idx, 0, $data, $chk;
2794 } 3294 }
2795 3295
2796 cf::cede_to_tick; 3296 cf::cede_to_tick;
2797 } 3297 }
2798 } 3298 }
2799 3299
3300 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3301
2800 1 3302 1
2801} 3303}
2802 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
2803sub 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
2804 load_resource_file "$MAPDIR/regions" 3348 load_resource_file "$MAPDIR/regions"
2805 or die "unable to load regions file\n"; 3349 or die "unable to load regions file\n";
2806 3350
2807 for (cf::region::list) { 3351 for (cf::region::list) {
2808 $_->{match} = qr/$_->{match}/ 3352 $_->{match} = qr/$_->{match}/
2816} 3360}
2817 3361
2818sub reload_archetypes { 3362sub reload_archetypes {
2819 load_resource_file "$DATADIR/archetypes" 3363 load_resource_file "$DATADIR/archetypes"
2820 or die "unable to load archetypes\n"; 3364 or die "unable to load archetypes\n";
2821 #d# NEED to laod twice to resolve forward references
2822 # this really needs to be done in an extra post-pass
2823 # (which needs to be synchronous, so solve it differently)
2824 load_resource_file "$DATADIR/archetypes"
2825 or die "unable to load archetypes\n";
2826} 3365}
2827 3366
2828sub reload_treasures { 3367sub reload_treasures {
2829 load_resource_file "$DATADIR/treasures" 3368 load_resource_file "$DATADIR/treasures"
2830 or die "unable to load treasurelists\n"; 3369 or die "unable to load treasurelists\n";
2831} 3370}
2832 3371
2833sub reload_resources { 3372sub reload_resources {
2834 warn "reloading resource files...\n"; 3373 warn "reloading resource files...\n";
2835 3374
3375 reload_facedata;
3376 reload_archetypes;
2836 reload_regions; 3377 reload_regions;
2837 reload_facedata;
2838 #reload_archetypes;#d#
2839 reload_archetypes;
2840 reload_treasures; 3378 reload_treasures;
2841 3379
2842 warn "finished reloading resource files\n"; 3380 warn "finished reloading resource files\n";
2843} 3381}
2844 3382
2845sub init { 3383sub reload_config {
2846 reload_resources;
2847}
2848
2849sub cfg_load {
2850 open my $fh, "<:utf8", "$CONFDIR/config" 3384 open my $fh, "<:utf8", "$CONFDIR/config"
2851 or return; 3385 or return;
2852 3386
2853 local $/; 3387 local $/;
2854 *CFG = YAML::Syck::Load <$fh>; 3388 *CFG = YAML::Load <$fh>;
2855 3389
2856 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3390 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2857 3391
2858 $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};
2859 $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};
2865 }; 3399 };
2866 warn $@ if $@; 3400 warn $@ if $@;
2867 } 3401 }
2868} 3402}
2869 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
2870sub 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
2871 # we must not ever block the main coroutine 3439 # we must not ever block the main coroutine
2872 local $Coro::idle = sub { 3440 local $Coro::idle = sub {
2873 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#
2874 (async { 3442 (async {
2875 Event::one_event; 3443 $Coro::current->{desc} = "IDLE BUG HANDLER";
3444 EV::loop EV::LOOP_ONESHOT;
2876 })->prio (Coro::PRIO_MAX); 3445 })->prio (Coro::PRIO_MAX);
2877 }; 3446 };
2878 3447
2879 cfg_load; 3448 evthread_start IO::AIO::poll_fileno;
3449
3450 cf::sync_job {
3451 reload_resources;
3452 reload_config;
2880 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
2881 load_extensions; 3466 load_extensions;
2882 3467
2883 $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
2884 Event::loop; 3476 EV::loop;
2885} 3477}
2886 3478
2887############################################################################# 3479#############################################################################
2888# initialisation and cleanup 3480# initialisation and cleanup
2889 3481
2890# install some emergency cleanup handlers 3482# install some emergency cleanup handlers
2891BEGIN { 3483BEGIN {
3484 our %SIGWATCHER = ();
2892 for my $signal (qw(INT HUP TERM)) { 3485 for my $signal (qw(INT HUP TERM)) {
2893 Event->signal ( 3486 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2894 reentrant => 0,
2895 data => WF_AUTOCANCEL,
2896 signal => $signal,
2897 prio => 0,
2898 cb => sub {
2899 cf::cleanup "SIG$signal"; 3487 cf::cleanup "SIG$signal";
2900 },
2901 ); 3488 };
2902 } 3489 }
2903} 3490}
2904 3491
2905sub write_runtime { 3492sub write_runtime_sync {
2906 my $runtime = "$LOCALDIR/runtime";
2907
2908 # first touch the runtime file to show we are still running: 3493 # first touch the runtime file to show we are still running:
2909 # the fsync below can take a very very long time. 3494 # the fsync below can take a very very long time.
2910 3495
2911 IO::AIO::aio_utime $runtime, undef, undef; 3496 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2912 3497
2913 my $guard = cf::lock_acquire "write_runtime"; 3498 my $guard = cf::lock_acquire "write_runtime";
2914 3499
2915 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3500 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2916 or return; 3501 or return;
2917 3502
2918 my $value = $cf::RUNTIME + 90 + 10; 3503 my $value = $cf::RUNTIME + 90 + 10;
2919 # 10 is the runtime save interval, for a monotonic clock 3504 # 10 is the runtime save interval, for a monotonic clock
2920 # 60 allows for the watchdog to kill the server. 3505 # 60 allows for the watchdog to kill the server.
2930 aio_utime $fh, undef, undef; 3515 aio_utime $fh, undef, undef;
2931 3516
2932 close $fh 3517 close $fh
2933 or return; 3518 or return;
2934 3519
2935 aio_rename "$runtime~", $runtime 3520 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2936 and return; 3521 and return;
2937 3522
2938 warn "runtime file written.\n"; 3523 warn "runtime file written.\n";
2939 3524
2940 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 };
2941} 3576}
2942 3577
2943sub emergency_save() { 3578sub emergency_save() {
2944 my $freeze_guard = cf::freeze_mainloop; 3579 my $freeze_guard = cf::freeze_mainloop;
2945 3580
2946 warn "enter emergency perl save\n"; 3581 warn "emergency_perl_save: enter\n";
2947 3582
2948 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
2949 # use a peculiar iteration method to avoid tripping on perl 3589 # use a peculiar iteration method to avoid tripping on perl
2950 # refcount bugs in for. also avoids problems with players 3590 # refcount bugs in for. also avoids problems with players
2951 # and maps saved/destroyed asynchronously. 3591 # and maps saved/destroyed asynchronously.
2952 warn "begin emergency player save\n"; 3592 warn "emergency_perl_save: begin player save\n";
2953 for my $login (keys %cf::PLAYER) { 3593 for my $login (keys %cf::PLAYER) {
2954 my $pl = $cf::PLAYER{$login} or next; 3594 my $pl = $cf::PLAYER{$login} or next;
2955 $pl->valid or next; 3595 $pl->valid or next;
3596 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2956 $pl->save; 3597 $pl->save;
2957 } 3598 }
2958 warn "end emergency player save\n"; 3599 warn "emergency_perl_save: end player save\n";
2959 3600
2960 warn "begin emergency map save\n"; 3601 warn "emergency_perl_save: begin map save\n";
2961 for my $path (keys %cf::MAP) { 3602 for my $path (keys %cf::MAP) {
2962 my $map = $cf::MAP{$path} or next; 3603 my $map = $cf::MAP{$path} or next;
2963 $map->valid or next; 3604 $map->valid or next;
2964 $map->save; 3605 $map->save;
2965 } 3606 }
2966 warn "end emergency map save\n"; 3607 warn "emergency_perl_save: end map save\n";
2967 3608
2968 warn "begin emergency database checkpoint\n"; 3609 warn "emergency_perl_save: begin database checkpoint\n";
2969 BDB::db_env_txn_checkpoint $DB_ENV; 3610 BDB::db_env_txn_checkpoint $DB_ENV;
2970 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";
2971 }; 3616 };
2972 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
2973 warn "leave emergency perl save\n"; 3623 warn "emergency_perl_save: leave\n";
2974} 3624}
2975 3625
2976sub post_cleanup { 3626sub post_cleanup {
2977 my ($make_core) = @_; 3627 my ($make_core) = @_;
2978 3628
2979 warn Carp::longmess "post_cleanup backtrace" 3629 warn Carp::longmess "post_cleanup backtrace"
2980 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#
2981} 3660}
2982 3661
2983sub do_reload_perl() { 3662sub do_reload_perl() {
2984 # can/must only be called in main 3663 # can/must only be called in main
2985 if ($Coro::current != $Coro::main) { 3664 if ($Coro::current != $Coro::main) {
2986 warn "can only reload from main coroutine"; 3665 warn "can only reload from main coroutine";
2987 return; 3666 return;
2988 } 3667 }
2989 3668
3669 return if $RELOAD++;
3670
3671 my $t1 = EV::time;
3672
3673 while ($RELOAD) {
2990 warn "reloading..."; 3674 warn "reloading...";
2991 3675
2992 warn "entering sync_job"; 3676 warn "entering sync_job";
2993 3677
2994 cf::sync_job { 3678 cf::sync_job {
2995 cf::write_runtime; # external watchdog should not bark 3679 cf::write_runtime_sync; # external watchdog should not bark
2996 cf::emergency_save; 3680 cf::emergency_save;
2997 cf::write_runtime; # external watchdog should not bark 3681 cf::write_runtime_sync; # external watchdog should not bark
2998 3682
2999 warn "syncing database to disk"; 3683 warn "syncing database to disk";
3000 BDB::db_env_txn_checkpoint $DB_ENV; 3684 BDB::db_env_txn_checkpoint $DB_ENV;
3001 3685
3002 # 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
3003 3687
3004 warn "cancelling all WF_AUTOCANCEL watchers";
3005 for (Event::all_watchers) {
3006 $_->cancel if $_->data & WF_AUTOCANCEL;
3007 }
3008
3009 warn "flushing outstanding aio requests"; 3688 warn "flushing outstanding aio requests";
3010 for (;;) {
3011 BDB::flush;
3012 IO::AIO::flush;
3013 Coro::cede;
3014 last unless IO::AIO::nreqs || BDB::nreqs; 3689 while (IO::AIO::nreqs || BDB::nreqs) {
3015 warn "iterate..."; 3690 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3016 }
3017
3018 ++$RELOAD;
3019
3020 warn "cancelling all extension coros";
3021 $_->cancel for values %EXT_CORO;
3022 %EXT_CORO = ();
3023
3024 warn "removing commands";
3025 %COMMAND = ();
3026
3027 warn "removing ext/exti commands";
3028 %EXTCMD = ();
3029 %EXTICMD = ();
3030
3031 warn "unloading/nuking all extensions";
3032 for my $pkg (@EXTS) {
3033 warn "... unloading $pkg";
3034
3035 if (my $cb = $pkg->can ("unload")) {
3036 eval {
3037 $cb->($pkg);
3038 1
3039 } or warn "$pkg unloaded, but with errors: $@";
3040 } 3691 }
3041 3692
3042 warn "... nuking $pkg"; 3693 warn "cancelling all extension coros";
3043 Symbol::delete_package $pkg; 3694 $_->cancel for values %EXT_CORO;
3044 } 3695 %EXT_CORO = ();
3045 3696
3046 warn "unloading all perl modules loaded from $LIBDIR"; 3697 warn "removing commands";
3047 while (my ($k, $v) = each %INC) { 3698 %COMMAND = ();
3048 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3049 3699
3700 warn "removing ext/exti commands";
3701 %EXTCMD = ();
3702 %EXTICMD = ();
3703
3704 warn "unloading/nuking all extensions";
3705 for my $pkg (@EXTS) {
3050 warn "... unloading $k"; 3706 warn "... unloading $pkg";
3051 delete $INC{$k};
3052 3707
3053 $k =~ s/\.pm$//;
3054 $k =~ s/\//::/g;
3055
3056 if (my $cb = $k->can ("unload_module")) { 3708 if (my $cb = $pkg->can ("unload")) {
3709 eval {
3057 $cb->(); 3710 $cb->($pkg);
3711 1
3712 } or warn "$pkg unloaded, but with errors: $@";
3713 }
3714
3715 warn "... clearing $pkg";
3716 clear_package $pkg;
3058 } 3717 }
3059 3718
3060 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;
3061 } 3734 }
3062 3735
3063 warn "getting rid of safe::, as good as possible"; 3736 warn "getting rid of safe::, as good as possible";
3064 Symbol::delete_package "safe::$_" 3737 clear_package "safe::$_"
3065 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);
3066 3739
3067 warn "unloading cf.pm \"a bit\""; 3740 warn "unloading cf.pm \"a bit\"";
3068 delete $INC{"cf.pm"}; 3741 delete $INC{"cf.pm"};
3069 delete $INC{"cf/pod.pm"}; 3742 delete $INC{"cf/pod.pm"};
3070 3743
3071 # don't, removes xs symbols, too, 3744 # don't, removes xs symbols, too,
3072 # and global variables created in xs 3745 # and global variables created in xs
3073 #Symbol::delete_package __PACKAGE__; 3746 #clear_package __PACKAGE__;
3074 3747
3075 warn "unload completed, starting to reload now"; 3748 warn "unload completed, starting to reload now";
3076 3749
3077 warn "reloading cf.pm"; 3750 warn "reloading cf.pm";
3078 require cf; 3751 require cf;
3079 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3752 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3080 3753
3081 warn "loading config and database again"; 3754 warn "loading config and database again";
3082 cf::cfg_load; 3755 cf::reload_config;
3083 3756
3084 warn "loading extensions"; 3757 warn "loading extensions";
3085 cf::load_extensions; 3758 cf::load_extensions;
3086 3759
3760 if ($REATTACH_ON_RELOAD) {
3087 warn "reattaching attachments to objects/players"; 3761 warn "reattaching attachments to objects/players";
3088 _global_reattach; # objects, sockets 3762 _global_reattach; # objects, sockets
3089 warn "reattaching attachments to maps"; 3763 warn "reattaching attachments to maps";
3090 reattach $_ for values %MAP; 3764 reattach $_ for values %MAP;
3091 warn "reattaching attachments to players"; 3765 warn "reattaching attachments to players";
3092 reattach $_ for values %PLAYER; 3766 reattach $_ for values %PLAYER;
3767 }
3093 3768
3769 warn "running post_init jobs";
3770 (pop @POST_INIT)->(1) while @POST_INIT;
3771
3094 warn "leaving sync_job"; 3772 warn "leaving sync_job";
3095 3773
3096 1 3774 1
3097 } or do { 3775 } or do {
3098 warn $@; 3776 warn $@;
3099 warn "error while reloading, exiting."; 3777 cf::cleanup "error while reloading, exiting.";
3100 exit 1;
3101 }; 3778 };
3102 3779
3103 warn "reloaded"; 3780 warn "reloaded";
3781 --$RELOAD;
3782 }
3783
3784 $t1 = EV::time - $t1;
3785 warn "reload completed in ${t1}s\n";
3104}; 3786};
3105 3787
3106our $RELOAD_WATCHER; # used only during reload 3788our $RELOAD_WATCHER; # used only during reload
3107 3789
3108sub reload_perl() { 3790sub reload_perl() {
3109 # doing reload synchronously and two reloads happen back-to-back, 3791 # doing reload synchronously and two reloads happen back-to-back,
3110 # coro crashes during coro_state_free->destroy here. 3792 # coro crashes during coro_state_free->destroy here.
3111 3793
3112 $RELOAD_WATCHER ||= Event->timer ( 3794 $RELOAD_WATCHER ||= cf::async {
3113 reentrant => 0, 3795 Coro::AIO::aio_wait cache_extensions;
3114 after => 0, 3796
3115 data => WF_AUTOCANCEL, 3797 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3116 cb => sub {
3117 do_reload_perl; 3798 do_reload_perl;
3118 undef $RELOAD_WATCHER; 3799 undef $RELOAD_WATCHER;
3119 }, 3800 };
3120 ); 3801 };
3121} 3802}
3122 3803
3123register_command "reload" => sub { 3804register_command "reload" => sub {
3124 my ($who, $arg) = @_; 3805 my ($who, $arg) = @_;
3125 3806
3126 if ($who->flag (FLAG_WIZ)) { 3807 if ($who->flag (FLAG_WIZ)) {
3127 $who->message ("reloading server."); 3808 $who->message ("reloading server.");
3809 async {
3810 $Coro::current->{desc} = "perl_reload";
3128 async { reload_perl }; 3811 reload_perl;
3812 };
3129 } 3813 }
3130}; 3814};
3131 3815
3132unshift @INC, $LIBDIR; 3816unshift @INC, $LIBDIR;
3133 3817
3135 3819
3136our @WAIT_FOR_TICK; 3820our @WAIT_FOR_TICK;
3137our @WAIT_FOR_TICK_BEGIN; 3821our @WAIT_FOR_TICK_BEGIN;
3138 3822
3139sub wait_for_tick { 3823sub wait_for_tick {
3140 return unless $TICK_WATCHER->is_active;
3141 return if $Coro::current == $Coro::main; 3824 return if tick_inhibit || $Coro::current == $Coro::main;
3142 3825
3143 my $signal = new Coro::Signal; 3826 my $signal = new Coro::Signal;
3144 push @WAIT_FOR_TICK, $signal; 3827 push @WAIT_FOR_TICK, $signal;
3145 $signal->wait; 3828 $signal->wait;
3146} 3829}
3147 3830
3148sub wait_for_tick_begin { 3831sub wait_for_tick_begin {
3149 return unless $TICK_WATCHER->is_active;
3150 return if $Coro::current == $Coro::main; 3832 return if tick_inhibit || $Coro::current == $Coro::main;
3151 3833
3152 my $signal = new Coro::Signal; 3834 my $signal = new Coro::Signal;
3153 push @WAIT_FOR_TICK_BEGIN, $signal; 3835 push @WAIT_FOR_TICK_BEGIN, $signal;
3154 $signal->wait; 3836 $signal->wait;
3155} 3837}
3156 3838
3157 my $min = 1e6;#d# 3839sub tick {
3158 my $avg = 10;
3159$TICK_WATCHER = Event->timer (
3160 reentrant => 0,
3161 parked => 1,
3162 prio => 0,
3163 at => $NEXT_TICK || $TICK,
3164 data => WF_AUTOCANCEL,
3165 cb => sub {
3166 if ($Coro::current != $Coro::main) { 3840 if ($Coro::current != $Coro::main) {
3167 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"
3168 unless ++$bug_warning > 10; 3842 unless ++$bug_warning > 10;
3169 return; 3843 return;
3170 } 3844 }
3171 3845
3172 $NOW = $tick_start = Event::time;
3173
3174 cf::server_tick; # one server iteration 3846 cf::server_tick; # one server iteration
3175 3847
3176 0 && sync_job {#d# 3848 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3177 for(1..10) { 3849 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3178 my $t = Event::time; 3850 Coro::async_pool {
3179 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3851 $Coro::current->{desc} = "runtime saver";
3180 or die; 3852 write_runtime_sync
3181 3853 or warn "ERROR: unable to write runtime file: $!";
3182 $map->width (50);
3183 $map->height (50);
3184 $map->alloc;
3185 $map->_load_objects ("/tmp/x.map", 1);
3186 my $t = Event::time - $t;
3187
3188 #next unless $t < 0.0013;#d#
3189 if ($t < $min) {
3190 $min = $t;
3191 }
3192 $avg = $avg * 0.99 + $t * 0.01;
3193 }
3194 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3195 exit 0;
3196 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3197 }; 3854 };
3855 }
3198 3856
3199 $RUNTIME += $TICK;
3200 $NEXT_TICK += $TICK;
3201
3202 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3203 $NEXT_RUNTIME_WRITE = $NOW + 10;
3204 Coro::async_pool {
3205 write_runtime
3206 or warn "ERROR: unable to write runtime file: $!";
3207 };
3208 }
3209
3210# my $AFTER = Event::time;
3211# warn $AFTER - $NOW;#d#
3212
3213 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3857 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3214 $sig->send; 3858 $sig->send;
3215 } 3859 }
3216 while (my $sig = shift @WAIT_FOR_TICK) { 3860 while (my $sig = shift @WAIT_FOR_TICK) {
3217 $sig->send; 3861 $sig->send;
3218 } 3862 }
3219 3863
3220 $NOW = Event::time; 3864 $LOAD = ($NOW - $TICK_START) / $TICK;
3221
3222 # if we are delayed by four ticks or more, skip them all
3223 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3224
3225 $TICK_WATCHER->at ($NEXT_TICK);
3226 $TICK_WATCHER->start;
3227
3228 $LOAD = ($NOW - $tick_start) / $TICK;
3229 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3865 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3230 3866
3231 _post_tick; 3867 if (0) {
3232 3868 if ($NEXT_TICK) {
3233 3869 my $jitter = $TICK_START - $NEXT_TICK;
3870 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3871 warn "jitter $JITTER\n";#d#
3872 }
3234 }, 3873 }
3235); 3874}
3236 3875
3237{ 3876{
3238 BDB::max_poll_time $TICK * 0.1; 3877 # configure BDB
3239 $BDB_POLL_WATCHER = Event->io ( 3878
3240 reentrant => 0,
3241 fd => BDB::poll_fileno,
3242 poll => 'r',
3243 prio => 0,
3244 data => WF_AUTOCANCEL,
3245 cb => \&BDB::poll_cb,
3246 );
3247 BDB::min_parallel 8; 3879 BDB::min_parallel 8;
3248 3880 BDB::max_poll_reqs $TICK * 0.1;
3249 BDB::set_sync_prepare { 3881 $AnyEvent::BDB::WATCHER->priority (1);
3250 my $status;
3251 my $current = $Coro::current;
3252 (
3253 sub {
3254 $status = $!;
3255 $current->ready; undef $current;
3256 },
3257 sub {
3258 Coro::schedule while defined $current;
3259 $! = $status;
3260 },
3261 )
3262 };
3263 3882
3264 unless ($DB_ENV) { 3883 unless ($DB_ENV) {
3265 $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);
3266 3890
3267 cf::sync_job { 3891 cf::sync_job {
3268 eval { 3892 eval {
3269 BDB::db_env_open 3893 BDB::db_env_open
3270 $DB_ENV, 3894 $DB_ENV,
3272 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
3273 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3897 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3274 0666; 3898 0666;
3275 3899
3276 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3900 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3277
3278 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3279 $DB_ENV->set_lk_detect;
3280 }; 3901 };
3281 3902
3282 cf::cleanup "db_env_open(db): $@" if $@; 3903 cf::cleanup "db_env_open(db): $@" if $@;
3283 }; 3904 };
3284 } 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 };
3285} 3916}
3286 3917
3287{ 3918{
3919 # configure IO::AIO
3920
3288 IO::AIO::min_parallel 8; 3921 IO::AIO::min_parallel 8;
3289
3290 undef $Coro::AIO::WATCHER;
3291 IO::AIO::max_poll_time $TICK * 0.1; 3922 IO::AIO::max_poll_time $TICK * 0.1;
3292 $AIO_POLL_WATCHER = Event->io ( 3923 undef $AnyEvent::AIO::WATCHER;
3293 reentrant => 0,
3294 data => WF_AUTOCANCEL,
3295 fd => IO::AIO::poll_fileno,
3296 poll => 'r',
3297 prio => 6,
3298 cb => \&IO::AIO::poll_cb,
3299 );
3300} 3924}
3301 3925
3302my $_log_backtrace; 3926my $_log_backtrace;
3303 3927
3304sub _log_backtrace { 3928sub _log_backtrace {
3307 $msg =~ s/\n//; 3931 $msg =~ s/\n//;
3308 3932
3309 # limit the # of concurrent backtraces 3933 # limit the # of concurrent backtraces
3310 if ($_log_backtrace < 2) { 3934 if ($_log_backtrace < 2) {
3311 ++$_log_backtrace; 3935 ++$_log_backtrace;
3936 my $perl_bt = Carp::longmess $msg;
3312 async { 3937 async {
3938 $Coro::current->{desc} = "abt $msg";
3939
3313 my @bt = fork_call { 3940 my @bt = fork_call {
3314 @addr = map { sprintf "%x", $_ } @addr; 3941 @addr = map { sprintf "%x", $_ } @addr;
3315 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3942 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3316 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 |"
3317 or die "addr2line: $!"; 3944 or die "addr2line: $!";
3325 } 3952 }
3326 3953
3327 @funcs 3954 @funcs
3328 }; 3955 };
3329 3956
3330 LOG llevInfo, "[ABT] $msg\n"; 3957 LOG llevInfo, "[ABT] $perl_bt\n";
3958 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3331 LOG llevInfo, "[ABT] $_\n" for @bt; 3959 LOG llevInfo, "[ABT] $_\n" for @bt;
3332 --$_log_backtrace; 3960 --$_log_backtrace;
3333 }; 3961 };
3334 } else { 3962 } else {
3335 LOG llevInfo, "[ABT] $msg\n"; 3963 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines