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.321 by root, Thu Jul 26 21:44:43 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}
322 }; 395
323 $TICK_WATCHER->stop; 396=item cf::periodic $interval, $cb
324 $guard 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
325} 409}
326 410
327=item cf::get_slot $time[, $priority[, $name]] 411=item cf::get_slot $time[, $priority[, $name]]
328 412
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 413Allocate $time seconds of blocking CPU time at priority C<$priority>:
340our @SLOT_QUEUE; 424our @SLOT_QUEUE;
341our $SLOT_QUEUE; 425our $SLOT_QUEUE;
342 426
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 427$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 428$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager");
430
345 my $signal = new Coro::Signal; 431 my $signal = new Coro::Signal;
346 432
347 while () { 433 while () {
348 next_job: 434 next_job:
349 my $avail = cf::till_tick; 435 my $avail = cf::till_tick;
357 } 443 }
358 } 444 }
359 } 445 }
360 446
361 if (@SLOT_QUEUE) { 447 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 448 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 449 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 450 $signal->wait;
365 } else { 451 } else {
366 Coro::schedule; 452 Coro::schedule;
367 } 453 }
368 } 454 }
369}; 455};
370 456
371sub get_slot($;$$) { 457sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main;
459
372 my ($time, $pri, $name) = @_; 460 my ($time, $pri, $name) = @_;
373 461
374 $time = $TICK * .6 if $time > $TICK * .6; 462 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal; 463 my $sig = new Coro::Signal;
376 464
390 478
391BEGIN { *async = \&Coro::async_pool } 479BEGIN { *async = \&Coro::async_pool }
392 480
393=item cf::sync_job { BLOCK } 481=item cf::sync_job { BLOCK }
394 482
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 483The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 484is always able to handle events or runnable, as Deliantra is only
397partly 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
398acceptable. 486acceptable.
399 487
400If 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
401the given BLOCK in another coroutine while waiting for the result. The 489the given BLOCK in another coroutine while waiting for the result. The
406 494
407sub sync_job(&) { 495sub sync_job(&) {
408 my ($job) = @_; 496 my ($job) = @_;
409 497
410 if ($Coro::current == $Coro::main) { 498 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 499 my $time = EV::time;
412 500
413 # this is the main coro, too bad, we have to block 501 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 502 # till the operation succeeds, freezing the server :/
415 503
416 # TODO: use suspend/resume instead 504 LOG llevError, Carp::longmess "sync job";#d#
417 # (but this is cancel-safe) 505
418 my $freeze_guard = freeze_mainloop; 506 my $freeze_guard = freeze_mainloop;
419 507
420 my $busy = 1; 508 my $busy = 1;
421 my @res; 509 my @res;
422 510
423 (async { 511 (async {
512 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 513 @res = eval { $job->() };
425 warn $@ if $@; 514 warn $@ if $@;
426 undef $busy; 515 undef $busy;
427 })->prio (Coro::PRIO_MAX); 516 })->prio (Coro::PRIO_MAX);
428 517
429 while ($busy) { 518 while ($busy) {
430 Coro::cede or Event::one_event; 519 if (Coro::nready) {
520 Coro::cede_notself;
521 } else {
522 EV::loop EV::LOOP_ONESHOT;
431 } 523 }
524 }
432 525
433 $time = Event::time - $time; 526 my $time = EV::time - $time;
434 527
435 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437
438 $tick_start += $time; # do not account sync jobs to server load 528 $TICK_START += $time; # do not account sync jobs to server load
439 529
440 wantarray ? @res : $res[0] 530 wantarray ? @res : $res[0]
441 } else { 531 } else {
442 # we are in another coroutine, how wonderful, everything just works 532 # we are in another coroutine, how wonderful, everything just works
443 533
468=item fork_call { }, $args 558=item fork_call { }, $args
469 559
470Executes the given code block with the given arguments in a seperate 560Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 561process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 562Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 563never block itself or use any form of event handling.
474 564
475=cut 565=cut
476
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485 566
486sub fork_call(&@) { 567sub fork_call(&@) {
487 my ($cb, @args) = @_; 568 my ($cb, @args) = @_;
488 569
489# 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,
490# or die "socketpair: $!"; 571 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 572 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 573
494 if (my $pid = fork) { 574 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 575 reset_signals;
508 local $SIG{__WARN__}; 576 &$cb
509 local $SIG{__DIE__}; 577 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 578
516 eval { 579 wantarray ? @res : $res[-1]
517 close $fh1; 580}
518 581
519 my @res = eval { $cb->(@args) }; 582=item $coin = coin_from_name $name
520 583
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 584=cut
522 close $fh2;
523 };
524 585
525 warn $@ if $@; 586our %coin_alias = (
526 _exit 0; 587 "silver" => "silvercoin",
527 } 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
528} 607}
529 608
530=item $value = cf::db_get $family => $key 609=item $value = cf::db_get $family => $key
531 610
532Returns a single value from the environment database. 611Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 613=item cf::db_put $family => $key => $value
535 614
536Stores 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
537data 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).
538 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
539=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}
540 641
541our $DB; 642our $DB;
542 643
543sub db_init { 644sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 645 cf::sync_job {
548 eval { 646 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 647 };
558} 648}
559 649
560sub db_get($$) { 650sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 651 my $key = "$_[0]/$_[1]";
562 652
612 if (1) { 702 if (1) {
613 $md5 = 703 $md5 =
614 join "\x00", 704 join "\x00",
615 $processversion, 705 $processversion,
616 map { 706 map {
617 Coro::cede; 707 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 708 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 709 } 0.. $#$src;
620 710
621 711
622 my $dbmd5 = db_get cache => "$id/md5"; 712 my $dbmd5 = db_get cache => "$id/md5";
660 750
661############################################################################# 751#############################################################################
662 752
663=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
664 754
665Many 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
666attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
668 758
669In 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>
670C<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
671Crossfire TRT). 761Deliantra).
672 762
673=over 4 763=over 4
674 764
675=item $attachable->attach ($attachment, key => $value...) 765=item $attachable->attach ($attachment, key => $value...)
676 766
720=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
721 811
722Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
723given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
724 814
725Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
726that 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.
727 817
728These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
729 819
730=over 4 820=over 4
958 } 1048 }
959 1049
960 0 1050 0
961} 1051}
962 1052
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1053=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 1054
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 1056
967Generate an object-specific event with the given arguments. 1057Generate an object-specific event with the given arguments.
968 1058
974 1064
975=cut 1065=cut
976 1066
977############################################################################# 1067#############################################################################
978# object support 1068# object support
979#
980 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#
981sub _can_merge { 1103sub _can_merge {
982 my ($ob1, $ob2) = @_; 1104 my ($ob1, $ob2) = @_;
983 1105
984 local $Storable::canonical = 1; 1106 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1107
988 $fob1 eq $fob2 1108 # we do the slow way here
1109 return _object_equal $ob1, $ob2
989} 1110}
990 1111
991sub reattach { 1112sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1114 my ($obj) = @_;
994 1115
1116 # no longer needed after getting rid of delete_package?
995 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
996 1118
997 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
998 1120
999 @$registry = (); 1121 @$registry = ();
1000 1122
1015cf::attachable->attach ( 1137cf::attachable->attach (
1016 prio => -1000000, 1138 prio => -1000000,
1017 on_instantiate => sub { 1139 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1140 my ($obj, $data) = @_;
1019 1141
1020 $data = from_json $data; 1142 $data = decode_json $data;
1021 1143
1022 for (@$data) { 1144 for (@$data) {
1023 my ($name, $args) = @$_; 1145 my ($name, $args) = @$_;
1024 1146
1025 $obj->attach ($name, %{$args || {} }); 1147 $obj->attach ($name, %{$args || {} });
1041sub object_freezer_save { 1163sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1164 my ($filename, $rdata, $objs) = @_;
1043 1165
1044 sync_job { 1166 sync_job {
1045 if (length $$rdata) { 1167 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1169 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1170 $decname, length $$rdata, scalar @$objs;
1048 1171
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1173 aio_chmod $fh, SAVE_MODE;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1175 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1176 aio_close $fh;
1054 1177
1055 if (@$objs) { 1178 if (@$objs) {
1056 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) {
1057 chmod SAVE_MODE, $fh; 1180 aio_chmod $fh, SAVE_MODE;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1182 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1183 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1184 aio_close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1185 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1186 }
1064 } else { 1187 } else {
1065 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1066 } 1189 }
1067 1190
1068 aio_rename "$filename~", $filename; 1191 aio_rename "$filename~", $filename;
1192
1193 $filename =~ s%/[^/]+$%%;
1194 aio_pathsync $filename;
1069 } else { 1195 } else {
1070 warn "FATAL: $filename~: $!\n"; 1196 warn "FATAL: $filename~: $!\n";
1071 } 1197 }
1072 } else { 1198 } else {
1073 aio_unlink $filename; 1199 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1200 aio_unlink "$filename.pst";
1075 } 1201 }
1076 } 1202 };
1077} 1203}
1078 1204
1079sub object_freezer_as_string { 1205sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1206 my ($rdata, $objs) = @_;
1081 1207
1093 or return; 1219 or return;
1094 1220
1095 unless (aio_stat "$filename.pst") { 1221 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1222 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1223 or return;
1224
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1225 my $st = eval { Coro::Storable::thaw $av };
1226 $av = $st->{objs};
1099 } 1227 }
1100 1228
1229 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1230 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1231 $decname, length $data, scalar @{$av || []};
1232
1103 return ($data, $av); 1233 ($data, $av)
1104} 1234}
1105 1235
1106=head2 COMMAND CALLBACKS 1236=head2 COMMAND CALLBACKS
1107 1237
1108=over 4 1238=over 4
1186 my ($type, $reply, @payload) = 1316 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1317 "ARRAY" eq ref $msg
1188 ? @$msg 1318 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1319 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1320
1321 my @reply;
1322
1191 if (my $cb = $EXTCMD{$type}) { 1323 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1324 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1325 }
1326
1327 $pl->ext_reply ($reply, @reply)
1328 if $reply;
1329
1197 } else { 1330 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1331 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1332 }
1200 1333
1201 cf::override; 1334 cf::override;
1228 1361
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1362 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1363 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1364
1232 $ext{source} = 1365 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1366 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n" 1367 . "#line 1 \"$path\"\n{\n"
1235 . $source 1368 . $source
1236 . "\n};\n1"; 1369 . "\n};\n1";
1237 1370
1238 $todo{$base} = \%ext; 1371 $todo{$base} = \%ext;
1254 my $msg = $@ ? "$v->{path}: $@\n" 1387 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1388 : "$v->{base}: extension inactive.\n";
1256 1389
1257 if (exists $v->{meta}{mandatory}) { 1390 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1391 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1392 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1393 }
1262 1394
1263 warn $msg; 1395 warn $msg;
1264 } 1396 }
1265 1397
1279 1411
1280=back 1412=back
1281 1413
1282=head2 CORE EXTENSIONS 1414=head2 CORE EXTENSIONS
1283 1415
1284Functions and methods that extend core crossfire objects. 1416Functions and methods that extend core deliantra objects.
1285 1417
1286=cut 1418=cut
1287 1419
1288package cf::player; 1420package cf::player;
1289 1421
1290use Coro::AIO; 1422use Coro::AIO;
1291 1423
1292=head3 cf::player 1424=head3 cf::player
1293 1425
1294=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}
1295 1441
1296=item cf::player::find $login 1442=item cf::player::find $login
1297 1443
1298Returns the given player object, loading it if necessary (might block). 1444Returns the given player object, loading it if necessary (might block).
1299 1445
1318 1464
1319sub exists($) { 1465sub exists($) {
1320 my ($login) = @_; 1466 my ($login) = @_;
1321 1467
1322 $cf::PLAYER{$login} 1468 $cf::PLAYER{$login}
1323 or cf::sync_job { !aio_stat path $login } 1469 or !aio_stat path $login
1324} 1470}
1325 1471
1326sub find($) { 1472sub find($) {
1327 return $cf::PLAYER{$_[0]} || do { 1473 return $cf::PLAYER{$_[0]} || do {
1328 my $login = $_[0]; 1474 my $login = $_[0];
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1481 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1482 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1483 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1484 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1485
1340 my $pl = load_pl path $login 1486 my $f = new_from_file cf::object::thawer path $login
1341 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;
1342 $cf::PLAYER{$login} = $pl 1494 $cf::PLAYER{$login} = $pl
1343 } 1495 }
1344 } 1496 }
1345} 1497}
1346 1498
1355 return if $pl->{deny_save}; 1507 return if $pl->{deny_save};
1356 1508
1357 aio_mkdir playerdir $pl, 0770; 1509 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1510 $pl->{last_save} = $cf::RUNTIME;
1359 1511
1512 cf::get_slot 0.01;
1513
1360 $pl->save_pl ($path); 1514 $pl->save_pl ($path);
1361 Coro::cede; 1515 cf::cede_to_tick;
1362} 1516}
1363 1517
1364sub new($) { 1518sub new($) {
1365 my ($login) = @_; 1519 my ($login) = @_;
1366 1520
1372 $cf::PLAYER{$login} = $self; 1526 $cf::PLAYER{$login} = $self;
1373 1527
1374 $self 1528 $self
1375} 1529}
1376 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
1377=item $pl->quit_character 1541=item $pl->quit_character
1378 1542
1379Nukes the player without looking back. If logged in, the connection will 1543Nukes the player without looking back. If logged in, the connection will
1380be destroyed. May block for a long time. 1544be destroyed. May block for a long time.
1381 1545
1385 my ($pl) = @_; 1549 my ($pl) = @_;
1386 1550
1387 my $name = $pl->ob->name; 1551 my $name = $pl->ob->name;
1388 1552
1389 $pl->{deny_save} = 1; 1553 $pl->{deny_save} = 1;
1390 $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
1391 1555
1392 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1556 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1393 $pl->deactivate; 1557 $pl->deactivate;
1558 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1559 $pl->ob->check_score;
1394 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1560 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1395 $pl->ns->destroy if $pl->ns; 1561 $pl->ns->destroy if $pl->ns;
1396 1562
1397 my $path = playerdir $pl; 1563 my $path = playerdir $pl;
1398 my $temp = "$path~$cf::RUNTIME~deleting~"; 1564 my $temp = "$path~$cf::RUNTIME~deleting~";
1434 or return []; 1600 or return [];
1435 1601
1436 my @logins; 1602 my @logins;
1437 1603
1438 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") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1610 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1611 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1612 $buf !~ /^password -------------$/m or next; # official not-valid tag
1613 }
1442 1614
1443 utf8::decode $login; 1615 utf8::decode $login;
1444 push @logins, $login; 1616 push @logins, $login;
1445 } 1617 }
1446 1618
1473 } 1645 }
1474 1646
1475 \@paths 1647 \@paths
1476} 1648}
1477 1649
1478=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1650=item $protocol_xml = $player->expand_cfpod ($cfpod)
1479 1651
1480Expand crossfire pod fragments into protocol xml. 1652Expand deliantra pod fragments into protocol xml.
1481
1482=cut
1483
1484sub expand_cfpod {
1485 ((my $self), (local $_)) = @_;
1486
1487 # escape & and <
1488 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g;
1490
1491 # this is buggy, it needs to properly take care of nested <'s
1492
1493 1 while
1494 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/
1498 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1
1501 }ge
1502 # replace H<hint text>
1503 || s{H<([^\>]*)>}
1504 {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "")
1508 [$self->{hintmode}]
1509 }ge;
1510
1511 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g;
1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1520 $_
1521}
1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527 1653
1528=item $player->ext_reply ($msgid, @msg) 1654=item $player->ext_reply ($msgid, @msg)
1529 1655
1530Sends an ext reply to the player. 1656Sends an ext reply to the player.
1531 1657
1532=cut 1658=cut
1533 1659
1534sub ext_reply($$@) { 1660sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1661 my ($self, $id, @msg) = @_;
1536 1662
1537 if ($self->ns->extcmd == 2) { 1663 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1664}
1545 1665
1546=item $player->ext_msg ($type, @msg) 1666=item $player->ext_msg ($type, @msg)
1547 1667
1548Sends an ext event to the client. 1668Sends an ext event to the client.
1604our $MAX_RESET = 3600; 1724our $MAX_RESET = 3600;
1605our $DEFAULT_RESET = 3000; 1725our $DEFAULT_RESET = 3000;
1606 1726
1607sub generate_random_map { 1727sub generate_random_map {
1608 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
1609 # mit "rum" bekleckern, nicht 1732 # mit "rum" bekleckern, nicht
1610 $self->_create_random_map ( 1733 $self->_create_random_map (
1611 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1612 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1613 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1735 1858
1736# the temporary/swap location 1859# the temporary/swap location
1737sub save_path { 1860sub save_path {
1738 my ($self) = @_; 1861 my ($self) = @_;
1739 1862
1740 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1741 "$TMPDIR/$path.map" 1864 "$TMPDIR/$path.map"
1742} 1865}
1743 1866
1744# the unique path, undef == no special unique path 1867# the unique path, undef == no special unique path
1745sub uniq_path { 1868sub uniq_path {
1746 my ($self) = @_; 1869 my ($self) = @_;
1747 1870
1748 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1749 "$UNIQUEDIR/$path" 1872 "$UNIQUEDIR/$path"
1750} 1873}
1751 1874
1752# and all this just because we cannot iterate over 1875# and all this just because we cannot iterate over
1753# all maps in C++... 1876# all maps in C++...
1776 1899
1777sub load_header_from($) { 1900sub load_header_from($) {
1778 my ($self, $path) = @_; 1901 my ($self, $path) = @_;
1779 1902
1780 utf8::encode $path; 1903 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1904 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 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;
1786 1912
1787 $self->{load_path} = $path; 1913 $self->{load_path} = $path;
1788 1914
1789 1 1915 1
1790} 1916}
1844sub find { 1970sub find {
1845 my ($path, $origin) = @_; 1971 my ($path, $origin) = @_;
1846 1972
1847 $path = normalise $path, $origin && $origin->path; 1973 $path = normalise $path, $origin && $origin->path;
1848 1974
1975 cf::lock_wait "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 1976 cf::lock_wait "map_find:$path";
1850 1977
1851 $cf::MAP{$path} || do { 1978 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1852 my $guard = cf::lock_acquire "map_find:$path"; 1980 my $guard2 = cf::lock_acquire "map_find:$path";
1981
1853 my $map = new_from_path cf::map $path 1982 my $map = new_from_path cf::map $path
1854 or return; 1983 or return;
1855 1984
1856 $map->{last_save} = $cf::RUNTIME; 1985 $map->{last_save} = $cf::RUNTIME;
1857 1986
1859 or return; 1988 or return;
1860 1989
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 1991 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 1992 #$cf::WAIT_FOR_TICK->wait;
1993 undef $guard2;
1994 undef $guard1;
1864 $map->reset; 1995 $map->reset;
1865 undef $guard;
1866 return find $path; 1996 return find $path;
1867 } 1997 }
1868 1998
1869 $cf::MAP{$path} = $map 1999 $cf::MAP{$path} = $map
1870 } 2000 }
1879 local $self->{deny_reset} = 1; # loading can take a long time 2009 local $self->{deny_reset} = 1; # loading can take a long time
1880 2010
1881 my $path = $self->{path}; 2011 my $path = $self->{path};
1882 2012
1883 { 2013 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 2014 my $guard = cf::lock_acquire "map_data:$path";
1885 2015
2016 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 2017 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 2018
1888 $self->in_memory (cf::MAP_LOADING); 2019 $self->in_memory (cf::MAP_LOADING);
1889 2020
1890 $self->alloc; 2021 $self->alloc;
1891 2022
1892 $self->pre_load; 2023 $self->pre_load;
1893 Coro::cede; 2024 cf::cede_to_tick;
1894 2025
2026 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 2028 $self->_load_objects ($f)
1896 or return; 2029 or return;
1897 2030
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2031 $self->post_load_original
1899 if delete $self->{load_original}; 2032 if delete $self->{load_original};
1900 2033
1901 if (my $uniq = $self->uniq_path) { 2034 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 2035 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 2036 unless (aio_stat $uniq) {
2037 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 2038 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 2039 $self->_load_objects ($f);
2040 $f->resolve_delayed_derefs;
2041 }
1906 } 2042 }
1907 } 2043 }
1908 2044
1909 Coro::cede; 2045 $f->resolve_delayed_derefs;
2046
2047 cf::cede_to_tick;
1910 # now do the right thing for maps 2048 # now do the right thing for maps
1911 $self->link_multipart_objects; 2049 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 2050 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 2051 unless $self->difficulty;
1914 Coro::cede; 2052 cf::cede_to_tick;
1915 2053
1916 unless ($self->{deny_activate}) { 2054 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 2055 $self->decay_objects;
1918 $self->fix_auto_apply; 2056 $self->fix_auto_apply;
1919 $self->update_buttons; 2057 $self->update_buttons;
1920 Coro::cede; 2058 cf::cede_to_tick;
1921 $self->set_darkness_map; 2059 $self->set_darkness_map;
1922 Coro::cede; 2060 cf::cede_to_tick;
1923 $self->activate; 2061 $self->activate;
1924 } 2062 }
1925 2063
2064 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME);
2066
1926 $self->in_memory (cf::MAP_IN_MEMORY); 2067 $self->in_memory (cf::MAP_ACTIVE);
1927 } 2068 }
1928 2069
1929 $self->post_load; 2070 $self->post_load;
1930} 2071}
1931 2072
1940 2081
1941 $self 2082 $self
1942} 2083}
1943 2084
1944# 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
1945sub load_diag { 2086sub load_neighbours {
1946 my ($map) = @_; 2087 my ($map) = @_;
1947 2088
1948 my @diag; # diagonal neighbours 2089 my @neigh; # diagonal neighbours
1949 2090
1950 for (0 .. 3) { 2091 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 2092 my $neigh = $map->tile_path ($_)
1952 or next; 2093 or next;
1953 $neigh = find $neigh, $map 2094 $neigh = find $neigh, $map
1954 or next; 2095 or next;
1955 $neigh->load; 2096 $neigh->load;
1956 2097
2098 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2099 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2100 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 2101 }
1960 2102
1961 for (@diag) { 2103 for (grep defined $_->[0], @neigh) {
2104 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 2105 my $neigh = find $path, $origin
1963 or next; 2106 or next;
1964 $neigh->load; 2107 $neigh->load;
1965 } 2108 }
1966} 2109}
1967 2110
1972} 2115}
1973 2116
1974sub do_load_sync { 2117sub do_load_sync {
1975 my ($map) = @_; 2118 my ($map) = @_;
1976 2119
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main;
2122
1977 cf::sync_job { $map->load }; 2123 cf::sync_job { $map->load };
1978} 2124}
1979 2125
1980our %MAP_PREFETCH; 2126our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 2127our $MAP_PREFETCHER = undef;
1982 2128
1983sub find_async { 2129sub find_async {
1984 my ($path, $origin) = @_; 2130 my ($path, $origin, $load) = @_;
1985 2131
1986 $path = normalise $path, $origin && $origin->{path}; 2132 $path = normalise $path, $origin && $origin->{path};
1987 2133
1988 if (my $map = $cf::MAP{$path}) { 2134 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2135 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1990 } 2136 }
1991 2137
1992 undef $MAP_PREFETCH{$path}; 2138 $MAP_PREFETCH{$path} |= $load;
2139
1993 $MAP_PREFETCHER ||= cf::async { 2140 $MAP_PREFETCHER ||= cf::async {
2141 $Coro::current->{desc} = "map prefetcher";
2142
1994 while (%MAP_PREFETCH) { 2143 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 2144 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 2145 if (my $map = find $k) {
1997 $map->load; 2146 $map->load if $v;
1998 } 2147 }
1999 2148
2000 delete $MAP_PREFETCH{$path}; 2149 delete $MAP_PREFETCH{$k};
2001 } 2150 }
2002 } 2151 }
2003 undef $MAP_PREFETCHER; 2152 undef $MAP_PREFETCHER;
2004 }; 2153 };
2005 $MAP_PREFETCHER->prio (6); 2154 $MAP_PREFETCHER->prio (6);
2008} 2157}
2009 2158
2010sub save { 2159sub save {
2011 my ($self) = @_; 2160 my ($self) = @_;
2012 2161
2013 my $lock = cf::lock_acquire "map_data:" . $self->path; 2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
2014 2163
2015 $self->{last_save} = $cf::RUNTIME; 2164 $self->{last_save} = $cf::RUNTIME;
2016 2165
2017 return unless $self->dirty; 2166 return unless $self->dirty;
2018 2167
2024 return if $self->{deny_save}; 2173 return if $self->{deny_save};
2025 2174
2026 local $self->{last_access} = $self->last_access;#d# 2175 local $self->{last_access} = $self->last_access;#d#
2027 2176
2028 cf::async { 2177 cf::async {
2178 $Coro::current->{desc} = "map player save";
2029 $_->contr->save for $self->players; 2179 $_->contr->save for $self->players;
2030 }; 2180 };
2181
2182 cf::get_slot 0.02;
2031 2183
2032 if ($uniq) { 2184 if ($uniq) {
2033 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2034 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2186 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2035 } else { 2187 } else {
2041 my ($self) = @_; 2193 my ($self) = @_;
2042 2194
2043 # save first because save cedes 2195 # save first because save cedes
2044 $self->save; 2196 $self->save;
2045 2197
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2198 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2199
2048 return if $self->players; 2200 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY; 2201 return if $self->in_memory != cf::MAP_ACTIVE;
2050 return if $self->{deny_save}; 2202 return if $self->{deny_save};
2051 2203
2204 $self->in_memory (cf::MAP_SWAPPED);
2205
2206 $self->deactivate;
2207 $_->clear_links_to ($self) for values %cf::MAP;
2052 $self->clear; 2208 $self->clear;
2053 $self->in_memory (cf::MAP_SWAPPED);
2054} 2209}
2055 2210
2056sub reset_at { 2211sub reset_at {
2057 my ($self) = @_; 2212 my ($self) = @_;
2058 2213
2090 if $uniq; 2245 if $uniq;
2091 } 2246 }
2092 2247
2093 delete $cf::MAP{$self->path}; 2248 delete $cf::MAP{$self->path};
2094 2249
2250 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP;
2095 $self->clear; 2252 $self->clear;
2096
2097 $_->clear_links_to ($self) for values %cf::MAP;
2098 2253
2099 $self->unlink_save; 2254 $self->unlink_save;
2100 $self->destroy; 2255 $self->destroy;
2101} 2256}
2102 2257
2103my $nuke_counter = "aaaa"; 2258my $nuke_counter = "aaaa";
2104 2259
2105sub nuke { 2260sub nuke {
2106 my ($self) = @_; 2261 my ($self) = @_;
2107 2262
2263 {
2264 my $lock = cf::lock_acquire "map_data:$self->{path}";
2265
2108 delete $cf::MAP{$self->path}; 2266 delete $cf::MAP{$self->path};
2109 2267
2110 $self->unlink_save; 2268 $self->unlink_save;
2111 2269
2112 bless $self, "cf::map"; 2270 bless $self, "cf::map";
2113 delete $self->{deny_reset}; 2271 delete $self->{deny_reset};
2114 $self->{deny_save} = 1; 2272 $self->{deny_save} = 1;
2115 $self->reset_timeout (1); 2273 $self->reset_timeout (1);
2116 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2274 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117 2275
2118 $cf::MAP{$self->path} = $self; 2276 $cf::MAP{$self->path} = $self;
2277 }
2119 2278
2120 $self->reset; # polite request, might not happen 2279 $self->reset; # polite request, might not happen
2121} 2280}
2122 2281
2123=item $maps = cf::map::tmp_maps 2282=item $maps = cf::map::tmp_maps
2165 2324
2166sub unique_maps() { 2325sub unique_maps() {
2167 [ 2326 [
2168 map { 2327 map {
2169 utf8::decode $_; 2328 utf8::decode $_;
2170 /\.map$/ 2329 s/\.map$//; # TODO future compatibility hack
2330 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2331 ? ()
2171 ? normalise $_ 2332 : normalise $_
2172 : ()
2173 } @{ aio_readdir $UNIQUEDIR or [] } 2333 } @{ aio_readdir $UNIQUEDIR or [] }
2174 ] 2334 ]
2175} 2335}
2176 2336
2177package cf;
2178
2179=back 2337=back
2180 2338
2181=head3 cf::object 2339=head3 cf::object
2182 2340
2183=cut 2341=cut
2186 2344
2187=over 4 2345=over 4
2188 2346
2189=item $ob->inv_recursive 2347=item $ob->inv_recursive
2190 2348
2191Returns 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.
2192 2351
2193=cut 2352=cut
2194 2353
2195sub inv_recursive_; 2354sub inv_recursive_;
2196sub inv_recursive_ { 2355sub inv_recursive_ {
2199 2358
2200sub inv_recursive { 2359sub inv_recursive {
2201 inv_recursive_ inv $_[0] 2360 inv_recursive_ inv $_[0]
2202} 2361}
2203 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
2204package cf; 2391package cf;
2205 2392
2206=back 2393=back
2207 2394
2208=head3 cf::object::player 2395=head3 cf::object::player
2214Sends 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>
2215can 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
2216dialogue with the given NPC character. 2403dialogue with the given NPC character.
2217 2404
2218=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};
2219 2420
2220# rough implementation of a future "reply" method that works 2421# rough implementation of a future "reply" method that works
2221# with dialog boxes. 2422# with dialog boxes.
2222#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
2223sub cf::object::player::reply($$$;$) { 2424sub cf::object::player::reply($$$;$) {
2235 my $dialog = $pl->{npc_dialog}; 2436 my $dialog = $pl->{npc_dialog};
2236 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2437 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2237 2438
2238 } else { 2439 } else {
2239 $msg = $npc->name . " says: $msg" if $npc; 2440 $msg = $npc->name . " says: $msg" if $npc;
2240 $self->message ($msg, $flags); 2441 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2241 } 2442 }
2242 } 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 (@_);
2243} 2454}
2244 2455
2245=item $player_object->may ("access") 2456=item $player_object->may ("access")
2246 2457
2247Returns wether the given player is authorized to access resource "access" 2458Returns wether the given player is authorized to access resource "access"
2260 2471
2261=item $player_object->enter_link 2472=item $player_object->enter_link
2262 2473
2263Freezes 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}>).
2264 2475
2265The 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.
2266I<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.
2267 2480
2268Will never block. 2481Will never block.
2269 2482
2270=item $player_object->leave_link ($map, $x, $y) 2483=item $player_object->leave_link ($map, $x, $y)
2271 2484
2326 # use -1 or undef as default coordinates, not 0, 0 2539 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2540 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2541 if $x <=0 && $y <= 0;
2329 2542
2330 $map->load; 2543 $map->load;
2331 $map->load_diag; 2544 $map->load_neighbours;
2332 2545
2333 return unless $self->contr->active; 2546 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2334 $self->activate_recursive; 2548 $self->activate_recursive;
2335 2549
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2337 $self->enter_map ($map, $x, $y); 2551 $self->enter_map ($map, $x, $y);
2338} 2552}
2343her, loading and preparing them map, calling the provided $check callback 2557her, loading and preparing them map, calling the provided $check callback
2344that 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
2345the 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
2346be called at the end of this process. 2560be called at the end of this process.
2347 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
2348=cut 2565=cut
2349 2566
2350our $GOTOGEN; 2567our $GOTOGEN;
2351 2568
2352sub cf::object::player::goto { 2569sub cf::object::player::goto {
2356 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2573 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2357 2574
2358 $self->enter_link; 2575 $self->enter_link;
2359 2576
2360 (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
2361 my $map = eval { 2599 my $map = eval {
2362 my $map = cf::map::find $path; 2600 my $map = defined $path ? cf::map::find $path : undef;
2363 2601
2364 if ($map) { 2602 if ($map) {
2365 $map = $map->customise_for ($self); 2603 $map = $map->customise_for ($self);
2366 $map = $check->($map) if $check && $map; 2604 $map = $check->($map) if $check && $map;
2367 } else { 2605 } else {
2368 $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);
2369 } 2607 }
2370 2608
2371 $map 2609 $map
2372 }; 2610 };
2373 2611
2409} 2647}
2410 2648
2411sub prepare_random_map { 2649sub prepare_random_map {
2412 my ($exit) = @_; 2650 my ($exit) = @_;
2413 2651
2414 my $guard = cf::lock_acquire "exit_prepare:$exit";
2415
2416 # all this does is basically replace the /! path by 2652 # all this does is basically replace the /! path by
2417 # a new random map path (?random/...) with a seed 2653 # a new random map path (?random/...) with a seed
2418 # that depends on the exit object 2654 # that depends on the exit object
2419 2655
2420 my $rmp = parse_random_map_params $exit->msg; 2656 my $rmp = parse_random_map_params $exit->msg;
2422 if ($exit->map) { 2658 if ($exit->map) {
2423 $rmp->{region} = $exit->region->name; 2659 $rmp->{region} = $exit->region->name;
2424 $rmp->{origin_map} = $exit->map->path; 2660 $rmp->{origin_map} = $exit->map->path;
2425 $rmp->{origin_x} = $exit->x; 2661 $rmp->{origin_x} = $exit->x;
2426 $rmp->{origin_y} = $exit->y; 2662 $rmp->{origin_y} = $exit->y;
2663
2664 $exit->map->touch;
2427 } 2665 }
2428 2666
2429 $rmp->{random_seed} ||= $exit->random_seed; 2667 $rmp->{random_seed} ||= $exit->random_seed;
2430 2668
2431 my $data = cf::to_json $rmp; 2669 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2432 my $md5 = Digest::MD5::md5_hex $data; 2670 my $md5 = Digest::MD5::md5_hex $data;
2433 my $meta = "$RANDOMDIR/$md5.meta"; 2671 my $meta = "$RANDOMDIR/$md5.meta";
2434 2672
2435 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2673 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2436 aio_write $fh, 0, (length $data), $data, 0; 2674 aio_write $fh, 0, (length $data), $data, 0;
2437 undef $fh; 2675 undef $fh;
2438 aio_rename "$meta~", $meta; 2676 aio_rename "$meta~", $meta;
2439 2677
2678 my $slaying = "?random/$md5";
2679
2680 if ($exit->valid) {
2440 $exit->slaying ("?random/$md5"); 2681 $exit->slaying ("?random/$md5");
2441 $exit->msg (undef); 2682 $exit->msg (undef);
2683 }
2442 } 2684 }
2443} 2685}
2444 2686
2445sub cf::object::player::enter_exit { 2687sub cf::object::player::enter_exit {
2446 my ($self, $exit) = @_; 2688 my ($self, $exit) = @_;
2447 2689
2448 return unless $self->type == cf::PLAYER; 2690 return unless $self->type == cf::PLAYER;
2449 2691
2450 if ($exit->slaying eq "/!") {
2451 #TODO: this should de-fi-ni-te-ly not be a sync-job
2452 # the problem is that $exit might not survive long enough
2453 # so it needs to be done right now, right here
2454 cf::sync_job { prepare_random_map $exit };
2455 }
2456
2457 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2458 my $hp = $exit->stats->hp;
2459 my $sp = $exit->stats->sp;
2460
2461 $self->enter_link; 2692 $self->enter_link;
2462 2693
2463 # if exit is damned, update players death & WoR home-position
2464 $self->contr->savebed ($slaying, $hp, $sp)
2465 if $exit->flag (FLAG_DAMNED);
2466
2467 (async { 2694 (async {
2468 $self->deactivate_recursive; # just to be sure 2695 $Coro::current->{desc} = "enter_exit";
2696
2469 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
2470 $self->goto ($slaying, $hp, $sp); 2712 $self->goto ($map, $x, $y);
2471 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
2472 1; 2718 1
2473 }) { 2719 }) {
2474 $self->message ("Something went wrong deep within the crossfire server. " 2720 $self->message ("Something went wrong deep within the deliantra server. "
2475 . "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. "
2476 . "Please report this to the dungeon master!", 2722 . "Please report this to the dungeon master!",
2477 cf::NDI_UNIQUE | cf::NDI_RED); 2723 cf::NDI_UNIQUE | cf::NDI_RED);
2478 2724
2479 warn "ERROR in enter_exit: $@"; 2725 warn "ERROR in enter_exit: $@";
2507the 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
2508the message unless the client supports the msg packet. 2754the message unless the client supports the msg packet.
2509 2755
2510=cut 2756=cut
2511 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
2512sub cf::client::send_msg { 2822sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2823 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2824
2515 $msg = $self->pl->expand_cfpod ($msg); 2825 $msg = $self->pl->expand_cfpod ($msg)
2826 unless $color & cf::NDI_VERBATIM;
2516 2827
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 2828 $color &= cf::NDI_CLIENT_MASK; # just in case...
2518 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
2519 if (ref $channel) { 2839 } elsif (ref $channel) {
2520 # send meta info to client, if not yet sent 2840 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2841 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2842 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => $channel); 2843 $self->ext_msg (channel_info => $channel)
2844 if $self->can_msg;
2524 } 2845 }
2525 2846
2526 $channel = $channel->{id}; 2847 $channel = $channel->{id};
2527 } 2848 }
2528 2849
2529 return unless @extra || length $msg; 2850 return unless @extra || length $msg;
2530 2851
2531 if ($self->can_msg) { 2852 if ($self->can_msg) {
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $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);
2533 } else { 2873 } else {
2534 # replace some tags by gcfclient-compatible ones
2535 for ($msg) {
2536 1 while
2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542 }
2543
2544 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
2545 if (0 && $msg =~ /\[/) { 2889 if (0 && $msg =~ /\[/) {
2890 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2891 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else { 2892 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2893 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg") 2894 $self->send_packet ("drawinfo $color $msg")
2550 } 2895 }
2551 } 2896 }
2559=cut 2904=cut
2560 2905
2561sub cf::client::ext_msg($$@) { 2906sub cf::client::ext_msg($$@) {
2562 my ($self, $type, @msg) = @_; 2907 my ($self, $type, @msg) = @_;
2563 2908
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) { 2909 if ($self->extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2910 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove 2911 } elsif ($self->extcmd == 1) { # TODO: remove
2569 push @msg, msgtype => "event_$type"; 2912 push @msg, msgtype => "event_$type";
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;
2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 } 2932 }
2572} 2933}
2573 2934
2574=item $success = $client->query ($flags, "text", \&cb) 2935=item $success = $client->query ($flags, "text", \&cb)
2636 my ($type, $reply, @payload) = 2997 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg 2998 "ARRAY" eq ref $msg
2638 ? @$msg 2999 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3000 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640 3001
3002 my @reply;
3003
2641 if (my $cb = $EXTICMD{$type}) { 3004 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload); 3005 @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 } 3006 }
3007
3008 $ns->ext_reply ($reply, @reply)
3009 if $reply;
3010
2647 } else { 3011 } else {
2648 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";
2649 } 3013 }
2650 3014
2651 cf::override; 3015 cf::override;
2698our $safe = new Safe "safe"; 3062our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 3063our $safe_hole = new Safe::Hole;
2700 3064
2701$SIG{FPE} = 'IGNORE'; 3065$SIG{FPE} = 'IGNORE';
2702 3066
2703$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));
2704 3072
2705# here we export the classes and methods available to script code 3073# here we export the classes and methods available to script code
2706 3074
2707=pod 3075=pod
2708 3076
2709The following functions and methods are available within a safe environment: 3077The following functions and methods are available within a safe environment:
2710 3078
2711 cf::object 3079 cf::object
2712 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
2713 insert remove 3081 insert remove name archname title slaying race decrease split
2714 3082
2715 cf::object::player 3083 cf::object::player
2716 player 3084 player
2717 3085
2718 cf::player 3086 cf::player
2723 3091
2724=cut 3092=cut
2725 3093
2726for ( 3094for (
2727 ["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
2728 insert remove)], 3096 insert remove inv nrof name archname title slaying race
3097 decrease split destroy change_exp)],
2729 ["cf::object::player" => qw(player)], 3098 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 3099 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 3100 ["cf::map" => qw(trigger)],
2732) { 3101) {
2733 no strict 'refs'; 3102 no strict 'refs';
2809# the server's init and main functions 3178# the server's init and main functions
2810 3179
2811sub load_facedata($) { 3180sub load_facedata($) {
2812 my ($path) = @_; 3181 my ($path) = @_;
2813 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
2814 warn "loading facedata from $path\n"; 3189 warn "loading facedata from $path\n";
2815 3190
2816 my $facedata; 3191 my $facedata;
2817 0 < aio_load $path, $facedata 3192 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 3193 or die "$path: $!";
2820 $facedata = Coro::Storable::thaw $facedata; 3195 $facedata = Coro::Storable::thaw $facedata;
2821 3196
2822 $facedata->{version} == 2 3197 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3198 or cf::cleanup "$path: version mismatch, cannot proceed.";
2824 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
2825 { 3207 {
2826 my $faces = $facedata->{faceinfo}; 3208 my $faces = $facedata->{faceinfo};
2827 3209
2828 while (my ($face, $info) = each %$faces) { 3210 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3211 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212
2830 cf::face::set_visibility $idx, $info->{visibility}; 3213 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3214 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3217
2835 cf::cede_to_tick; 3218 cf::cede_to_tick;
2836 } 3219 }
2837 3220
2838 while (my ($face, $info) = each %$faces) { 3221 while (my ($face, $info) = each %$faces) {
2839 next unless $info->{smooth}; 3222 next unless $info->{smooth};
3223
2840 my $idx = cf::face::find $face 3224 my $idx = cf::face::find $face
2841 or next; 3225 or next;
3226
2842 if (my $smooth = cf::face::find $info->{smooth}) { 3227 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth; 3228 cf::face::set_smooth $idx, $smooth;
2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2845 } else { 3230 } else {
2846 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3231 warn "smooth face '$info->{smooth}' not found for face '$face'";
2863 3248
2864 { 3249 {
2865 # TODO: for gcfclient pleasure, we should give resources 3250 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3251 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3252 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869
2870 my $soundconf = delete $res->{"res/sound.conf"};
2871 3253
2872 while (my ($name, $info) = each %$res) { 3254 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({ 3255 if (defined $info->{type}) {
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3256 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
2879 3258
2880 if ($info->{type} & 1) { 3259 if ($info->{type} & 1) {
2881 # prepend meta info 3260 # prepend meta info
2882 3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3267 $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3268 } else {
3269 $data = $info->{data};
3270 }
2885 3271
2886 cf::face::set_data $idx, 0, $data, $chk; 3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type};
2887 } else { 3274 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3275 $RESOURCE{$name} = $info;
2889 } 3276 }
2890 3277
2891 cf::face::set_type $idx, $info->{type};
2892
2893 cf::cede_to_tick; 3278 cf::cede_to_tick;
2894 } 3279 }
2895
2896 if ($soundconf) {
2897 $soundconf = $enc->decode (delete $soundconf->{data});
2898
2899 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900 my $sound = $soundconf->{compat}[$_]
2901 or next;
2902
2903 my $face = cf::face::find "sound/$sound->[1]";
2904 warn "$sound->[0]: $face\n";#d#
2905
2906 cf::sound::set $sound->[0] => $face;
2907 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2908 }
2909
2910 #TODO
2911 }
2912 } 3280 }
3281
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2913 3283
2914 1 3284 1
2915} 3285}
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});
2916 3306
2917register_exticmd fx_want => sub { 3307register_exticmd fx_want => sub {
2918 my ($ns, $want) = @_; 3308 my ($ns, $want) = @_;
2919 3309
2920 while (my ($k, $v) = each %$want) { 3310 while (my ($k, $v) = each %$want) {
2921 $ns->fx_want ($k, $v); 3311 $ns->fx_want ($k, $v);
2922 } 3312 }
2923}; 3313};
2924 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
2925sub 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
2926 load_resource_file "$MAPDIR/regions" 3330 load_resource_file "$MAPDIR/regions"
2927 or die "unable to load regions file\n"; 3331 or die "unable to load regions file\n";
2928 3332
2929 for (cf::region::list) { 3333 for (cf::region::list) {
2930 $_->{match} = qr/$_->{match}/ 3334 $_->{match} = qr/$_->{match}/
2938} 3342}
2939 3343
2940sub reload_archetypes { 3344sub reload_archetypes {
2941 load_resource_file "$DATADIR/archetypes" 3345 load_resource_file "$DATADIR/archetypes"
2942 or die "unable to load archetypes\n"; 3346 or die "unable to load archetypes\n";
2943 #d# NEED to laod twice to resolve forward references
2944 # this really needs to be done in an extra post-pass
2945 # (which needs to be synchronous, so solve it differently)
2946 load_resource_file "$DATADIR/archetypes"
2947 or die "unable to load archetypes\n";
2948} 3347}
2949 3348
2950sub reload_treasures { 3349sub reload_treasures {
2951 load_resource_file "$DATADIR/treasures" 3350 load_resource_file "$DATADIR/treasures"
2952 or die "unable to load treasurelists\n"; 3351 or die "unable to load treasurelists\n";
2953} 3352}
2954 3353
2955sub reload_resources { 3354sub reload_resources {
2956 warn "reloading resource files...\n"; 3355 warn "reloading resource files...\n";
2957 3356
3357 reload_facedata;
3358 reload_archetypes;
2958 reload_regions; 3359 reload_regions;
2959 reload_facedata;
2960 #reload_archetypes;#d#
2961 reload_archetypes;
2962 reload_treasures; 3360 reload_treasures;
2963 3361
2964 warn "finished reloading resource files\n"; 3362 warn "finished reloading resource files\n";
2965} 3363}
2966 3364
2967sub init { 3365sub reload_config {
2968 reload_resources;
2969}
2970
2971sub cfg_load {
2972 open my $fh, "<:utf8", "$CONFDIR/config" 3366 open my $fh, "<:utf8", "$CONFDIR/config"
2973 or return; 3367 or return;
2974 3368
2975 local $/; 3369 local $/;
2976 *CFG = YAML::Syck::Load <$fh>; 3370 *CFG = YAML::Load <$fh>;
2977 3371
2978 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2979 3373
2980 $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};
2981 $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};
2987 }; 3381 };
2988 warn $@ if $@; 3382 warn $@ if $@;
2989 } 3383 }
2990} 3384}
2991 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
2992sub 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
2993 # we must not ever block the main coroutine 3421 # we must not ever block the main coroutine
2994 local $Coro::idle = sub { 3422 local $Coro::idle = sub {
2995 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#
2996 (async { 3424 (async {
2997 Event::one_event; 3425 $Coro::current->{desc} = "IDLE BUG HANDLER";
3426 EV::loop EV::LOOP_ONESHOT;
2998 })->prio (Coro::PRIO_MAX); 3427 })->prio (Coro::PRIO_MAX);
2999 }; 3428 };
3000 3429
3001 cfg_load; 3430 evthread_start IO::AIO::poll_fileno;
3431
3432 cf::sync_job {
3433 reload_resources;
3434 reload_config;
3002 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
3003 load_extensions; 3448 load_extensions;
3004 3449
3005 $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
3006 Event::loop; 3458 EV::loop;
3007} 3459}
3008 3460
3009############################################################################# 3461#############################################################################
3010# initialisation and cleanup 3462# initialisation and cleanup
3011 3463
3012# install some emergency cleanup handlers 3464# install some emergency cleanup handlers
3013BEGIN { 3465BEGIN {
3466 our %SIGWATCHER = ();
3014 for my $signal (qw(INT HUP TERM)) { 3467 for my $signal (qw(INT HUP TERM)) {
3015 Event->signal ( 3468 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3016 reentrant => 0,
3017 data => WF_AUTOCANCEL,
3018 signal => $signal,
3019 prio => 0,
3020 cb => sub {
3021 cf::cleanup "SIG$signal"; 3469 cf::cleanup "SIG$signal";
3022 },
3023 ); 3470 };
3024 } 3471 }
3025} 3472}
3026 3473
3027sub write_runtime { 3474sub write_runtime_sync {
3028 my $runtime = "$LOCALDIR/runtime";
3029
3030 # first touch the runtime file to show we are still running: 3475 # first touch the runtime file to show we are still running:
3031 # the fsync below can take a very very long time. 3476 # the fsync below can take a very very long time.
3032 3477
3033 IO::AIO::aio_utime $runtime, undef, undef; 3478 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3034 3479
3035 my $guard = cf::lock_acquire "write_runtime"; 3480 my $guard = cf::lock_acquire "write_runtime";
3036 3481
3037 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3482 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3038 or return; 3483 or return;
3039 3484
3040 my $value = $cf::RUNTIME + 90 + 10; 3485 my $value = $cf::RUNTIME + 90 + 10;
3041 # 10 is the runtime save interval, for a monotonic clock 3486 # 10 is the runtime save interval, for a monotonic clock
3042 # 60 allows for the watchdog to kill the server. 3487 # 60 allows for the watchdog to kill the server.
3052 aio_utime $fh, undef, undef; 3497 aio_utime $fh, undef, undef;
3053 3498
3054 close $fh 3499 close $fh
3055 or return; 3500 or return;
3056 3501
3057 aio_rename "$runtime~", $runtime 3502 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3058 and return; 3503 and return;
3059 3504
3060 warn "runtime file written.\n"; 3505 warn "runtime file written.\n";
3061 3506
3062 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 };
3063} 3558}
3064 3559
3065sub emergency_save() { 3560sub emergency_save() {
3066 my $freeze_guard = cf::freeze_mainloop; 3561 my $freeze_guard = cf::freeze_mainloop;
3067 3562
3073 # and maps saved/destroyed asynchronously. 3568 # and maps saved/destroyed asynchronously.
3074 warn "begin emergency player save\n"; 3569 warn "begin emergency player save\n";
3075 for my $login (keys %cf::PLAYER) { 3570 for my $login (keys %cf::PLAYER) {
3076 my $pl = $cf::PLAYER{$login} or next; 3571 my $pl = $cf::PLAYER{$login} or next;
3077 $pl->valid or next; 3572 $pl->valid or next;
3573 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3078 $pl->save; 3574 $pl->save;
3079 } 3575 }
3080 warn "end emergency player save\n"; 3576 warn "end emergency player save\n";
3081 3577
3082 warn "begin emergency map save\n"; 3578 warn "begin emergency map save\n";
3088 warn "end emergency map save\n"; 3584 warn "end emergency map save\n";
3089 3585
3090 warn "begin emergency database checkpoint\n"; 3586 warn "begin emergency database checkpoint\n";
3091 BDB::db_env_txn_checkpoint $DB_ENV; 3587 BDB::db_env_txn_checkpoint $DB_ENV;
3092 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";
3093 }; 3593 };
3094 3594
3095 warn "leave emergency perl save\n"; 3595 warn "leave emergency perl save\n";
3096} 3596}
3097 3597
3098sub post_cleanup { 3598sub post_cleanup {
3099 my ($make_core) = @_; 3599 my ($make_core) = @_;
3100 3600
3101 warn Carp::longmess "post_cleanup backtrace" 3601 warn Carp::longmess "post_cleanup backtrace"
3102 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#
3103} 3632}
3104 3633
3105sub do_reload_perl() { 3634sub do_reload_perl() {
3106 # can/must only be called in main 3635 # can/must only be called in main
3107 if ($Coro::current != $Coro::main) { 3636 if ($Coro::current != $Coro::main) {
3108 warn "can only reload from main coroutine"; 3637 warn "can only reload from main coroutine";
3109 return; 3638 return;
3110 } 3639 }
3111 3640
3641 return if $RELOAD++;
3642
3643 while ($RELOAD) {
3112 warn "reloading..."; 3644 warn "reloading...";
3113 3645
3114 warn "entering sync_job"; 3646 warn "entering sync_job";
3115 3647
3116 cf::sync_job { 3648 cf::sync_job {
3117 cf::write_runtime; # external watchdog should not bark 3649 cf::write_runtime_sync; # external watchdog should not bark
3118 cf::emergency_save; 3650 cf::emergency_save;
3119 cf::write_runtime; # external watchdog should not bark 3651 cf::write_runtime_sync; # external watchdog should not bark
3120 3652
3121 warn "syncing database to disk"; 3653 warn "syncing database to disk";
3122 BDB::db_env_txn_checkpoint $DB_ENV; 3654 BDB::db_env_txn_checkpoint $DB_ENV;
3123 3655
3124 # 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
3125 3657
3126 warn "cancelling all WF_AUTOCANCEL watchers";
3127 for (Event::all_watchers) {
3128 $_->cancel if $_->data & WF_AUTOCANCEL;
3129 }
3130
3131 warn "flushing outstanding aio requests"; 3658 warn "flushing outstanding aio requests";
3132 for (;;) {
3133 BDB::flush;
3134 IO::AIO::flush;
3135 Coro::cede;
3136 last unless IO::AIO::nreqs || BDB::nreqs; 3659 while (IO::AIO::nreqs || BDB::nreqs) {
3137 warn "iterate..."; 3660 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3138 }
3139
3140 ++$RELOAD;
3141
3142 warn "cancelling all extension coros";
3143 $_->cancel for values %EXT_CORO;
3144 %EXT_CORO = ();
3145
3146 warn "removing commands";
3147 %COMMAND = ();
3148
3149 warn "removing ext/exti commands";
3150 %EXTCMD = ();
3151 %EXTICMD = ();
3152
3153 warn "unloading/nuking all extensions";
3154 for my $pkg (@EXTS) {
3155 warn "... unloading $pkg";
3156
3157 if (my $cb = $pkg->can ("unload")) {
3158 eval {
3159 $cb->($pkg);
3160 1
3161 } or warn "$pkg unloaded, but with errors: $@";
3162 } 3661 }
3163 3662
3164 warn "... nuking $pkg"; 3663 warn "cancelling all extension coros";
3165 Symbol::delete_package $pkg; 3664 $_->cancel for values %EXT_CORO;
3166 } 3665 %EXT_CORO = ();
3167 3666
3168 warn "unloading all perl modules loaded from $LIBDIR"; 3667 warn "removing commands";
3169 while (my ($k, $v) = each %INC) { 3668 %COMMAND = ();
3170 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3171 3669
3670 warn "removing ext/exti commands";
3671 %EXTCMD = ();
3672 %EXTICMD = ();
3673
3674 warn "unloading/nuking all extensions";
3675 for my $pkg (@EXTS) {
3172 warn "... unloading $k"; 3676 warn "... unloading $pkg";
3173 delete $INC{$k};
3174 3677
3175 $k =~ s/\.pm$//;
3176 $k =~ s/\//::/g;
3177
3178 if (my $cb = $k->can ("unload_module")) { 3678 if (my $cb = $pkg->can ("unload")) {
3679 eval {
3179 $cb->(); 3680 $cb->($pkg);
3681 1
3682 } or warn "$pkg unloaded, but with errors: $@";
3683 }
3684
3685 warn "... clearing $pkg";
3686 clear_package $pkg;
3180 } 3687 }
3181 3688
3182 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;
3183 } 3704 }
3184 3705
3185 warn "getting rid of safe::, as good as possible"; 3706 warn "getting rid of safe::, as good as possible";
3186 Symbol::delete_package "safe::$_" 3707 clear_package "safe::$_"
3187 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);
3188 3709
3189 warn "unloading cf.pm \"a bit\""; 3710 warn "unloading cf.pm \"a bit\"";
3190 delete $INC{"cf.pm"}; 3711 delete $INC{"cf.pm"};
3191 delete $INC{"cf/pod.pm"}; 3712 delete $INC{"cf/pod.pm"};
3192 3713
3193 # don't, removes xs symbols, too, 3714 # don't, removes xs symbols, too,
3194 # and global variables created in xs 3715 # and global variables created in xs
3195 #Symbol::delete_package __PACKAGE__; 3716 #clear_package __PACKAGE__;
3196 3717
3197 warn "unload completed, starting to reload now"; 3718 warn "unload completed, starting to reload now";
3198 3719
3199 warn "reloading cf.pm"; 3720 warn "reloading cf.pm";
3200 require cf; 3721 require cf;
3201 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3202 3723
3203 warn "loading config and database again"; 3724 warn "loading config and database again";
3204 cf::cfg_load; 3725 cf::reload_config;
3205 3726
3206 warn "loading extensions"; 3727 warn "loading extensions";
3207 cf::load_extensions; 3728 cf::load_extensions;
3208 3729
3209 warn "reattaching attachments to objects/players"; 3730 warn "reattaching attachments to objects/players";
3210 _global_reattach; # objects, sockets 3731 _global_reattach; # objects, sockets
3211 warn "reattaching attachments to maps"; 3732 warn "reattaching attachments to maps";
3212 reattach $_ for values %MAP; 3733 reattach $_ for values %MAP;
3213 warn "reattaching attachments to players"; 3734 warn "reattaching attachments to players";
3214 reattach $_ for values %PLAYER; 3735 reattach $_ for values %PLAYER;
3215 3736
3737 warn "running post_load";
3738 (pop @POST_INIT)->(1) while @POST_INIT;
3739
3216 warn "leaving sync_job"; 3740 warn "leaving sync_job";
3217 3741
3218 1 3742 1
3219 } or do { 3743 } or do {
3220 warn $@; 3744 warn $@;
3221 warn "error while reloading, exiting."; 3745 cf::cleanup "error while reloading, exiting.";
3222 exit 1;
3223 }; 3746 };
3224 3747
3225 warn "reloaded"; 3748 warn "reloaded";
3749 --$RELOAD;
3750 }
3226}; 3751};
3227 3752
3228our $RELOAD_WATCHER; # used only during reload 3753our $RELOAD_WATCHER; # used only during reload
3229 3754
3230sub reload_perl() { 3755sub reload_perl() {
3231 # doing reload synchronously and two reloads happen back-to-back, 3756 # doing reload synchronously and two reloads happen back-to-back,
3232 # coro crashes during coro_state_free->destroy here. 3757 # coro crashes during coro_state_free->destroy here.
3233 3758
3234 $RELOAD_WATCHER ||= Event->timer ( 3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3235 reentrant => 0,
3236 after => 0,
3237 data => WF_AUTOCANCEL,
3238 cb => sub {
3239 do_reload_perl; 3760 do_reload_perl;
3240 undef $RELOAD_WATCHER; 3761 undef $RELOAD_WATCHER;
3241 },
3242 ); 3762 };
3243} 3763}
3244 3764
3245register_command "reload" => sub { 3765register_command "reload" => sub {
3246 my ($who, $arg) = @_; 3766 my ($who, $arg) = @_;
3247 3767
3248 if ($who->flag (FLAG_WIZ)) { 3768 if ($who->flag (FLAG_WIZ)) {
3249 $who->message ("reloading server."); 3769 $who->message ("reloading server.");
3770 async {
3771 $Coro::current->{desc} = "perl_reload";
3250 async { reload_perl }; 3772 reload_perl;
3773 };
3251 } 3774 }
3252}; 3775};
3253 3776
3254unshift @INC, $LIBDIR; 3777unshift @INC, $LIBDIR;
3255 3778
3257 3780
3258our @WAIT_FOR_TICK; 3781our @WAIT_FOR_TICK;
3259our @WAIT_FOR_TICK_BEGIN; 3782our @WAIT_FOR_TICK_BEGIN;
3260 3783
3261sub wait_for_tick { 3784sub wait_for_tick {
3262 return unless $TICK_WATCHER->is_active;
3263 return if $Coro::current == $Coro::main; 3785 return if tick_inhibit || $Coro::current == $Coro::main;
3264 3786
3265 my $signal = new Coro::Signal; 3787 my $signal = new Coro::Signal;
3266 push @WAIT_FOR_TICK, $signal; 3788 push @WAIT_FOR_TICK, $signal;
3267 $signal->wait; 3789 $signal->wait;
3268} 3790}
3269 3791
3270sub wait_for_tick_begin { 3792sub wait_for_tick_begin {
3271 return unless $TICK_WATCHER->is_active;
3272 return if $Coro::current == $Coro::main; 3793 return if tick_inhibit || $Coro::current == $Coro::main;
3273 3794
3274 my $signal = new Coro::Signal; 3795 my $signal = new Coro::Signal;
3275 push @WAIT_FOR_TICK_BEGIN, $signal; 3796 push @WAIT_FOR_TICK_BEGIN, $signal;
3276 $signal->wait; 3797 $signal->wait;
3277} 3798}
3278 3799
3279 my $min = 1e6;#d# 3800sub tick {
3280 my $avg = 10;
3281$TICK_WATCHER = Event->timer (
3282 reentrant => 0,
3283 parked => 1,
3284 prio => 0,
3285 at => $NEXT_TICK || $TICK,
3286 data => WF_AUTOCANCEL,
3287 cb => sub {
3288 if ($Coro::current != $Coro::main) { 3801 if ($Coro::current != $Coro::main) {
3289 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"
3290 unless ++$bug_warning > 10; 3803 unless ++$bug_warning > 10;
3291 return; 3804 return;
3292 } 3805 }
3293 3806
3294 $NOW = $tick_start = Event::time;
3295
3296 cf::server_tick; # one server iteration 3807 cf::server_tick; # one server iteration
3297 3808
3298 0 && sync_job {#d# 3809 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3299 for(1..10) { 3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3300 my $t = Event::time; 3811 Coro::async_pool {
3301 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3812 $Coro::current->{desc} = "runtime saver";
3302 or die; 3813 write_runtime_sync
3303 3814 or warn "ERROR: unable to write runtime file: $!";
3304 $map->width (50);
3305 $map->height (50);
3306 $map->alloc;
3307 $map->_load_objects ("/tmp/x.map", 1);
3308 my $t = Event::time - $t;
3309
3310 #next unless $t < 0.0013;#d#
3311 if ($t < $min) {
3312 $min = $t;
3313 }
3314 $avg = $avg * 0.99 + $t * 0.01;
3315 }
3316 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3317 exit 0;
3318 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3319 }; 3815 };
3816 }
3320 3817
3321 $RUNTIME += $TICK;
3322 $NEXT_TICK += $TICK;
3323
3324 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3325 $NEXT_RUNTIME_WRITE = $NOW + 10;
3326 Coro::async_pool {
3327 write_runtime
3328 or warn "ERROR: unable to write runtime file: $!";
3329 };
3330 }
3331
3332# my $AFTER = Event::time;
3333# warn $AFTER - $NOW;#d#
3334
3335 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3336 $sig->send; 3819 $sig->send;
3337 } 3820 }
3338 while (my $sig = shift @WAIT_FOR_TICK) { 3821 while (my $sig = shift @WAIT_FOR_TICK) {
3339 $sig->send; 3822 $sig->send;
3340 } 3823 }
3341 3824
3342 $NOW = Event::time; 3825 $LOAD = ($NOW - $TICK_START) / $TICK;
3343
3344 # if we are delayed by four ticks or more, skip them all
3345 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3346
3347 $TICK_WATCHER->at ($NEXT_TICK);
3348 $TICK_WATCHER->start;
3349
3350 $LOAD = ($NOW - $tick_start) / $TICK;
3351 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3826 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3352 3827
3353 _post_tick; 3828 if (0) {
3354 3829 if ($NEXT_TICK) {
3355 3830 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d#
3833 }
3356 }, 3834 }
3357); 3835}
3358 3836
3359{ 3837{
3360 BDB::max_poll_time $TICK * 0.1; 3838 # configure BDB
3361 $BDB_POLL_WATCHER = Event->io ( 3839
3362 reentrant => 0,
3363 fd => BDB::poll_fileno,
3364 poll => 'r',
3365 prio => 0,
3366 data => WF_AUTOCANCEL,
3367 cb => \&BDB::poll_cb,
3368 );
3369 BDB::min_parallel 8; 3840 BDB::min_parallel 8;
3370 3841 BDB::max_poll_reqs $TICK * 0.1;
3371 BDB::set_sync_prepare { 3842 $AnyEvent::BDB::WATCHER->priority (1);
3372 my $status;
3373 my $current = $Coro::current;
3374 (
3375 sub {
3376 $status = $!;
3377 $current->ready; undef $current;
3378 },
3379 sub {
3380 Coro::schedule while defined $current;
3381 $! = $status;
3382 },
3383 )
3384 };
3385 3843
3386 unless ($DB_ENV) { 3844 unless ($DB_ENV) {
3387 $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);
3388 3851
3389 cf::sync_job { 3852 cf::sync_job {
3390 eval { 3853 eval {
3391 BDB::db_env_open 3854 BDB::db_env_open
3392 $DB_ENV, 3855 $DB_ENV,
3394 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
3395 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3858 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3396 0666; 3859 0666;
3397 3860
3398 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3861 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3399
3400 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3401 $DB_ENV->set_lk_detect;
3402 }; 3862 };
3403 3863
3404 cf::cleanup "db_env_open(db): $@" if $@; 3864 cf::cleanup "db_env_open(db): $@" if $@;
3405 }; 3865 };
3406 } 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 };
3407} 3877}
3408 3878
3409{ 3879{
3880 # configure IO::AIO
3881
3410 IO::AIO::min_parallel 8; 3882 IO::AIO::min_parallel 8;
3411
3412 undef $Coro::AIO::WATCHER;
3413 IO::AIO::max_poll_time $TICK * 0.1; 3883 IO::AIO::max_poll_time $TICK * 0.1;
3414 $AIO_POLL_WATCHER = Event->io ( 3884 undef $AnyEvent::AIO::WATCHER;
3415 reentrant => 0,
3416 data => WF_AUTOCANCEL,
3417 fd => IO::AIO::poll_fileno,
3418 poll => 'r',
3419 prio => 6,
3420 cb => \&IO::AIO::poll_cb,
3421 );
3422} 3885}
3423 3886
3424my $_log_backtrace; 3887my $_log_backtrace;
3425 3888
3426sub _log_backtrace { 3889sub _log_backtrace {
3429 $msg =~ s/\n//; 3892 $msg =~ s/\n//;
3430 3893
3431 # limit the # of concurrent backtraces 3894 # limit the # of concurrent backtraces
3432 if ($_log_backtrace < 2) { 3895 if ($_log_backtrace < 2) {
3433 ++$_log_backtrace; 3896 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg;
3434 async { 3898 async {
3899 $Coro::current->{desc} = "abt $msg";
3900
3435 my @bt = fork_call { 3901 my @bt = fork_call {
3436 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
3437 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3903 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3438 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 |"
3439 or die "addr2line: $!"; 3905 or die "addr2line: $!";
3447 } 3913 }
3448 3914
3449 @funcs 3915 @funcs
3450 }; 3916 };
3451 3917
3452 LOG llevInfo, "[ABT] $msg\n"; 3918 LOG llevInfo, "[ABT] $perl_bt\n";
3919 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3453 LOG llevInfo, "[ABT] $_\n" for @bt; 3920 LOG llevInfo, "[ABT] $_\n" for @bt;
3454 --$_log_backtrace; 3921 --$_log_backtrace;
3455 }; 3922 };
3456 } else { 3923 } else {
3457 LOG llevInfo, "[ABT] $msg\n"; 3924 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines