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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines