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.311 by root, Fri Jul 20 16:11:10 2007 UTC vs.
Revision 1.427 by root, Sat Apr 26 12:25:45 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
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.61 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
46use Coro::Util ();
24 47
25use JSON::XS 1.4 (); 48use JSON::XS 2.01 ();
26use BDB (); 49use BDB ();
27use Data::Dumper; 50use Data::Dumper;
28use Digest::MD5; 51use Digest::MD5;
29use Fcntl; 52use Fcntl;
30use YAML::Syck (); 53use YAML ();
31use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
32use Time::HiRes; 55use Time::HiRes;
33use Compress::LZF; 56use Compress::LZF;
34use Digest::MD5 (); 57use Digest::MD5 ();
35 58
36# configure various modules to our taste 59# configure various modules to our taste
37# 60#
38$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::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 64
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 66
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 68
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
74 93
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 97our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
82 99
83our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 104our $DB_ENV;
85 105
86our %CFG; 106our %CFG;
87 107
88our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 109our $RUNTIME;
110our $NOW;
90 111
91our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
94 115
95# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 118
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
101 123
102binmode STDOUT; 124binmode STDOUT;
103binmode STDERR; 125binmode STDERR;
104 126
105# read virtual server time, if available 127# read virtual server time, if available
158 180
159The raw value load value from the last tick. 181The raw value load value from the last tick.
160 182
161=item %cf::CFG 183=item %cf::CFG
162 184
163Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 186from wherever your confdir points to.
165 187
166=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
167 189
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
186 $msg .= "\n" 208 $msg .= "\n"
187 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
188 210
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 212
191 utf8::encode $msg;
192 LOG llevError, $msg; 213 LOG llevError, $msg;
193 }; 214 };
194} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
195 231
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
212)) { 248)) {
213 no strict 'refs'; 249 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 251}
216 252
217$Event::DIED = sub { 253$EV::DIED = sub {
218 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
219}; 255};
220 256
221############################################################################# 257#############################################################################
222 258
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 282 $d
247 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
248} 284}
249 285
250=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
251 287
252Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
253 289
254=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
255 291
256Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
257 293
258=cut 294=cut
259 295
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 297
262sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
264 300
265=item cf::lock_wait $string 301=item cf::lock_wait $string
266 302
267Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
268 304
271Wait until the given lock is available and then acquires it and returns 307Wait 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, 308a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
274returned. 310returned.
275 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
276Lock names should begin with a unique identifier (for example, cf::map::find 315Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
278 317
279=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
280 319
281Return true if the lock is currently active, i.e. somebody has locked it. 320Return true if the lock is currently active, i.e. somebody has locked it.
282 321
283=cut 322=cut
284 323
285our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
286 326
287sub lock_wait($) { 327sub lock_wait($) {
288 my ($key) = @_; 328 my ($key) = @_;
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
289 334
290 # wait for lock, if any 335 # wait for lock, if any
291 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 338 Coro::schedule;
299 344
300 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
301 lock_wait $key; 346 lock_wait $key;
302 347
303 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
304 350
305 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
308 } 355 }
309} 356}
310 357
313 360
314 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
315} 362}
316 363
317sub freeze_mainloop { 364sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
319 366
320 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
321 $TICK_WATCHER->start; 368}
369
370=item cf::periodic $interval, $cb
371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
383}
384
385=item cf::get_slot $time[, $priority[, $name]]
386
387Allocate $time seconds of blocking CPU time at priority C<$priority>:
388This call blocks and returns only when you have at least C<$time> seconds
389of cpu time till the next tick. The slot is only valid till the next cede.
390
391The optional C<$name> can be used to identify the job to run. It might be
392used for statistical purposes and should identify the same time-class.
393
394Useful for short background jobs.
395
396=cut
397
398our @SLOT_QUEUE;
399our $SLOT_QUEUE;
400
401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
405 my $signal = new Coro::Signal;
406
407 while () {
408 next_job:
409 my $avail = cf::till_tick;
410 if ($avail > 0.01) {
411 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) {
413 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send;
415 Coro::cede;
416 goto next_job;
417 }
418 }
419 }
420
421 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait;
425 } else {
426 Coro::schedule;
427 }
322 }; 428 }
323 $TICK_WATCHER->stop; 429};
324 $guard 430
431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
434 my ($time, $pri, $name) = @_;
435
436 $time = $TICK * .6 if $time > $TICK * .6;
437 my $sig = new Coro::Signal;
438
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready;
442 $sig->wait;
325} 443}
326 444
327=item cf::async { BLOCK } 445=item cf::async { BLOCK }
328 446
329Currently the same as Coro::async_pool, meaning you cannot use 447Currently the same as Coro::async_pool, meaning you cannot use
334 452
335BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
336 454
337=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
338 456
339The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
340is always able to handle events or runnable, as Crossfire TRT is only 458is always able to handle events or runnable, as Deliantra is only
341partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 459partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
342acceptable. 460acceptable.
343 461
344If it must be done, put the blocking parts into C<sync_job>. This will run 462If it must be done, put the blocking parts into C<sync_job>. This will run
345the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
350 468
351sub sync_job(&) { 469sub sync_job(&) {
352 my ($job) = @_; 470 my ($job) = @_;
353 471
354 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
355 my $time = Event::time; 473 my $time = EV::time;
356 474
357 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
358 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
359 477
360 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
361 # (but this is cancel-safe) 479
362 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
363 481
364 my $busy = 1; 482 my $busy = 1;
365 my @res; 483 my @res;
366 484
367 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
368 @res = eval { $job->() }; 487 @res = eval { $job->() };
369 warn $@ if $@; 488 warn $@ if $@;
370 undef $busy; 489 undef $busy;
371 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
372 491
373 while ($busy) { 492 while ($busy) {
374 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
375 } 497 }
498 }
376 499
377 $time = Event::time - $time; 500 my $time = EV::time - $time;
378 501
379 LOG llevError | logBacktrace, Carp::longmess "long sync job"
380 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
381
382 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
383 503
384 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
385 } else { 505 } else {
386 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
387 507
412=item fork_call { }, $args 532=item fork_call { }, $args
413 533
414Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
415process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
416Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
418 538
419=cut 539=cut
420
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429 540
430sub fork_call(&@) { 541sub fork_call(&@) {
431 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
432 543
433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 544 # we seemingly have to make a local copy of the whole thing,
434# or die "socketpair: $!"; 545 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 546 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 547
438 if (my $pid = fork) { 548 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 549 reset_signals;
452 local $SIG{__WARN__}; 550 &$cb
453 local $SIG{__DIE__}; 551 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 552
460 eval { 553 wantarray ? @res : $res[-1]
461 close $fh1; 554}
462 555
463 my @res = eval { $cb->(@args) }; 556=item $coin = coin_from_name $name
464 557
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 558=cut
466 close $fh2;
467 };
468 559
469 warn $@ if $@; 560our %coin_alias = (
470 _exit 0; 561 "silver" => "silvercoin",
471 } 562 "silvercoin" => "silvercoin",
563 "silvercoins" => "silvercoin",
564 "gold" => "goldcoin",
565 "goldcoin" => "goldcoin",
566 "goldcoins" => "goldcoin",
567 "platinum" => "platinacoin",
568 "platinumcoin" => "platinacoin",
569 "platinumcoins" => "platinacoin",
570 "platina" => "platinacoin",
571 "platinacoin" => "platinacoin",
572 "platinacoins" => "platinacoin",
573 "royalty" => "royalty",
574 "royalties" => "royalty",
575);
576
577sub coin_from_name($) {
578 $coin_alias{$_[0]}
579 ? cf::arch::find $coin_alias{$_[0]}
580 : undef
472} 581}
473 582
474=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
475 584
476Returns a single value from the environment database. 585Returns a single value from the environment database.
478=item cf::db_put $family => $key => $value 587=item cf::db_put $family => $key => $value
479 588
480Stores the given C<$value> in the family. It can currently store binary 589Stores the given C<$value> in the family. It can currently store binary
481data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 590data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
482 591
592=item $db = cf::db_table "name"
593
594Create and/or open a new database table. The string must not be "db" and must be unique
595within each server.
596
483=cut 597=cut
598
599sub db_table($) {
600 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV;
602
603 eval {
604 $db->set_flags (BDB::CHKSUM);
605
606 utf8::encode $name;
607 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
608 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
609 cf::cleanup "db_open(db): $!" if $!;
610 };
611 cf::cleanup "db_open(db): $@" if $@;
612
613 $db
614}
484 615
485our $DB; 616our $DB;
486 617
487sub db_init { 618sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job { 619 cf::sync_job {
492 eval { 620 $DB ||= db_table "db";
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 } 621 };
502} 622}
503 623
504sub db_get($$) { 624sub db_get($$) {
505 my $key = "$_[0]/$_[1]"; 625 my $key = "$_[0]/$_[1]";
506 626
556 if (1) { 676 if (1) {
557 $md5 = 677 $md5 =
558 join "\x00", 678 join "\x00",
559 $processversion, 679 $processversion,
560 map { 680 map {
561 Coro::cede; 681 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 682 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 683 } 0.. $#$src;
564 684
565 685
566 my $dbmd5 = db_get cache => "$id/md5"; 686 my $dbmd5 = db_get cache => "$id/md5";
610attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
611to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
612 732
613In the following description, CLASS can be any of C<global>, C<object> 733In the following description, CLASS can be any of C<global>, C<object>
614C<player>, C<client> or C<map> (i.e. the attachable objects in 734C<player>, C<client> or C<map> (i.e. the attachable objects in
615Crossfire TRT). 735Deliantra).
616 736
617=over 4 737=over 4
618 738
619=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
620 740
902 } 1022 }
903 1023
904 0 1024 0
905} 1025}
906 1026
907=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
908 1028
909=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
910 1030
911Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
912 1032
918 1038
919=cut 1039=cut
920 1040
921############################################################################# 1041#############################################################################
922# object support 1042# object support
1043
1044sub _object_equal($$);
1045sub _object_equal($$) {
1046 my ($a, $b) = @_;
1047
1048 return 0 unless (ref $a) eq (ref $b);
1049
1050 if ("HASH" eq ref $a) {
1051 my @ka = keys %$a;
1052 my @kb = keys %$b;
1053
1054 return 0 if @ka != @kb;
1055
1056 for (0 .. $#ka) {
1057 return 0 unless $ka[$_] eq $kb[$_];
1058 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1059 }
1060
1061 } elsif ("ARRAY" eq ref $a) {
1062
1063 return 0 if @$a != @$b;
1064
1065 for (0 .. $#$a) {
1066 return 0 unless _object_equal $a->[$_], $b->[$_];
1067 }
1068
1069 } elsif ($a ne $b) {
1070 return 0;
1071 }
1072
1073 1
1074}
1075
1076our $SLOW_MERGES;#d#
1077sub _can_merge {
1078 my ($ob1, $ob2) = @_;
1079
1080 ++$SLOW_MERGES;#d#
1081
1082 # we do the slow way here
1083 return _object_equal $ob1, $ob2
1084}
923 1085
924sub reattach { 1086sub reattach {
925 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 1088 my ($obj) = @_;
927 1089
948cf::attachable->attach ( 1110cf::attachable->attach (
949 prio => -1000000, 1111 prio => -1000000,
950 on_instantiate => sub { 1112 on_instantiate => sub {
951 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
952 1114
953 $data = from_json $data; 1115 $data = decode_json $data;
954 1116
955 for (@$data) { 1117 for (@$data) {
956 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
957 1119
958 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
974sub object_freezer_save { 1136sub object_freezer_save {
975 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
976 1138
977 sync_job { 1139 sync_job {
978 if (length $$rdata) { 1140 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename);
979 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
980 $filename, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
981 1144
982 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
983 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
984 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
985 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
986 close $fh; 1149 aio_close $fh;
987 1150
988 if (@$objs) { 1151 if (@$objs) {
989 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
990 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
991 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
992 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
993 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
994 close $fh; 1157 aio_close $fh;
995 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
996 } 1159 }
997 } else { 1160 } else {
998 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
999 } 1162 }
1004 } 1167 }
1005 } else { 1168 } else {
1006 aio_unlink $filename; 1169 aio_unlink $filename;
1007 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
1008 } 1171 }
1009 } 1172 };
1010} 1173}
1011 1174
1012sub object_freezer_as_string { 1175sub object_freezer_as_string {
1013 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
1014 1177
1026 or return; 1189 or return;
1027 1190
1028 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1029 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1030 or return; 1193 or return;
1194
1031 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1032 } 1197 }
1033 1198
1199 utf8::decode (my $decname = $filename);
1034 warn sprintf "loading %s (%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1035 $filename, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1202
1036 return ($data, $av); 1203 ($data, $av)
1037} 1204}
1038 1205
1039=head2 COMMAND CALLBACKS 1206=head2 COMMAND CALLBACKS
1040 1207
1041=over 4 1208=over 4
1114 my ($pl, $buf) = @_; 1281 my ($pl, $buf) = @_;
1115 1282
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1284
1118 if (ref $msg) { 1285 if (ref $msg) {
1286 my ($type, $reply, @payload) =
1287 "ARRAY" eq ref $msg
1288 ? @$msg
1289 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1290
1291 my @reply;
1292
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1293 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1294 @reply = $cb->($pl, @payload);
1121 $pl->ext_reply ($msg->{msgid}, %reply);
1122 }
1123 } 1295 }
1296
1297 $pl->ext_reply ($reply, @reply)
1298 if $reply;
1299
1124 } else { 1300 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1302 }
1127 1303
1128 cf::override; 1304 cf::override;
1181 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1182 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1183 1359
1184 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1185 warn $msg; 1361 warn $msg;
1186 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1187 exit 1;
1188 } 1363 }
1189 1364
1190 warn $msg; 1365 warn $msg;
1191 } 1366 }
1192 1367
1217use Coro::AIO; 1392use Coro::AIO;
1218 1393
1219=head3 cf::player 1394=head3 cf::player
1220 1395
1221=over 4 1396=over 4
1397
1398=item cf::player::num_playing
1399
1400Returns the official number of playing players, as per the Crossfire metaserver rules.
1401
1402=cut
1403
1404sub num_playing {
1405 scalar grep
1406 $_->ob->map
1407 && !$_->hidden
1408 && !$_->ob->flag (cf::FLAG_WIZ),
1409 cf::player::list
1410}
1222 1411
1223=item cf::player::find $login 1412=item cf::player::find $login
1224 1413
1225Returns the given player object, loading it if necessary (might block). 1414Returns the given player object, loading it if necessary (might block).
1226 1415
1262 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1451 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1452 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1453 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1266 1455
1267 my $pl = load_pl path $login 1456 my $f = new_from_file cf::object::thawer path $login
1268 or return; 1457 or return;
1458
1459 my $pl = cf::player::load_pl $f
1460 or return;
1461
1462 local $cf::PLAYER_LOADING{$login} = $pl;
1463 $f->resolve_delayed_derefs;
1269 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1270 } 1465 }
1271 } 1466 }
1272} 1467}
1273 1468
1282 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1283 1478
1284 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1285 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1286 1481
1482 cf::get_slot 0.01;
1483
1287 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1288 Coro::cede; 1485 cf::cede_to_tick;
1289} 1486}
1290 1487
1291sub new($) { 1488sub new($) {
1292 my ($login) = @_; 1489 my ($login) = @_;
1293 1490
1297 $self->{deny_save} = 1; 1494 $self->{deny_save} = 1;
1298 1495
1299 $cf::PLAYER{$login} = $self; 1496 $cf::PLAYER{$login} = $self;
1300 1497
1301 $self 1498 $self
1499}
1500
1501=item $player->send_msg ($channel, $msg, $color, [extra...])
1502
1503=cut
1504
1505sub send_msg {
1506 my $ns = shift->ns
1507 or return;
1508 $ns->send_msg (@_);
1302} 1509}
1303 1510
1304=item $pl->quit_character 1511=item $pl->quit_character
1305 1512
1306Nukes the player without looking back. If logged in, the connection will 1513Nukes the player without looking back. If logged in, the connection will
1361 or return []; 1568 or return [];
1362 1569
1363 my @logins; 1570 my @logins;
1364 1571
1365 for my $login (@$dirs) { 1572 for my $login (@$dirs) {
1573 my $path = path $login;
1574
1575 # a .pst is a dead give-away for a valid player
1576 # if no pst file found, open and chekc for blocked users
1577 if (aio_stat "$path.pst") {
1366 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1368 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1581 }
1369 1582
1370 utf8::decode $login; 1583 utf8::decode $login;
1371 push @logins, $login; 1584 push @logins, $login;
1372 } 1585 }
1373 1586
1406 1619
1407Expand crossfire pod fragments into protocol xml. 1620Expand crossfire pod fragments into protocol xml.
1408 1621
1409=cut 1622=cut
1410 1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1411sub expand_cfpod { 1635sub expand_cfpod {
1412 ((my $self), (local $_)) = @_; 1636 my ($self, $pod) = @_;
1413 1637
1414 # escape & and < 1638 my $xml;
1415 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g;
1417 1639
1418 # this is buggy, it needs to properly take care of nested <'s 1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1419 1643
1420 1 while 1644 $group =~ s/&/&amp;/g;
1421 # replace B<>, I<>, U<> etc. 1645 $group =~ s/</&lt;/g;
1422 s/B<([^\>]*)>/<b>$1<\/b>/ 1646
1423 || s/I<([^\>]*)>/<i>$1<\/i>/ 1647 $xml .= $group;
1424 || s/U<([^\>]*)>/<u>$1<\/u>/ 1648 } elsif ($pod =~ m%\G
1425 # replace G<male|female> tags 1649 ([BCGHITU])
1426 || s{G<([^>|]*)\|([^>]*)>}{ 1650 <
1427 $self->gender ? $2 : $1 1651 (?:
1428 }ge 1652 ([^<>]*) (?{ $group = $^N })
1429 # replace H<hint text> 1653 | < $interior >
1430 || s{H<([^\>]*)>} 1654 )
1655 >
1656 %gcsx
1431 { 1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1432 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1433 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1434 "") 1677 "")
1435 [$self->{hintmode}] 1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1436 }ge; 1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1437 1689
1690 for ($xml) {
1438 # create single paragraphs (very hackish) 1691 # create single paragraphs (very hackish)
1439 s/(?<=\S)\n(?=\w)/ /g; 1692 s/(?<=\S)\n(?=\w)/ /g;
1440 1693
1441 # compress some whitespace 1694 # compress some whitespace
1442 s/\s+\n/\n/g; # ws line-ends 1695 s/\s+\n/\n/g; # ws line-ends
1443 s/\n\n+/\n/g; # double lines 1696 s/\n\n+/\n/g; # double lines
1444 s/^\n+//; # beginning lines 1697 s/^\n+//; # beginning lines
1445 s/\n+$//; # ending lines 1698 s/\n+$//; # ending lines
1699 }
1446 1700
1447 $_ 1701 $xml
1448} 1702}
1703
1704no re 'eval';
1449 1705
1450sub hintmode { 1706sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1; 1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode} 1708 $_[0]{hintmode}
1453} 1709}
1454 1710
1455=item $player->ext_reply ($msgid, %msg) 1711=item $player->ext_reply ($msgid, @msg)
1456 1712
1457Sends an ext reply to the player. 1713Sends an ext reply to the player.
1458 1714
1459=cut 1715=cut
1460 1716
1461sub ext_reply($$%) { 1717sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1718 my ($self, $id, @msg) = @_;
1463 1719
1464 $msg{msgid} = $id; 1720 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1721}
1467 1722
1468=item $player->ext_event ($type, %msg) 1723=item $player->ext_msg ($type, @msg)
1469 1724
1470Sends an ext event to the client. 1725Sends an ext event to the client.
1471 1726
1472=cut 1727=cut
1473 1728
1474sub ext_event($$%) { 1729sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1730 my ($self, $type, @msg) = @_;
1476 1731
1477 $self->ns->ext_event ($type, %msg); 1732 $self->ns->ext_msg ($type, @msg);
1478} 1733}
1479 1734
1480=head3 cf::region 1735=head3 cf::region
1481 1736
1482=over 4 1737=over 4
1526our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1527our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1528 1783
1529sub generate_random_map { 1784sub generate_random_map {
1530 my ($self, $rmp) = @_; 1785 my ($self, $rmp) = @_;
1786
1787 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1788
1531 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1532 $self->_create_random_map ( 1790 $self->_create_random_map (
1533 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1534 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1535 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1657 1915
1658# the temporary/swap location 1916# the temporary/swap location
1659sub save_path { 1917sub save_path {
1660 my ($self) = @_; 1918 my ($self) = @_;
1661 1919
1662 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1663 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1664} 1922}
1665 1923
1666# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1667sub uniq_path { 1925sub uniq_path {
1668 my ($self) = @_; 1926 my ($self) = @_;
1669 1927
1670 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1671 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1672} 1930}
1673 1931
1674# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1675# all maps in C++... 1933# all maps in C++...
1698 1956
1699sub load_header_from($) { 1957sub load_header_from($) {
1700 my ($self, $path) = @_; 1958 my ($self, $path) = @_;
1701 1959
1702 utf8::encode $path; 1960 utf8::encode $path;
1703 #aio_open $path, O_RDONLY, 0 1961 my $f = new_from_file cf::object::thawer $path
1704 # or return;
1705
1706 $self->_load_header ($path)
1707 or return; 1962 or return;
1963
1964 $self->_load_header ($f)
1965 or return;
1966
1967 local $MAP_LOADING{$self->{path}} = $self;
1968 $f->resolve_delayed_derefs;
1708 1969
1709 $self->{load_path} = $path; 1970 $self->{load_path} = $path;
1710 1971
1711 1 1972 1
1712} 1973}
1766sub find { 2027sub find {
1767 my ($path, $origin) = @_; 2028 my ($path, $origin) = @_;
1768 2029
1769 $path = normalise $path, $origin && $origin->path; 2030 $path = normalise $path, $origin && $origin->path;
1770 2031
2032 cf::lock_wait "map_data:$path";#d#remove
1771 cf::lock_wait "map_find:$path"; 2033 cf::lock_wait "map_find:$path";
1772 2034
1773 $cf::MAP{$path} || do { 2035 $cf::MAP{$path} || do {
1774 my $guard = cf::lock_acquire "map_find:$path"; 2036 my $guard1 = cf::lock_acquire "map_find:$path";
2037 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2038
1775 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1776 or return; 2040 or return;
1777 2041
1778 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1779 2043
1781 or return; 2045 or return;
1782 2046
1783 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1785 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard1;
2051 undef $guard2;
1786 $map->reset; 2052 $map->reset;
1787 undef $guard;
1788 return find $path; 2053 return find $path;
1789 } 2054 }
1790 2055
1791 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1792 } 2057 }
1801 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
1802 2067
1803 my $path = $self->{path}; 2068 my $path = $self->{path};
1804 2069
1805 { 2070 {
1806 my $guard = cf::lock_acquire "map_load:$path"; 2071 my $guard = cf::lock_acquire "map_data:$path";
1807 2072
2073 return unless $self->valid;
1808 return if $self->in_memory != cf::MAP_SWAPPED; 2074 return unless $self->in_memory == cf::MAP_SWAPPED;
1809 2075
1810 $self->in_memory (cf::MAP_LOADING); 2076 $self->in_memory (cf::MAP_LOADING);
1811 2077
1812 $self->alloc; 2078 $self->alloc;
1813 2079
1814 $self->pre_load; 2080 $self->pre_load;
1815 Coro::cede; 2081 cf::cede_to_tick;
1816 2082
2083 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block;
1817 $self->_load_objects ($self->{load_path}, 1) 2085 $self->_load_objects ($f)
1818 or return; 2086 or return;
1819 2087
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1821 if delete $self->{load_original}; 2089 if delete $self->{load_original};
1822 2090
1823 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
1824 utf8::encode $uniq; 2092 utf8::encode $uniq;
1825 if (aio_open $uniq, O_RDONLY, 0) { 2093 unless (aio_stat $uniq) {
2094 if (my $f = new_from_file cf::object::thawer $uniq) {
1826 $self->clear_unique_items; 2095 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 2096 $self->_load_objects ($f);
2097 $f->resolve_delayed_derefs;
2098 }
1828 } 2099 }
1829 } 2100 }
1830 2101
1831 Coro::cede; 2102 $f->resolve_delayed_derefs;
2103
2104 cf::cede_to_tick;
1832 # now do the right thing for maps 2105 # now do the right thing for maps
1833 $self->link_multipart_objects; 2106 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 2107 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 2108 unless $self->difficulty;
1836 Coro::cede; 2109 cf::cede_to_tick;
1837 2110
1838 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 2112 $self->decay_objects;
1840 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
1841 $self->update_buttons; 2114 $self->update_buttons;
1842 Coro::cede; 2115 cf::cede_to_tick;
1843 $self->set_darkness_map; 2116 $self->set_darkness_map;
1844 Coro::cede; 2117 cf::cede_to_tick;
1845 $self->activate; 2118 $self->activate;
1846 } 2119 }
1847 2120
2121 $self->{last_save} = $cf::RUNTIME;
2122 $self->last_access ($cf::RUNTIME);
2123
1848 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
1849 } 2125 }
1850 2126
1851 $self->post_load; 2127 $self->post_load;
1852} 2128}
1853 2129
1862 2138
1863 $self 2139 $self
1864} 2140}
1865 2141
1866# find and load all maps in the 3x3 area around a map 2142# find and load all maps in the 3x3 area around a map
1867sub load_diag { 2143sub load_neighbours {
1868 my ($map) = @_; 2144 my ($map) = @_;
1869 2145
1870 my @diag; # diagonal neighbours 2146 my @neigh; # diagonal neighbours
1871 2147
1872 for (0 .. 3) { 2148 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 2149 my $neigh = $map->tile_path ($_)
1874 or next; 2150 or next;
1875 $neigh = find $neigh, $map 2151 $neigh = find $neigh, $map
1876 or next; 2152 or next;
1877 $neigh->load; 2153 $neigh->load;
1878 2154
2155 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2156 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2157 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 2158 }
1882 2159
1883 for (@diag) { 2160 for (grep defined $_->[0], @neigh) {
2161 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 2162 my $neigh = find $path, $origin
1885 or next; 2163 or next;
1886 $neigh->load; 2164 $neigh->load;
1887 } 2165 }
1888} 2166}
1889 2167
1894} 2172}
1895 2173
1896sub do_load_sync { 2174sub do_load_sync {
1897 my ($map) = @_; 2175 my ($map) = @_;
1898 2176
2177 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2178 if $Coro::current == $Coro::main;
2179
1899 cf::sync_job { $map->load }; 2180 cf::sync_job { $map->load };
1900} 2181}
1901 2182
1902our %MAP_PREFETCH; 2183our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 2184our $MAP_PREFETCHER = undef;
1904 2185
1905sub find_async { 2186sub find_async {
1906 my ($path, $origin) = @_; 2187 my ($path, $origin, $load) = @_;
1907 2188
1908 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
1909 2190
1910 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1912 } 2193 }
1913 2194
1914 undef $MAP_PREFETCH{$path}; 2195 $MAP_PREFETCH{$path} |= $load;
2196
1915 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
2198 $Coro::current->{desc} = "map prefetcher";
2199
1916 while (%MAP_PREFETCH) { 2200 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 2201 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 2202 if (my $map = find $k) {
1919 $map->load; 2203 $map->load if $v;
1920 } 2204 }
1921 2205
1922 delete $MAP_PREFETCH{$path}; 2206 delete $MAP_PREFETCH{$k};
1923 } 2207 }
1924 } 2208 }
1925 undef $MAP_PREFETCHER; 2209 undef $MAP_PREFETCHER;
1926 }; 2210 };
1927 $MAP_PREFETCHER->prio (6); 2211 $MAP_PREFETCHER->prio (6);
1930} 2214}
1931 2215
1932sub save { 2216sub save {
1933 my ($self) = @_; 2217 my ($self) = @_;
1934 2218
1935 my $lock = cf::lock_acquire "map_data:" . $self->path; 2219 my $lock = cf::lock_acquire "map_data:$self->{path}";
1936 2220
1937 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
1938 2222
1939 return unless $self->dirty; 2223 return unless $self->dirty;
1940 2224
1946 return if $self->{deny_save}; 2230 return if $self->{deny_save};
1947 2231
1948 local $self->{last_access} = $self->last_access;#d# 2232 local $self->{last_access} = $self->last_access;#d#
1949 2233
1950 cf::async { 2234 cf::async {
2235 $Coro::current->{desc} = "map player save";
1951 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
1952 }; 2237 };
2238
2239 cf::get_slot 0.02;
1953 2240
1954 if ($uniq) { 2241 if ($uniq) {
1955 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1956 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1957 } else { 2244 } else {
1963 my ($self) = @_; 2250 my ($self) = @_;
1964 2251
1965 # save first because save cedes 2252 # save first because save cedes
1966 $self->save; 2253 $self->save;
1967 2254
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2256
1970 return if $self->players; 2257 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
1972 return if $self->{deny_save}; 2259 return if $self->{deny_save};
1973 2260
2261 $self->in_memory (cf::MAP_SWAPPED);
2262
2263 $self->deactivate;
2264 $_->clear_links_to ($self) for values %cf::MAP;
1974 $self->clear; 2265 $self->clear;
1975 $self->in_memory (cf::MAP_SWAPPED);
1976} 2266}
1977 2267
1978sub reset_at { 2268sub reset_at {
1979 my ($self) = @_; 2269 my ($self) = @_;
1980 2270
2012 if $uniq; 2302 if $uniq;
2013 } 2303 }
2014 2304
2015 delete $cf::MAP{$self->path}; 2305 delete $cf::MAP{$self->path};
2016 2306
2307 $self->deactivate;
2308 $_->clear_links_to ($self) for values %cf::MAP;
2017 $self->clear; 2309 $self->clear;
2018
2019 $_->clear_links_to ($self) for values %cf::MAP;
2020 2310
2021 $self->unlink_save; 2311 $self->unlink_save;
2022 $self->destroy; 2312 $self->destroy;
2023} 2313}
2024 2314
2025my $nuke_counter = "aaaa"; 2315my $nuke_counter = "aaaa";
2026 2316
2027sub nuke { 2317sub nuke {
2028 my ($self) = @_; 2318 my ($self) = @_;
2029 2319
2320 {
2321 my $lock = cf::lock_acquire "map_data:$self->{path}";
2322
2030 delete $cf::MAP{$self->path}; 2323 delete $cf::MAP{$self->path};
2031 2324
2032 $self->unlink_save; 2325 $self->unlink_save;
2033 2326
2034 bless $self, "cf::map"; 2327 bless $self, "cf::map";
2035 delete $self->{deny_reset}; 2328 delete $self->{deny_reset};
2036 $self->{deny_save} = 1; 2329 $self->{deny_save} = 1;
2037 $self->reset_timeout (1); 2330 $self->reset_timeout (1);
2038 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2331 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039 2332
2040 $cf::MAP{$self->path} = $self; 2333 $cf::MAP{$self->path} = $self;
2334 }
2041 2335
2042 $self->reset; # polite request, might not happen 2336 $self->reset; # polite request, might not happen
2043} 2337}
2044 2338
2045=item $maps = cf::map::tmp_maps 2339=item $maps = cf::map::tmp_maps
2087 2381
2088sub unique_maps() { 2382sub unique_maps() {
2089 [ 2383 [
2090 map { 2384 map {
2091 utf8::decode $_; 2385 utf8::decode $_;
2092 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2093 ? normalise $_ 2389 : normalise $_
2094 : ()
2095 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2096 ] 2391 ]
2097} 2392}
2098 2393
2099package cf;
2100
2101=back 2394=back
2102 2395
2103=head3 cf::object 2396=head3 cf::object
2104 2397
2105=cut 2398=cut
2108 2401
2109=over 4 2402=over 4
2110 2403
2111=item $ob->inv_recursive 2404=item $ob->inv_recursive
2112 2405
2113Returns the inventory of the object _and_ their inventories, recursively. 2406Returns the inventory of the object I<and> their inventories, recursively,
2407but I<not> the object itself.
2114 2408
2115=cut 2409=cut
2116 2410
2117sub inv_recursive_; 2411sub inv_recursive_;
2118sub inv_recursive_ { 2412sub inv_recursive_ {
2119 map { $_, inv_recursive_ $_->inv } @_ 2413 map { $_, inv_recursive_ $_->inv } @_
2120} 2414}
2121 2415
2122sub inv_recursive { 2416sub inv_recursive {
2123 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2418}
2419
2420=item $ref = $ob->ref
2421
2422Creates and returns a persistent reference to an object that can be stored as a string.
2423
2424=item $ob = cf::object::deref ($refstring)
2425
2426returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2427even if the object actually exists. May block.
2428
2429=cut
2430
2431sub deref {
2432 my ($ref) = @_;
2433
2434 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2435 my ($uuid, $name) = ($1, $2);
2436 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2437 or return;
2438 $pl->ob->uuid eq $uuid
2439 or return;
2440
2441 $pl->ob
2442 } else {
2443 warn "$ref: cannot resolve object reference\n";
2444 undef
2445 }
2124} 2446}
2125 2447
2126package cf; 2448package cf;
2127 2449
2128=back 2450=back
2152 2474
2153 } else { 2475 } else {
2154 my $pl = $self->contr; 2476 my $pl = $self->contr;
2155 2477
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2478 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2479 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2480 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164 2481
2165 } else { 2482 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2483 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2484 $self->message ($msg, $flags);
2168 } 2485 }
2169 } 2486 }
2487}
2488
2489=item $object->send_msg ($channel, $msg, $color, [extra...])
2490
2491=cut
2492
2493sub cf::object::send_msg {
2494 my $pl = shift->contr
2495 or return;
2496 $pl->send_msg (@_);
2170} 2497}
2171 2498
2172=item $player_object->may ("access") 2499=item $player_object->may ("access")
2173 2500
2174Returns wether the given player is authorized to access resource "access" 2501Returns wether the given player is authorized to access resource "access"
2253 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2582 if $x <=0 && $y <= 0;
2256 2583
2257 $map->load; 2584 $map->load;
2258 $map->load_diag; 2585 $map->load_neighbours;
2259 2586
2260 return unless $self->contr->active; 2587 return unless $self->contr->active;
2261 $self->activate_recursive; 2588 $self->activate_recursive;
2262 2589
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2610 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2284 2611
2285 $self->enter_link; 2612 $self->enter_link;
2286 2613
2287 (async { 2614 (async {
2615 $Coro::current->{desc} = "player::goto $path $x $y";
2616
2617 # *tag paths override both path and x|y
2618 if ($path =~ /^\*(.*)$/) {
2619 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2620 my $ob = $obs[rand @obs];
2621
2622 # see if we actually can go there
2623 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2624 $ob = $obs[rand @obs];
2625 } else {
2626 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2627 }
2628 # else put us there anyways for now #d#
2629
2630 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2631 } else {
2632 ($path, $x, $y) = (undef, undef, undef);
2633 }
2634 }
2635
2288 my $map = eval { 2636 my $map = eval {
2289 my $map = cf::map::find $path; 2637 my $map = defined $path ? cf::map::find $path : undef;
2290 2638
2291 if ($map) { 2639 if ($map) {
2292 $map = $map->customise_for ($self); 2640 $map = $map->customise_for ($self);
2293 $map = $check->($map) if $check && $map; 2641 $map = $check->($map) if $check && $map;
2294 } else { 2642 } else {
2295 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2643 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2296 } 2644 }
2297 2645
2298 $map 2646 $map
2299 }; 2647 };
2300 2648
2353 $rmp->{origin_y} = $exit->y; 2701 $rmp->{origin_y} = $exit->y;
2354 } 2702 }
2355 2703
2356 $rmp->{random_seed} ||= $exit->random_seed; 2704 $rmp->{random_seed} ||= $exit->random_seed;
2357 2705
2358 my $data = cf::to_json $rmp; 2706 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2359 my $md5 = Digest::MD5::md5_hex $data; 2707 my $md5 = Digest::MD5::md5_hex $data;
2360 my $meta = "$RANDOMDIR/$md5.meta"; 2708 my $meta = "$RANDOMDIR/$md5.meta";
2361 2709
2362 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2710 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2363 aio_write $fh, 0, (length $data), $data, 0; 2711 aio_write $fh, 0, (length $data), $data, 0;
2390 # if exit is damned, update players death & WoR home-position 2738 # if exit is damned, update players death & WoR home-position
2391 $self->contr->savebed ($slaying, $hp, $sp) 2739 $self->contr->savebed ($slaying, $hp, $sp)
2392 if $exit->flag (FLAG_DAMNED); 2740 if $exit->flag (FLAG_DAMNED);
2393 2741
2394 (async { 2742 (async {
2743 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2744
2395 $self->deactivate_recursive; # just to be sure 2745 $self->deactivate_recursive; # just to be sure
2396 unless (eval { 2746 unless (eval {
2397 $self->goto ($slaying, $hp, $sp); 2747 $self->goto ($slaying, $hp, $sp);
2398 2748
2399 1; 2749 1;
2434the message, with C<log> being the default. If C<$color> is negative, suppress 2784the message, with C<log> being the default. If C<$color> is negative, suppress
2435the message unless the client supports the msg packet. 2785the message unless the client supports the msg packet.
2436 2786
2437=cut 2787=cut
2438 2788
2789# non-persistent channels (usually the info channel)
2790our %CHANNEL = (
2791 "c/identify" => {
2792 id => "infobox",
2793 title => "Identify",
2794 reply => undef,
2795 tooltip => "Items recently identified",
2796 },
2797 "c/examine" => {
2798 id => "infobox",
2799 title => "Examine",
2800 reply => undef,
2801 tooltip => "Signs and other items you examined",
2802 },
2803 "c/book" => {
2804 id => "infobox",
2805 title => "Book",
2806 reply => undef,
2807 tooltip => "The contents of a note or book",
2808 },
2809 "c/lookat" => {
2810 id => "infobox",
2811 title => "Look",
2812 reply => undef,
2813 tooltip => "What you saw there",
2814 },
2815 "c/who" => {
2816 id => "infobox",
2817 title => "Players",
2818 reply => undef,
2819 tooltip => "Shows players who are currently online",
2820 },
2821 "c/body" => {
2822 id => "infobox",
2823 title => "Body Parts",
2824 reply => undef,
2825 tooltip => "Shows which body parts you posess and are available",
2826 },
2827 "c/uptime" => {
2828 id => "infobox",
2829 title => "Uptime",
2830 reply => undef,
2831 tooltip => "How long the server has been running since last restart",
2832 },
2833 "c/mapinfo" => {
2834 id => "infobox",
2835 title => "Map Info",
2836 reply => undef,
2837 tooltip => "Information related to the maps",
2838 },
2839 "c/party" => {
2840 id => "party",
2841 title => "Party",
2842 reply => "gsay ",
2843 tooltip => "Messages and chat related to your party",
2844 },
2845);
2846
2439sub cf::client::send_msg { 2847sub cf::client::send_msg {
2440 my ($self, $channel, $msg, $color, @extra) = @_; 2848 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2849
2442 $msg = $self->pl->expand_cfpod ($msg); 2850 $msg = $self->pl->expand_cfpod ($msg);
2443 2851
2444 return unless @extra || length $msg;
2445
2446 $color &= ~cf::NDI_UNIQUE; # just in case... 2852 $color &= cf::NDI_CLIENT_MASK; # just in case...
2447 2853
2854 # check predefined channels, for the benefit of C
2855 if ($CHANNEL{$channel}) {
2856 $channel = $CHANNEL{$channel};
2857
2858 $self->ext_msg (channel_info => $channel)
2859 if $self->can_msg;
2860
2861 $channel = $channel->{id};
2862
2448 if (ref $channel) { 2863 } elsif (ref $channel) {
2449 # send meta info to client, if not yet sent 2864 # send meta info to client, if not yet sent
2450 unless (exists $self->{channel}{$channel->{id}}) { 2865 unless (exists $self->{channel}{$channel->{id}}) {
2451 $self->{channel}{$channel->{id}} = $channel; 2866 $self->{channel}{$channel->{id}} = $channel;
2452 $self->ext_event (channel_info => %$channel); 2867 $self->ext_msg (channel_info => $channel)
2868 if $self->can_msg;
2453 } 2869 }
2454 2870
2455 $channel = $channel->{id}; 2871 $channel = $channel->{id};
2456 } 2872 }
2457 2873
2874 return unless @extra || length $msg;
2875
2458 if ($self->can_msg) { 2876 if ($self->can_msg) {
2877 # default colour, mask it out
2878 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2879 if $color & cf::NDI_DEF;
2880
2459 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2881 $self->send_packet ("msg " . $self->{json_coder}->encode (
2882 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2460 } else { 2883 } else {
2461 # replace some tags by gcfclient-compatible ones
2462 for ($msg) {
2463 1 while
2464 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2465 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2466 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2467 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2468 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2469 }
2470
2471 if ($color >= 0) { 2884 if ($color >= 0) {
2885 # replace some tags by gcfclient-compatible ones
2886 for ($msg) {
2887 1 while
2888 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2889 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2890 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2891 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2892 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2893 }
2894
2895 $color &= cf::NDI_COLOR_MASK;
2896
2897 utf8::encode $msg;
2898
2472 if (0 && $msg =~ /\[/) { 2899 if (0 && $msg =~ /\[/) {
2900 # COMMAND/INFO
2473 $self->send_packet ("drawextinfo $color 4 0 $msg") 2901 $self->send_packet ("drawextinfo $color 10 8 $msg")
2474 } else { 2902 } else {
2475 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2903 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2476 $self->send_packet ("drawinfo $color $msg") 2904 $self->send_packet ("drawinfo $color $msg")
2477 } 2905 }
2478 } 2906 }
2479 } 2907 }
2480} 2908}
2481 2909
2482=item $client->ext_event ($type, %msg) 2910=item $client->ext_msg ($type, @msg)
2483 2911
2484Sends an ext event to the client. 2912Sends an ext event to the client.
2485 2913
2486=cut 2914=cut
2487 2915
2488sub cf::client::ext_event($$%) { 2916sub cf::client::ext_msg($$@) {
2489 my ($self, $type, %msg) = @_; 2917 my ($self, $type, @msg) = @_;
2490 2918
2491 return unless $self->extcmd; 2919 if ($self->extcmd == 2) {
2492 2920 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2921 } elsif ($self->extcmd == 1) { # TODO: remove
2493 $msg{msgtype} = "event_$type"; 2922 push @msg, msgtype => "event_$type";
2494 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2923 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2924 }
2925}
2926
2927=item $client->ext_reply ($msgid, @msg)
2928
2929Sends an ext reply to the client.
2930
2931=cut
2932
2933sub cf::client::ext_reply($$@) {
2934 my ($self, $id, @msg) = @_;
2935
2936 if ($self->extcmd == 2) {
2937 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2938 } elsif ($self->extcmd == 1) {
2939 #TODO: version 1, remove
2940 unshift @msg, msgtype => "reply", msgid => $id;
2941 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2942 }
2495} 2943}
2496 2944
2497=item $success = $client->query ($flags, "text", \&cb) 2945=item $success = $client->query ($flags, "text", \&cb)
2498 2946
2499Queues a query to the client, calling the given callback with 2947Queues a query to the client, calling the given callback with
2554 my ($ns, $buf) = @_; 3002 my ($ns, $buf) = @_;
2555 3003
2556 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3004 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2557 3005
2558 if (ref $msg) { 3006 if (ref $msg) {
3007 my ($type, $reply, @payload) =
3008 "ARRAY" eq ref $msg
3009 ? @$msg
3010 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3011
3012 my @reply;
3013
2559 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3014 if (my $cb = $EXTICMD{$type}) {
2560 if (my %reply = $cb->($ns, $msg)) { 3015 @reply = $cb->($ns, @payload);
2561 $reply{msgid} = $msg->{msgid};
2562 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2563 }
2564 } 3016 }
3017
3018 $ns->ext_reply ($reply, @reply)
3019 if $reply;
3020
2565 } else { 3021 } else {
2566 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3022 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2567 } 3023 }
2568 3024
2569 cf::override; 3025 cf::override;
2616our $safe = new Safe "safe"; 3072our $safe = new Safe "safe";
2617our $safe_hole = new Safe::Hole; 3073our $safe_hole = new Safe::Hole;
2618 3074
2619$SIG{FPE} = 'IGNORE'; 3075$SIG{FPE} = 'IGNORE';
2620 3076
2621$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3077$safe->permit_only (Opcode::opset qw(
3078 :base_core :base_mem :base_orig :base_math
3079 grepstart grepwhile mapstart mapwhile
3080 sort time
3081));
2622 3082
2623# here we export the classes and methods available to script code 3083# here we export the classes and methods available to script code
2624 3084
2625=pod 3085=pod
2626 3086
2627The following functions and methods are available within a safe environment: 3087The following functions and methods are available within a safe environment:
2628 3088
2629 cf::object 3089 cf::object
2630 contr pay_amount pay_player map x y force_find force_add 3090 contr pay_amount pay_player map x y force_find force_add destroy
2631 insert remove 3091 insert remove name archname title slaying race decrease split
2632 3092
2633 cf::object::player 3093 cf::object::player
2634 player 3094 player
2635 3095
2636 cf::player 3096 cf::player
2641 3101
2642=cut 3102=cut
2643 3103
2644for ( 3104for (
2645 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3105 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2646 insert remove)], 3106 insert remove inv name archname title slaying race
3107 decrease split destroy)],
2647 ["cf::object::player" => qw(player)], 3108 ["cf::object::player" => qw(player)],
2648 ["cf::player" => qw(peaceful)], 3109 ["cf::player" => qw(peaceful)],
2649 ["cf::map" => qw(trigger)], 3110 ["cf::map" => qw(trigger)],
2650) { 3111) {
2651 no strict 'refs'; 3112 no strict 'refs';
2727# the server's init and main functions 3188# the server's init and main functions
2728 3189
2729sub load_facedata($) { 3190sub load_facedata($) {
2730 my ($path) = @_; 3191 my ($path) = @_;
2731 3192
3193 # HACK to clear player env face cache, we need some signal framework
3194 # for this (global event?)
3195 %ext::player_env::MUSIC_FACE_CACHE = ();
3196
3197 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3198
2732 warn "loading facedata from $path\n"; 3199 warn "loading facedata from $path\n";
2733 3200
2734 my $facedata; 3201 my $facedata;
2735 0 < aio_load $path, $facedata 3202 0 < aio_load $path, $facedata
2736 or die "$path: $!"; 3203 or die "$path: $!";
2738 $facedata = Coro::Storable::thaw $facedata; 3205 $facedata = Coro::Storable::thaw $facedata;
2739 3206
2740 $facedata->{version} == 2 3207 $facedata->{version} == 2
2741 or cf::cleanup "$path: version mismatch, cannot proceed."; 3208 or cf::cleanup "$path: version mismatch, cannot proceed.";
2742 3209
3210 # patch in the exptable
3211 $facedata->{resource}{"res/exp_table"} = {
3212 type => FT_RSRC,
3213 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3214 };
3215 cf::cede_to_tick;
3216
2743 { 3217 {
2744 my $faces = $facedata->{faceinfo}; 3218 my $faces = $facedata->{faceinfo};
2745 3219
2746 while (my ($face, $info) = each %$faces) { 3220 while (my ($face, $info) = each %$faces) {
2747 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3221 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3222
2748 cf::face::set_visibility $idx, $info->{visibility}; 3223 cf::face::set_visibility $idx, $info->{visibility};
2749 cf::face::set_magicmap $idx, $info->{magicmap}; 3224 cf::face::set_magicmap $idx, $info->{magicmap};
2750 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3225 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2751 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3226 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2752 3227
2753 cf::cede_to_tick; 3228 cf::cede_to_tick;
2754 } 3229 }
2755 3230
2756 while (my ($face, $info) = each %$faces) { 3231 while (my ($face, $info) = each %$faces) {
2757 next unless $info->{smooth}; 3232 next unless $info->{smooth};
3233
2758 my $idx = cf::face::find $face 3234 my $idx = cf::face::find $face
2759 or next; 3235 or next;
3236
2760 if (my $smooth = cf::face::find $info->{smooth}) { 3237 if (my $smooth = cf::face::find $info->{smooth}) {
2761 cf::face::set_smooth $idx, $smooth; 3238 cf::face::set_smooth $idx, $smooth;
2762 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3239 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2763 } else { 3240 } else {
2764 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3241 warn "smooth face '$info->{smooth}' not found for face '$face'";
2781 3258
2782 { 3259 {
2783 # TODO: for gcfclient pleasure, we should give resources 3260 # TODO: for gcfclient pleasure, we should give resources
2784 # that gcfclient doesn't grok a >10000 face index. 3261 # that gcfclient doesn't grok a >10000 face index.
2785 my $res = $facedata->{resource}; 3262 my $res = $facedata->{resource};
2786 my $enc = JSON::XS->new->utf8->canonical;
2787 3263
2788 while (my ($name, $info) = each %$res) { 3264 while (my ($name, $info) = each %$res) {
2789 my $meta = $enc->encode ({ 3265 if (defined $info->{type}) {
2790 name => $name,
2791 type => $info->{type},
2792 copyright => $info->{copyright}, #TODO#
2793 });
2794
2795 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3266 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3267 my $data;
2796 3268
2797 if ($name =~ /\.jpg$/) { 3269 if ($info->{type} & 1) {
2798 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3270 # prepend meta info
2799 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3271
3272 my $meta = $enc->encode ({
3273 name => $name,
3274 %{ $info->{meta} || {} },
3275 });
3276
3277 $data = pack "(w/a*)*", $meta, $info->{data};
3278 } else {
3279 $data = $info->{data};
3280 }
3281
3282 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3283 cf::face::set_type $idx, $info->{type};
2800 } else { 3284 } else {
2801 my $data = pack "(w/a*)*", $meta, $info->{data}; 3285 $RESOURCE{$name} = $info;
2802 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804 cf::face::set_type $idx, 1;
2805 cf::face::set_data $idx, 0, $data, $chk;
2806 } 3286 }
2807 3287
2808 cf::cede_to_tick; 3288 cf::cede_to_tick;
2809 } 3289 }
2810 } 3290 }
2811 3291
3292 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3293
2812 1 3294 1
2813} 3295}
2814 3296
3297cf::global->attach (on_resource_update => sub {
3298 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3299 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3300
3301 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3302 my $sound = $soundconf->{compat}[$_]
3303 or next;
3304
3305 my $face = cf::face::find "sound/$sound->[1]";
3306 cf::sound::set $sound->[0] => $face;
3307 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3308 }
3309
3310 while (my ($k, $v) = each %{$soundconf->{event}}) {
3311 my $face = cf::face::find "sound/$v";
3312 cf::sound::set $k => $face;
3313 }
3314 }
3315});
3316
3317register_exticmd fx_want => sub {
3318 my ($ns, $want) = @_;
3319
3320 while (my ($k, $v) = each %$want) {
3321 $ns->fx_want ($k, $v);
3322 }
3323};
3324
3325sub load_resource_file($) {
3326 my $guard = lock_acquire "load_resource_file";
3327
3328 my $status = load_resource_file_ $_[0];
3329 get_slot 0.1, 100;
3330 cf::arch::commit_load;
3331
3332 $status
3333}
3334
2815sub reload_regions { 3335sub reload_regions {
3336 # HACK to clear player env face cache, we need some signal framework
3337 # for this (global event?)
3338 %ext::player_env::MUSIC_FACE_CACHE = ();
3339
2816 load_resource_file "$MAPDIR/regions" 3340 load_resource_file "$MAPDIR/regions"
2817 or die "unable to load regions file\n"; 3341 or die "unable to load regions file\n";
2818 3342
2819 for (cf::region::list) { 3343 for (cf::region::list) {
2820 $_->{match} = qr/$_->{match}/ 3344 $_->{match} = qr/$_->{match}/
2828} 3352}
2829 3353
2830sub reload_archetypes { 3354sub reload_archetypes {
2831 load_resource_file "$DATADIR/archetypes" 3355 load_resource_file "$DATADIR/archetypes"
2832 or die "unable to load archetypes\n"; 3356 or die "unable to load archetypes\n";
2833 #d# NEED to laod twice to resolve forward references
2834 # this really needs to be done in an extra post-pass
2835 # (which needs to be synchronous, so solve it differently)
2836 load_resource_file "$DATADIR/archetypes"
2837 or die "unable to load archetypes\n";
2838} 3357}
2839 3358
2840sub reload_treasures { 3359sub reload_treasures {
2841 load_resource_file "$DATADIR/treasures" 3360 load_resource_file "$DATADIR/treasures"
2842 or die "unable to load treasurelists\n"; 3361 or die "unable to load treasurelists\n";
2843} 3362}
2844 3363
2845sub reload_resources { 3364sub reload_resources {
2846 warn "reloading resource files...\n"; 3365 warn "reloading resource files...\n";
2847 3366
3367 reload_facedata;
3368 reload_archetypes;
2848 reload_regions; 3369 reload_regions;
2849 reload_facedata;
2850 #reload_archetypes;#d#
2851 reload_archetypes;
2852 reload_treasures; 3370 reload_treasures;
2853 3371
2854 warn "finished reloading resource files\n"; 3372 warn "finished reloading resource files\n";
2855} 3373}
2856 3374
2857sub init { 3375sub init {
3376 my $guard = freeze_mainloop;
3377
2858 reload_resources; 3378 reload_resources;
2859} 3379}
2860 3380
2861sub cfg_load { 3381sub reload_config {
2862 open my $fh, "<:utf8", "$CONFDIR/config" 3382 open my $fh, "<:utf8", "$CONFDIR/config"
2863 or return; 3383 or return;
2864 3384
2865 local $/; 3385 local $/;
2866 *CFG = YAML::Syck::Load <$fh>; 3386 *CFG = YAML::Load <$fh>;
2867 3387
2868 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3388 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2869 3389
2870 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3390 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2871 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3391 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2882sub main { 3402sub main {
2883 # we must not ever block the main coroutine 3403 # we must not ever block the main coroutine
2884 local $Coro::idle = sub { 3404 local $Coro::idle = sub {
2885 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2886 (async { 3406 (async {
2887 Event::one_event; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT;
2888 })->prio (Coro::PRIO_MAX); 3409 })->prio (Coro::PRIO_MAX);
2889 }; 3410 };
2890 3411
2891 cfg_load; 3412 {
3413 my $guard = freeze_mainloop;
3414 reload_config;
2892 db_init; 3415 db_init;
2893 load_extensions; 3416 load_extensions;
2894 3417
2895 $TICK_WATCHER->start; 3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 evthread_start IO::AIO::poll_fileno;
3420 }
3421
2896 Event::loop; 3422 EV::loop;
2897} 3423}
2898 3424
2899############################################################################# 3425#############################################################################
2900# initialisation and cleanup 3426# initialisation and cleanup
2901 3427
2902# install some emergency cleanup handlers 3428# install some emergency cleanup handlers
2903BEGIN { 3429BEGIN {
3430 our %SIGWATCHER = ();
2904 for my $signal (qw(INT HUP TERM)) { 3431 for my $signal (qw(INT HUP TERM)) {
2905 Event->signal ( 3432 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2906 reentrant => 0,
2907 data => WF_AUTOCANCEL,
2908 signal => $signal,
2909 prio => 0,
2910 cb => sub {
2911 cf::cleanup "SIG$signal"; 3433 cf::cleanup "SIG$signal";
2912 },
2913 ); 3434 };
2914 } 3435 }
2915} 3436}
2916 3437
2917sub write_runtime { 3438sub write_runtime_sync {
2918 my $runtime = "$LOCALDIR/runtime"; 3439 my $runtime = "$LOCALDIR/runtime";
2919 3440
2920 # first touch the runtime file to show we are still running: 3441 # first touch the runtime file to show we are still running:
2921 # the fsync below can take a very very long time. 3442 # the fsync below can take a very very long time.
2922 3443
2948 and return; 3469 and return;
2949 3470
2950 warn "runtime file written.\n"; 3471 warn "runtime file written.\n";
2951 3472
2952 1 3473 1
3474}
3475
3476our $uuid_lock;
3477our $uuid_skip;
3478
3479sub write_uuid_sync($) {
3480 $uuid_skip ||= $_[0];
3481
3482 return if $uuid_lock;
3483 local $uuid_lock = 1;
3484
3485 my $uuid = "$LOCALDIR/uuid";
3486
3487 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3488 or return;
3489
3490 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3491 $uuid_skip = 0;
3492
3493 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3494 and return;
3495
3496 # always fsync - this file is important
3497 aio_fsync $fh
3498 and return;
3499
3500 close $fh
3501 or return;
3502
3503 aio_rename "$uuid~", $uuid
3504 and return;
3505
3506 warn "uuid file written ($value).\n";
3507
3508 1
3509
3510}
3511
3512sub write_uuid($$) {
3513 my ($skip, $sync) = @_;
3514
3515 $sync ? write_uuid_sync $skip
3516 : async { write_uuid_sync $skip };
2953} 3517}
2954 3518
2955sub emergency_save() { 3519sub emergency_save() {
2956 my $freeze_guard = cf::freeze_mainloop; 3520 my $freeze_guard = cf::freeze_mainloop;
2957 3521
2963 # and maps saved/destroyed asynchronously. 3527 # and maps saved/destroyed asynchronously.
2964 warn "begin emergency player save\n"; 3528 warn "begin emergency player save\n";
2965 for my $login (keys %cf::PLAYER) { 3529 for my $login (keys %cf::PLAYER) {
2966 my $pl = $cf::PLAYER{$login} or next; 3530 my $pl = $cf::PLAYER{$login} or next;
2967 $pl->valid or next; 3531 $pl->valid or next;
3532 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2968 $pl->save; 3533 $pl->save;
2969 } 3534 }
2970 warn "end emergency player save\n"; 3535 warn "end emergency player save\n";
2971 3536
2972 warn "begin emergency map save\n"; 3537 warn "begin emergency map save\n";
2978 warn "end emergency map save\n"; 3543 warn "end emergency map save\n";
2979 3544
2980 warn "begin emergency database checkpoint\n"; 3545 warn "begin emergency database checkpoint\n";
2981 BDB::db_env_txn_checkpoint $DB_ENV; 3546 BDB::db_env_txn_checkpoint $DB_ENV;
2982 warn "end emergency database checkpoint\n"; 3547 warn "end emergency database checkpoint\n";
3548
3549 warn "begin write uuid\n";
3550 write_uuid_sync 1;
3551 warn "end write uuid\n";
2983 }; 3552 };
2984 3553
2985 warn "leave emergency perl save\n"; 3554 warn "leave emergency perl save\n";
2986} 3555}
2987 3556
3002 warn "reloading..."; 3571 warn "reloading...";
3003 3572
3004 warn "entering sync_job"; 3573 warn "entering sync_job";
3005 3574
3006 cf::sync_job { 3575 cf::sync_job {
3007 cf::write_runtime; # external watchdog should not bark 3576 cf::write_runtime_sync; # external watchdog should not bark
3008 cf::emergency_save; 3577 cf::emergency_save;
3009 cf::write_runtime; # external watchdog should not bark 3578 cf::write_runtime_sync; # external watchdog should not bark
3010 3579
3011 warn "syncing database to disk"; 3580 warn "syncing database to disk";
3012 BDB::db_env_txn_checkpoint $DB_ENV; 3581 BDB::db_env_txn_checkpoint $DB_ENV;
3013 3582
3014 # if anything goes wrong in here, we should simply crash as we already saved 3583 # if anything goes wrong in here, we should simply crash as we already saved
3015
3016 warn "cancelling all WF_AUTOCANCEL watchers";
3017 for (Event::all_watchers) {
3018 $_->cancel if $_->data & WF_AUTOCANCEL;
3019 }
3020 3584
3021 warn "flushing outstanding aio requests"; 3585 warn "flushing outstanding aio requests";
3022 for (;;) { 3586 for (;;) {
3023 BDB::flush; 3587 BDB::flush;
3024 IO::AIO::flush; 3588 IO::AIO::flush;
3025 Coro::cede; 3589 Coro::cede_notself;
3026 last unless IO::AIO::nreqs || BDB::nreqs; 3590 last unless IO::AIO::nreqs || BDB::nreqs;
3027 warn "iterate..."; 3591 warn "iterate...";
3028 } 3592 }
3029 3593
3030 ++$RELOAD; 3594 ++$RELOAD;
3089 warn "reloading cf.pm"; 3653 warn "reloading cf.pm";
3090 require cf; 3654 require cf;
3091 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3655 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3092 3656
3093 warn "loading config and database again"; 3657 warn "loading config and database again";
3094 cf::cfg_load; 3658 cf::reload_config;
3095 3659
3096 warn "loading extensions"; 3660 warn "loading extensions";
3097 cf::load_extensions; 3661 cf::load_extensions;
3098 3662
3099 warn "reattaching attachments to objects/players"; 3663 warn "reattaching attachments to objects/players";
3106 warn "leaving sync_job"; 3670 warn "leaving sync_job";
3107 3671
3108 1 3672 1
3109 } or do { 3673 } or do {
3110 warn $@; 3674 warn $@;
3111 warn "error while reloading, exiting."; 3675 cf::cleanup "error while reloading, exiting.";
3112 exit 1;
3113 }; 3676 };
3114 3677
3115 warn "reloaded"; 3678 warn "reloaded";
3116}; 3679};
3117 3680
3119 3682
3120sub reload_perl() { 3683sub reload_perl() {
3121 # doing reload synchronously and two reloads happen back-to-back, 3684 # doing reload synchronously and two reloads happen back-to-back,
3122 # coro crashes during coro_state_free->destroy here. 3685 # coro crashes during coro_state_free->destroy here.
3123 3686
3124 $RELOAD_WATCHER ||= Event->timer ( 3687 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3125 reentrant => 0,
3126 after => 0,
3127 data => WF_AUTOCANCEL,
3128 cb => sub {
3129 do_reload_perl; 3688 do_reload_perl;
3130 undef $RELOAD_WATCHER; 3689 undef $RELOAD_WATCHER;
3131 },
3132 ); 3690 };
3133} 3691}
3134 3692
3135register_command "reload" => sub { 3693register_command "reload" => sub {
3136 my ($who, $arg) = @_; 3694 my ($who, $arg) = @_;
3137 3695
3138 if ($who->flag (FLAG_WIZ)) { 3696 if ($who->flag (FLAG_WIZ)) {
3139 $who->message ("reloading server."); 3697 $who->message ("reloading server.");
3698 async {
3699 $Coro::current->{desc} = "perl_reload";
3140 async { reload_perl }; 3700 reload_perl;
3701 };
3141 } 3702 }
3142}; 3703};
3143 3704
3144unshift @INC, $LIBDIR; 3705unshift @INC, $LIBDIR;
3145 3706
3147 3708
3148our @WAIT_FOR_TICK; 3709our @WAIT_FOR_TICK;
3149our @WAIT_FOR_TICK_BEGIN; 3710our @WAIT_FOR_TICK_BEGIN;
3150 3711
3151sub wait_for_tick { 3712sub wait_for_tick {
3152 return unless $TICK_WATCHER->is_active;
3153 return if $Coro::current == $Coro::main; 3713 return if tick_inhibit || $Coro::current == $Coro::main;
3154 3714
3155 my $signal = new Coro::Signal; 3715 my $signal = new Coro::Signal;
3156 push @WAIT_FOR_TICK, $signal; 3716 push @WAIT_FOR_TICK, $signal;
3157 $signal->wait; 3717 $signal->wait;
3158} 3718}
3159 3719
3160sub wait_for_tick_begin { 3720sub wait_for_tick_begin {
3161 return unless $TICK_WATCHER->is_active;
3162 return if $Coro::current == $Coro::main; 3721 return if tick_inhibit || $Coro::current == $Coro::main;
3163 3722
3164 my $signal = new Coro::Signal; 3723 my $signal = new Coro::Signal;
3165 push @WAIT_FOR_TICK_BEGIN, $signal; 3724 push @WAIT_FOR_TICK_BEGIN, $signal;
3166 $signal->wait; 3725 $signal->wait;
3167} 3726}
3168 3727
3169 my $min = 1e6;#d# 3728sub tick {
3170 my $avg = 10;
3171$TICK_WATCHER = Event->timer (
3172 reentrant => 0,
3173 parked => 1,
3174 prio => 0,
3175 at => $NEXT_TICK || $TICK,
3176 data => WF_AUTOCANCEL,
3177 cb => sub {
3178 if ($Coro::current != $Coro::main) { 3729 if ($Coro::current != $Coro::main) {
3179 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3730 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3180 unless ++$bug_warning > 10; 3731 unless ++$bug_warning > 10;
3181 return; 3732 return;
3182 } 3733 }
3183 3734
3184 $NOW = $tick_start = Event::time;
3185
3186 cf::server_tick; # one server iteration 3735 cf::server_tick; # one server iteration
3187 3736
3188 0 && sync_job {#d# 3737 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3189 for(1..10) { 3738 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3190 my $t = Event::time; 3739 Coro::async_pool {
3191 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3740 $Coro::current->{desc} = "runtime saver";
3192 or die; 3741 write_runtime_sync
3193 3742 or warn "ERROR: unable to write runtime file: $!";
3194 $map->width (50);
3195 $map->height (50);
3196 $map->alloc;
3197 $map->_load_objects ("/tmp/x.map", 1);
3198 my $t = Event::time - $t;
3199
3200 #next unless $t < 0.0013;#d#
3201 if ($t < $min) {
3202 $min = $t;
3203 }
3204 $avg = $avg * 0.99 + $t * 0.01;
3205 }
3206 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3207 exit 0;
3208 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3209 }; 3743 };
3744 }
3210 3745
3211 $RUNTIME += $TICK;
3212 $NEXT_TICK += $TICK;
3213
3214 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3215 $NEXT_RUNTIME_WRITE = $NOW + 10;
3216 Coro::async_pool {
3217 write_runtime
3218 or warn "ERROR: unable to write runtime file: $!";
3219 };
3220 }
3221
3222# my $AFTER = Event::time;
3223# warn $AFTER - $NOW;#d#
3224
3225 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3746 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3226 $sig->send; 3747 $sig->send;
3227 } 3748 }
3228 while (my $sig = shift @WAIT_FOR_TICK) { 3749 while (my $sig = shift @WAIT_FOR_TICK) {
3229 $sig->send; 3750 $sig->send;
3230 } 3751 }
3231 3752
3232 $NOW = Event::time; 3753 $LOAD = ($NOW - $TICK_START) / $TICK;
3233
3234 # if we are delayed by four ticks or more, skip them all
3235 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3236
3237 $TICK_WATCHER->at ($NEXT_TICK);
3238 $TICK_WATCHER->start;
3239
3240 $LOAD = ($NOW - $tick_start) / $TICK;
3241 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3754 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3242 3755
3243 _post_tick; 3756 if (0) {
3244 3757 if ($NEXT_TICK) {
3245 3758 my $jitter = $TICK_START - $NEXT_TICK;
3759 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3760 warn "jitter $JITTER\n";#d#
3761 }
3246 }, 3762 }
3247); 3763}
3248 3764
3249{ 3765{
3250 BDB::max_poll_time $TICK * 0.1; 3766 # configure BDB
3251 $BDB_POLL_WATCHER = Event->io ( 3767
3252 reentrant => 0,
3253 fd => BDB::poll_fileno,
3254 poll => 'r',
3255 prio => 0,
3256 data => WF_AUTOCANCEL,
3257 cb => \&BDB::poll_cb,
3258 );
3259 BDB::min_parallel 8; 3768 BDB::min_parallel 8;
3260 3769 BDB::max_poll_reqs $TICK * 0.1;
3261 BDB::set_sync_prepare { 3770 $Coro::BDB::WATCHER->priority (1);
3262 my $status;
3263 my $current = $Coro::current;
3264 (
3265 sub {
3266 $status = $!;
3267 $current->ready; undef $current;
3268 },
3269 sub {
3270 Coro::schedule while defined $current;
3271 $! = $status;
3272 },
3273 )
3274 };
3275 3771
3276 unless ($DB_ENV) { 3772 unless ($DB_ENV) {
3277 $DB_ENV = BDB::db_env_create; 3773 $DB_ENV = BDB::db_env_create;
3774 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3775 | BDB::LOG_AUTOREMOVE, 1);
3776 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3777 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3278 3778
3279 cf::sync_job { 3779 cf::sync_job {
3280 eval { 3780 eval {
3281 BDB::db_env_open 3781 BDB::db_env_open
3282 $DB_ENV, 3782 $DB_ENV,
3284 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3784 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3285 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3785 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3286 0666; 3786 0666;
3287 3787
3288 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3788 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3289
3290 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3291 $DB_ENV->set_lk_detect;
3292 }; 3789 };
3293 3790
3294 cf::cleanup "db_env_open(db): $@" if $@; 3791 cf::cleanup "db_env_open(db): $@" if $@;
3295 }; 3792 };
3296 } 3793 }
3794
3795 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3796 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3797 };
3798 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3799 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3800 };
3801 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3802 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3803 };
3297} 3804}
3298 3805
3299{ 3806{
3807 # configure IO::AIO
3808
3300 IO::AIO::min_parallel 8; 3809 IO::AIO::min_parallel 8;
3301
3302 undef $Coro::AIO::WATCHER;
3303 IO::AIO::max_poll_time $TICK * 0.1; 3810 IO::AIO::max_poll_time $TICK * 0.1;
3304 $AIO_POLL_WATCHER = Event->io ( 3811 $Coro::AIO::WATCHER->priority (1);
3305 reentrant => 0,
3306 data => WF_AUTOCANCEL,
3307 fd => IO::AIO::poll_fileno,
3308 poll => 'r',
3309 prio => 6,
3310 cb => \&IO::AIO::poll_cb,
3311 );
3312} 3812}
3313 3813
3314my $_log_backtrace; 3814my $_log_backtrace;
3315 3815
3316sub _log_backtrace { 3816sub _log_backtrace {
3320 3820
3321 # limit the # of concurrent backtraces 3821 # limit the # of concurrent backtraces
3322 if ($_log_backtrace < 2) { 3822 if ($_log_backtrace < 2) {
3323 ++$_log_backtrace; 3823 ++$_log_backtrace;
3324 async { 3824 async {
3825 $Coro::current->{desc} = "abt $msg";
3826
3325 my @bt = fork_call { 3827 my @bt = fork_call {
3326 @addr = map { sprintf "%x", $_ } @addr; 3828 @addr = map { sprintf "%x", $_ } @addr;
3327 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3829 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3328 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3830 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3329 or die "addr2line: $!"; 3831 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines