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.322 by root, Fri Jul 27 10:10:51 2007 UTC vs.
Revision 1.425 by root, Mon Apr 21 06:35:26 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}
322 }; 369
323 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
324 $guard 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
325} 383}
326 384
327=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
328 386
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
340our @SLOT_QUEUE; 398our @SLOT_QUEUE;
341our $SLOT_QUEUE; 399our $SLOT_QUEUE;
342 400
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
345 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
346 406
347 while () { 407 while () {
348 next_job: 408 next_job:
349 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
357 } 417 }
358 } 418 }
359 } 419 }
360 420
361 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 424 $signal->wait;
365 } else { 425 } else {
366 Coro::schedule; 426 Coro::schedule;
367 } 427 }
368 } 428 }
369}; 429};
370 430
371sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
372 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
373 435
374 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
376 438
390 452
391BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
392 454
393=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
394 456
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 458is 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 459partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 460acceptable.
399 461
400If 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
401the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
406 468
407sub sync_job(&) { 469sub sync_job(&) {
408 my ($job) = @_; 470 my ($job) = @_;
409 471
410 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 473 my $time = EV::time;
412 474
413 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
415 477
416 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
417 # (but this is cancel-safe) 479
418 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
419 481
420 my $busy = 1; 482 my $busy = 1;
421 my @res; 483 my @res;
422 484
423 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 487 @res = eval { $job->() };
425 warn $@ if $@; 488 warn $@ if $@;
426 undef $busy; 489 undef $busy;
427 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
428 491
429 while ($busy) { 492 while ($busy) {
430 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
431 } 497 }
498 }
432 499
433 $time = Event::time - $time; 500 my $time = EV::time - $time;
434 501
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 502 $TICK_START += $time; # do not account sync jobs to server load
439 503
440 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
441 } else { 505 } else {
442 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
443 507
468=item fork_call { }, $args 532=item fork_call { }, $args
469 533
470Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
474 538
475=cut 539=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 540
486sub fork_call(&@) { 541sub fork_call(&@) {
487 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
488 543
489# 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,
490# or die "socketpair: $!"; 545 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 546 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 547
494 if (my $pid = fork) { 548 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; 549 reset_signals;
508 local $SIG{__WARN__}; 550 &$cb
509 local $SIG{__DIE__}; 551 }, @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 552
516 eval { 553 wantarray ? @res : $res[-1]
517 close $fh1; 554}
518 555
519 my @res = eval { $cb->(@args) }; 556=item $coin = coin_from_name $name
520 557
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 558=cut
522 close $fh2;
523 };
524 559
525 warn $@ if $@; 560our %coin_alias = (
526 _exit 0; 561 "silver" => "silvercoin",
527 } 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
528} 581}
529 582
530=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
531 584
532Returns a single value from the environment database. 585Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 587=item cf::db_put $family => $key => $value
535 588
536Stores 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
537data 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).
538 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
539=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}
540 615
541our $DB; 616our $DB;
542 617
543sub db_init { 618sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 619 cf::sync_job {
548 eval { 620 $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 } 621 };
558} 622}
559 623
560sub db_get($$) { 624sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 625 my $key = "$_[0]/$_[1]";
562 626
612 if (1) { 676 if (1) {
613 $md5 = 677 $md5 =
614 join "\x00", 678 join "\x00",
615 $processversion, 679 $processversion,
616 map { 680 map {
617 Coro::cede; 681 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 682 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 683 } 0.. $#$src;
620 684
621 685
622 my $dbmd5 = db_get cache => "$id/md5"; 686 my $dbmd5 = db_get cache => "$id/md5";
666attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
668 732
669In 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>
670C<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
671Crossfire TRT). 735Deliantra).
672 736
673=over 4 737=over 4
674 738
675=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
676 740
958 } 1022 }
959 1023
960 0 1024 0
961} 1025}
962 1026
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 1028
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 1030
967Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
968 1032
974 1038
975=cut 1039=cut
976 1040
977############################################################################# 1041#############################################################################
978# object support 1042# object support
979#
980 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#
981sub _can_merge { 1077sub _can_merge {
982 my ($ob1, $ob2) = @_; 1078 my ($ob1, $ob2) = @_;
983 1079
984 local $Storable::canonical = 1; 1080 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1081
988 $fob1 eq $fob2 1082 # we do the slow way here
1083 return _object_equal $ob1, $ob2
989} 1084}
990 1085
991sub reattach { 1086sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1088 my ($obj) = @_;
1015cf::attachable->attach ( 1110cf::attachable->attach (
1016 prio => -1000000, 1111 prio => -1000000,
1017 on_instantiate => sub { 1112 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
1019 1114
1020 $data = from_json $data; 1115 $data = decode_json $data;
1021 1116
1022 for (@$data) { 1117 for (@$data) {
1023 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
1024 1119
1025 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
1041sub object_freezer_save { 1136sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
1043 1138
1044 sync_job { 1139 sync_job {
1045 if (length $$rdata) { 1140 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
1048 1144
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1146 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1149 close $fh;
1054 1150
1055 if (@$objs) { 1151 if (@$objs) {
1056 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) {
1057 chmod SAVE_MODE, $fh; 1153 chmod SAVE_MODE, $fh;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1157 close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1159 }
1071 } 1167 }
1072 } else { 1168 } else {
1073 aio_unlink $filename; 1169 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
1075 } 1171 }
1076 } 1172 };
1077} 1173}
1078 1174
1079sub object_freezer_as_string { 1175sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
1081 1177
1093 or return; 1189 or return;
1094 1190
1095 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1193 or return;
1194
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1099 } 1197 }
1100 1198
1199 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1202
1103 return ($data, $av); 1203 ($data, $av)
1104} 1204}
1105 1205
1106=head2 COMMAND CALLBACKS 1206=head2 COMMAND CALLBACKS
1107 1207
1108=over 4 1208=over 4
1186 my ($type, $reply, @payload) = 1286 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1287 "ARRAY" eq ref $msg
1188 ? @$msg 1288 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1289 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1290
1291 my @reply;
1292
1191 if (my $cb = $EXTCMD{$type}) { 1293 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1294 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1295 }
1296
1297 $pl->ext_reply ($reply, @reply)
1298 if $reply;
1299
1197 } else { 1300 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1302 }
1200 1303
1201 cf::override; 1304 cf::override;
1254 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1256 1359
1257 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1361 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1363 }
1262 1364
1263 warn $msg; 1365 warn $msg;
1264 } 1366 }
1265 1367
1290use Coro::AIO; 1392use Coro::AIO;
1291 1393
1292=head3 cf::player 1394=head3 cf::player
1293 1395
1294=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}
1295 1411
1296=item cf::player::find $login 1412=item cf::player::find $login
1297 1413
1298Returns the given player object, loading it if necessary (might block). 1414Returns the given player object, loading it if necessary (might block).
1299 1415
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1451 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1452 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1453 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1455
1340 my $pl = load_pl path $login 1456 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1457 or return;
1458
1459 my $pl = cf::player::load_pl $f
1460 or return;
1461 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1463 $cf::PLAYER{$login} = $pl
1343 } 1464 }
1344 } 1465 }
1345} 1466}
1346 1467
1355 return if $pl->{deny_save}; 1476 return if $pl->{deny_save};
1356 1477
1357 aio_mkdir playerdir $pl, 0770; 1478 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1479 $pl->{last_save} = $cf::RUNTIME;
1359 1480
1481 cf::get_slot 0.01;
1482
1360 $pl->save_pl ($path); 1483 $pl->save_pl ($path);
1361 Coro::cede; 1484 cf::cede_to_tick;
1362} 1485}
1363 1486
1364sub new($) { 1487sub new($) {
1365 my ($login) = @_; 1488 my ($login) = @_;
1366 1489
1370 $self->{deny_save} = 1; 1493 $self->{deny_save} = 1;
1371 1494
1372 $cf::PLAYER{$login} = $self; 1495 $cf::PLAYER{$login} = $self;
1373 1496
1374 $self 1497 $self
1498}
1499
1500=item $player->send_msg ($channel, $msg, $color, [extra...])
1501
1502=cut
1503
1504sub send_msg {
1505 my $ns = shift->ns
1506 or return;
1507 $ns->send_msg (@_);
1375} 1508}
1376 1509
1377=item $pl->quit_character 1510=item $pl->quit_character
1378 1511
1379Nukes the player without looking back. If logged in, the connection will 1512Nukes the player without looking back. If logged in, the connection will
1434 or return []; 1567 or return [];
1435 1568
1436 my @logins; 1569 my @logins;
1437 1570
1438 for my $login (@$dirs) { 1571 for my $login (@$dirs) {
1572 my $path = path $login;
1573
1574 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1577 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1578 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 }
1442 1580
1443 utf8::decode $login; 1581 utf8::decode $login;
1444 push @logins, $login; 1582 push @logins, $login;
1445 } 1583 }
1446 1584
1479 1617
1480Expand crossfire pod fragments into protocol xml. 1618Expand crossfire pod fragments into protocol xml.
1481 1619
1482=cut 1620=cut
1483 1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1484sub expand_cfpod { 1633sub expand_cfpod {
1485 ((my $self), (local $_)) = @_; 1634 my ($self, $pod) = @_;
1486 1635
1487 # escape & and < 1636 my $xml;
1488 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g;
1490 1637
1491 # this is buggy, it needs to properly take care of nested <'s 1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1492 1641
1493 1 while 1642 $group =~ s/&/&amp;/g;
1494 # replace B<>, I<>, U<> etc. 1643 $group =~ s/</&lt;/g;
1495 s/B<([^\>]*)>/<b>$1<\/b>/ 1644
1496 || s/I<([^\>]*)>/<i>$1<\/i>/ 1645 $xml .= $group;
1497 || s/U<([^\>]*)>/<u>$1<\/u>/ 1646 } elsif ($pod =~ m%\G
1498 # replace G<male|female> tags 1647 ([BCGHITU])
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1648 <
1500 $self->gender ? $2 : $1 1649 (?:
1501 }ge 1650 ([^<>]*) (?{ $group = $^N })
1502 # replace H<hint text> 1651 | < $interior >
1503 || s{H<([^\>]*)>} 1652 )
1653 >
1654 %gcsx
1504 { 1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "") 1675 "")
1508 [$self->{hintmode}] 1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1509 }ge; 1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1510 1687
1688 for ($xml) {
1511 # create single paragraphs (very hackish) 1689 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g; 1690 s/(?<=\S)\n(?=\w)/ /g;
1513 1691
1514 # compress some whitespace 1692 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends 1693 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines 1694 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines 1695 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines 1696 s/\n+$//; # ending lines
1697 }
1519 1698
1520 $_ 1699 $xml
1521} 1700}
1701
1702no re 'eval';
1522 1703
1523sub hintmode { 1704sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1; 1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode} 1706 $_[0]{hintmode}
1526} 1707}
1532=cut 1713=cut
1533 1714
1534sub ext_reply($$@) { 1715sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1716 my ($self, $id, @msg) = @_;
1536 1717
1537 if ($self->ns->extcmd == 2) { 1718 $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} 1719}
1545 1720
1546=item $player->ext_msg ($type, @msg) 1721=item $player->ext_msg ($type, @msg)
1547 1722
1548Sends an ext event to the client. 1723Sends an ext event to the client.
1604our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1605our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1606 1781
1607sub generate_random_map { 1782sub generate_random_map {
1608 my ($self, $rmp) = @_; 1783 my ($self, $rmp) = @_;
1784
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786
1609 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1610 $self->_create_random_map ( 1788 $self->_create_random_map (
1611 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1612 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1613 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1735 1913
1736# the temporary/swap location 1914# the temporary/swap location
1737sub save_path { 1915sub save_path {
1738 my ($self) = @_; 1916 my ($self) = @_;
1739 1917
1740 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1741 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1742} 1920}
1743 1921
1744# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1745sub uniq_path { 1923sub uniq_path {
1746 my ($self) = @_; 1924 my ($self) = @_;
1747 1925
1748 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1749 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1750} 1928}
1751 1929
1752# and all this just because we cannot iterate over 1930# and all this just because we cannot iterate over
1753# all maps in C++... 1931# all maps in C++...
1776 1954
1777sub load_header_from($) { 1955sub load_header_from($) {
1778 my ($self, $path) = @_; 1956 my ($self, $path) = @_;
1779 1957
1780 utf8::encode $path; 1958 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1959 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 or return; 1960 or return;
1961
1962 $self->_load_header ($f)
1963 or return;
1964
1965 local $MAP_LOADING{$self->{path}} = $self;
1966 $f->resolve_delayed_derefs;
1786 1967
1787 $self->{load_path} = $path; 1968 $self->{load_path} = $path;
1788 1969
1789 1 1970 1
1790} 1971}
1844sub find { 2025sub find {
1845 my ($path, $origin) = @_; 2026 my ($path, $origin) = @_;
1846 2027
1847 $path = normalise $path, $origin && $origin->path; 2028 $path = normalise $path, $origin && $origin->path;
1848 2029
2030 cf::lock_wait "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 2031 cf::lock_wait "map_find:$path";
1850 2032
1851 $cf::MAP{$path} || do { 2033 $cf::MAP{$path} || do {
1852 my $guard = cf::lock_acquire "map_find:$path"; 2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
1853 my $map = new_from_path cf::map $path 2037 my $map = new_from_path cf::map $path
1854 or return; 2038 or return;
1855 2039
1856 $map->{last_save} = $cf::RUNTIME; 2040 $map->{last_save} = $cf::RUNTIME;
1857 2041
1859 or return; 2043 or return;
1860 2044
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 2046 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 2047 #$cf::WAIT_FOR_TICK->wait;
2048 undef $guard1;
2049 undef $guard2;
1864 $map->reset; 2050 $map->reset;
1865 undef $guard;
1866 return find $path; 2051 return find $path;
1867 } 2052 }
1868 2053
1869 $cf::MAP{$path} = $map 2054 $cf::MAP{$path} = $map
1870 } 2055 }
1879 local $self->{deny_reset} = 1; # loading can take a long time 2064 local $self->{deny_reset} = 1; # loading can take a long time
1880 2065
1881 my $path = $self->{path}; 2066 my $path = $self->{path};
1882 2067
1883 { 2068 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 2069 my $guard = cf::lock_acquire "map_data:$path";
1885 2070
2071 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 2072 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 2073
1888 $self->in_memory (cf::MAP_LOADING); 2074 $self->in_memory (cf::MAP_LOADING);
1889 2075
1890 $self->alloc; 2076 $self->alloc;
1891 2077
1892 $self->pre_load; 2078 $self->pre_load;
1893 Coro::cede; 2079 cf::cede_to_tick;
1894 2080
2081 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 2083 $self->_load_objects ($f)
1896 or return; 2084 or return;
1897 2085
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1899 if delete $self->{load_original}; 2087 if delete $self->{load_original};
1900 2088
1901 if (my $uniq = $self->uniq_path) { 2089 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 2090 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 2091 unless (aio_stat $uniq) {
2092 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 2093 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 2094 $self->_load_objects ($f);
2095 $f->resolve_delayed_derefs;
2096 }
1906 } 2097 }
1907 } 2098 }
1908 2099
1909 Coro::cede; 2100 $f->resolve_delayed_derefs;
2101
2102 cf::cede_to_tick;
1910 # now do the right thing for maps 2103 # now do the right thing for maps
1911 $self->link_multipart_objects; 2104 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 2105 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 2106 unless $self->difficulty;
1914 Coro::cede; 2107 cf::cede_to_tick;
1915 2108
1916 unless ($self->{deny_activate}) { 2109 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 2110 $self->decay_objects;
1918 $self->fix_auto_apply; 2111 $self->fix_auto_apply;
1919 $self->update_buttons; 2112 $self->update_buttons;
1920 Coro::cede; 2113 cf::cede_to_tick;
1921 $self->set_darkness_map; 2114 $self->set_darkness_map;
1922 Coro::cede; 2115 cf::cede_to_tick;
1923 $self->activate; 2116 $self->activate;
1924 } 2117 }
1925 2118
2119 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME);
2121
1926 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
1927 } 2123 }
1928 2124
1929 $self->post_load; 2125 $self->post_load;
1930} 2126}
1931 2127
1940 2136
1941 $self 2137 $self
1942} 2138}
1943 2139
1944# find and load all maps in the 3x3 area around a map 2140# find and load all maps in the 3x3 area around a map
1945sub load_diag { 2141sub load_neighbours {
1946 my ($map) = @_; 2142 my ($map) = @_;
1947 2143
1948 my @diag; # diagonal neighbours 2144 my @neigh; # diagonal neighbours
1949 2145
1950 for (0 .. 3) { 2146 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 2147 my $neigh = $map->tile_path ($_)
1952 or next; 2148 or next;
1953 $neigh = find $neigh, $map 2149 $neigh = find $neigh, $map
1954 or next; 2150 or next;
1955 $neigh->load; 2151 $neigh->load;
1956 2152
2153 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2154 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2155 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 2156 }
1960 2157
1961 for (@diag) { 2158 for (grep defined $_->[0], @neigh) {
2159 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 2160 my $neigh = find $path, $origin
1963 or next; 2161 or next;
1964 $neigh->load; 2162 $neigh->load;
1965 } 2163 }
1966} 2164}
1967 2165
1972} 2170}
1973 2171
1974sub do_load_sync { 2172sub do_load_sync {
1975 my ($map) = @_; 2173 my ($map) = @_;
1976 2174
2175 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2176 if $Coro::current == $Coro::main;
2177
1977 cf::sync_job { $map->load }; 2178 cf::sync_job { $map->load };
1978} 2179}
1979 2180
1980our %MAP_PREFETCH; 2181our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 2182our $MAP_PREFETCHER = undef;
1982 2183
1983sub find_async { 2184sub find_async {
1984 my ($path, $origin) = @_; 2185 my ($path, $origin, $load) = @_;
1985 2186
1986 $path = normalise $path, $origin && $origin->{path}; 2187 $path = normalise $path, $origin && $origin->{path};
1987 2188
1988 if (my $map = $cf::MAP{$path}) { 2189 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1990 } 2191 }
1991 2192
1992 undef $MAP_PREFETCH{$path}; 2193 $MAP_PREFETCH{$path} |= $load;
2194
1993 $MAP_PREFETCHER ||= cf::async { 2195 $MAP_PREFETCHER ||= cf::async {
2196 $Coro::current->{desc} = "map prefetcher";
2197
1994 while (%MAP_PREFETCH) { 2198 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 2199 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 2200 if (my $map = find $k) {
1997 $map->load; 2201 $map->load if $v;
1998 } 2202 }
1999 2203
2000 delete $MAP_PREFETCH{$path}; 2204 delete $MAP_PREFETCH{$k};
2001 } 2205 }
2002 } 2206 }
2003 undef $MAP_PREFETCHER; 2207 undef $MAP_PREFETCHER;
2004 }; 2208 };
2005 $MAP_PREFETCHER->prio (6); 2209 $MAP_PREFETCHER->prio (6);
2008} 2212}
2009 2213
2010sub save { 2214sub save {
2011 my ($self) = @_; 2215 my ($self) = @_;
2012 2216
2013 my $lock = cf::lock_acquire "map_data:" . $self->path; 2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
2014 2218
2015 $self->{last_save} = $cf::RUNTIME; 2219 $self->{last_save} = $cf::RUNTIME;
2016 2220
2017 return unless $self->dirty; 2221 return unless $self->dirty;
2018 2222
2024 return if $self->{deny_save}; 2228 return if $self->{deny_save};
2025 2229
2026 local $self->{last_access} = $self->last_access;#d# 2230 local $self->{last_access} = $self->last_access;#d#
2027 2231
2028 cf::async { 2232 cf::async {
2233 $Coro::current->{desc} = "map player save";
2029 $_->contr->save for $self->players; 2234 $_->contr->save for $self->players;
2030 }; 2235 };
2236
2237 cf::get_slot 0.02;
2031 2238
2032 if ($uniq) { 2239 if ($uniq) {
2033 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2240 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2034 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2241 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2035 } else { 2242 } else {
2041 my ($self) = @_; 2248 my ($self) = @_;
2042 2249
2043 # save first because save cedes 2250 # save first because save cedes
2044 $self->save; 2251 $self->save;
2045 2252
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2254
2048 return if $self->players; 2255 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY; 2256 return if $self->in_memory != cf::MAP_ACTIVE;
2050 return if $self->{deny_save}; 2257 return if $self->{deny_save};
2051 2258
2259 $self->in_memory (cf::MAP_SWAPPED);
2260
2261 $self->deactivate;
2262 $_->clear_links_to ($self) for values %cf::MAP;
2052 $self->clear; 2263 $self->clear;
2053 $self->in_memory (cf::MAP_SWAPPED);
2054} 2264}
2055 2265
2056sub reset_at { 2266sub reset_at {
2057 my ($self) = @_; 2267 my ($self) = @_;
2058 2268
2090 if $uniq; 2300 if $uniq;
2091 } 2301 }
2092 2302
2093 delete $cf::MAP{$self->path}; 2303 delete $cf::MAP{$self->path};
2094 2304
2305 $self->deactivate;
2306 $_->clear_links_to ($self) for values %cf::MAP;
2095 $self->clear; 2307 $self->clear;
2096
2097 $_->clear_links_to ($self) for values %cf::MAP;
2098 2308
2099 $self->unlink_save; 2309 $self->unlink_save;
2100 $self->destroy; 2310 $self->destroy;
2101} 2311}
2102 2312
2103my $nuke_counter = "aaaa"; 2313my $nuke_counter = "aaaa";
2104 2314
2105sub nuke { 2315sub nuke {
2106 my ($self) = @_; 2316 my ($self) = @_;
2107 2317
2318 {
2319 my $lock = cf::lock_acquire "map_data:$self->{path}";
2320
2108 delete $cf::MAP{$self->path}; 2321 delete $cf::MAP{$self->path};
2109 2322
2110 $self->unlink_save; 2323 $self->unlink_save;
2111 2324
2112 bless $self, "cf::map"; 2325 bless $self, "cf::map";
2113 delete $self->{deny_reset}; 2326 delete $self->{deny_reset};
2114 $self->{deny_save} = 1; 2327 $self->{deny_save} = 1;
2115 $self->reset_timeout (1); 2328 $self->reset_timeout (1);
2116 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2329 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117 2330
2118 $cf::MAP{$self->path} = $self; 2331 $cf::MAP{$self->path} = $self;
2332 }
2119 2333
2120 $self->reset; # polite request, might not happen 2334 $self->reset; # polite request, might not happen
2121} 2335}
2122 2336
2123=item $maps = cf::map::tmp_maps 2337=item $maps = cf::map::tmp_maps
2165 2379
2166sub unique_maps() { 2380sub unique_maps() {
2167 [ 2381 [
2168 map { 2382 map {
2169 utf8::decode $_; 2383 utf8::decode $_;
2170 /\.map$/ 2384 s/\.map$//; # TODO future compatibility hack
2385 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2386 ? ()
2171 ? normalise $_ 2387 : normalise $_
2172 : ()
2173 } @{ aio_readdir $UNIQUEDIR or [] } 2388 } @{ aio_readdir $UNIQUEDIR or [] }
2174 ] 2389 ]
2175} 2390}
2176 2391
2177package cf;
2178
2179=back 2392=back
2180 2393
2181=head3 cf::object 2394=head3 cf::object
2182 2395
2183=cut 2396=cut
2186 2399
2187=over 4 2400=over 4
2188 2401
2189=item $ob->inv_recursive 2402=item $ob->inv_recursive
2190 2403
2191Returns the inventory of the object _and_ their inventories, recursively. 2404Returns the inventory of the object I<and> their inventories, recursively,
2405but I<not> the object itself.
2192 2406
2193=cut 2407=cut
2194 2408
2195sub inv_recursive_; 2409sub inv_recursive_;
2196sub inv_recursive_ { 2410sub inv_recursive_ {
2197 map { $_, inv_recursive_ $_->inv } @_ 2411 map { $_, inv_recursive_ $_->inv } @_
2198} 2412}
2199 2413
2200sub inv_recursive { 2414sub inv_recursive {
2201 inv_recursive_ inv $_[0] 2415 inv_recursive_ inv $_[0]
2416}
2417
2418=item $ref = $ob->ref
2419
2420Creates and returns a persistent reference to an object that can be stored as a string.
2421
2422=item $ob = cf::object::deref ($refstring)
2423
2424returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2425even if the object actually exists. May block.
2426
2427=cut
2428
2429sub deref {
2430 my ($ref) = @_;
2431
2432 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2433 my ($uuid, $name) = ($1, $2);
2434 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2435 or return;
2436 $pl->ob->uuid eq $uuid
2437 or return;
2438
2439 $pl->ob
2440 } else {
2441 warn "$ref: cannot resolve object reference\n";
2442 undef
2443 }
2202} 2444}
2203 2445
2204package cf; 2446package cf;
2205 2447
2206=back 2448=back
2240 $self->message ($msg, $flags); 2482 $self->message ($msg, $flags);
2241 } 2483 }
2242 } 2484 }
2243} 2485}
2244 2486
2487=item $object->send_msg ($channel, $msg, $color, [extra...])
2488
2489=cut
2490
2491sub cf::object::send_msg {
2492 my $pl = shift->contr
2493 or return;
2494 $pl->send_msg (@_);
2495}
2496
2245=item $player_object->may ("access") 2497=item $player_object->may ("access")
2246 2498
2247Returns wether the given player is authorized to access resource "access" 2499Returns wether the given player is authorized to access resource "access"
2248(e.g. "command_wizcast"). 2500(e.g. "command_wizcast").
2249 2501
2326 # use -1 or undef as default coordinates, not 0, 0 2578 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2579 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2580 if $x <=0 && $y <= 0;
2329 2581
2330 $map->load; 2582 $map->load;
2331 $map->load_diag; 2583 $map->load_neighbours;
2332 2584
2333 return unless $self->contr->active; 2585 return unless $self->contr->active;
2334 $self->activate_recursive; 2586 $self->activate_recursive;
2335 2587
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2356 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2357 2609
2358 $self->enter_link; 2610 $self->enter_link;
2359 2611
2360 (async { 2612 (async {
2613 $Coro::current->{desc} = "player::goto $path $x $y";
2614
2615 # *tag paths override both path and x|y
2616 if ($path =~ /^\*(.*)$/) {
2617 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2618 my $ob = $obs[rand @obs];
2619
2620 # see if we actually can go there
2621 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2622 $ob = $obs[rand @obs];
2623 } else {
2624 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2625 }
2626 # else put us there anyways for now #d#
2627
2628 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2629 } else {
2630 ($path, $x, $y) = (undef, undef, undef);
2631 }
2632 }
2633
2361 my $map = eval { 2634 my $map = eval {
2362 my $map = cf::map::find $path; 2635 my $map = defined $path ? cf::map::find $path : undef;
2363 2636
2364 if ($map) { 2637 if ($map) {
2365 $map = $map->customise_for ($self); 2638 $map = $map->customise_for ($self);
2366 $map = $check->($map) if $check && $map; 2639 $map = $check->($map) if $check && $map;
2367 } else { 2640 } else {
2368 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2641 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2369 } 2642 }
2370 2643
2371 $map 2644 $map
2372 }; 2645 };
2373 2646
2426 $rmp->{origin_y} = $exit->y; 2699 $rmp->{origin_y} = $exit->y;
2427 } 2700 }
2428 2701
2429 $rmp->{random_seed} ||= $exit->random_seed; 2702 $rmp->{random_seed} ||= $exit->random_seed;
2430 2703
2431 my $data = cf::to_json $rmp; 2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2432 my $md5 = Digest::MD5::md5_hex $data; 2705 my $md5 = Digest::MD5::md5_hex $data;
2433 my $meta = "$RANDOMDIR/$md5.meta"; 2706 my $meta = "$RANDOMDIR/$md5.meta";
2434 2707
2435 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2436 aio_write $fh, 0, (length $data), $data, 0; 2709 aio_write $fh, 0, (length $data), $data, 0;
2463 # if exit is damned, update players death & WoR home-position 2736 # if exit is damned, update players death & WoR home-position
2464 $self->contr->savebed ($slaying, $hp, $sp) 2737 $self->contr->savebed ($slaying, $hp, $sp)
2465 if $exit->flag (FLAG_DAMNED); 2738 if $exit->flag (FLAG_DAMNED);
2466 2739
2467 (async { 2740 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2742
2468 $self->deactivate_recursive; # just to be sure 2743 $self->deactivate_recursive; # just to be sure
2469 unless (eval { 2744 unless (eval {
2470 $self->goto ($slaying, $hp, $sp); 2745 $self->goto ($slaying, $hp, $sp);
2471 2746
2472 1; 2747 1;
2507the message, with C<log> being the default. If C<$color> is negative, suppress 2782the message, with C<log> being the default. If C<$color> is negative, suppress
2508the message unless the client supports the msg packet. 2783the message unless the client supports the msg packet.
2509 2784
2510=cut 2785=cut
2511 2786
2787# non-persistent channels (usually the info channel)
2788our %CHANNEL = (
2789 "c/identify" => {
2790 id => "infobox",
2791 title => "Identify",
2792 reply => undef,
2793 tooltip => "Items recently identified",
2794 },
2795 "c/examine" => {
2796 id => "infobox",
2797 title => "Examine",
2798 reply => undef,
2799 tooltip => "Signs and other items you examined",
2800 },
2801 "c/book" => {
2802 id => "infobox",
2803 title => "Book",
2804 reply => undef,
2805 tooltip => "The contents of a note or book",
2806 },
2807 "c/lookat" => {
2808 id => "infobox",
2809 title => "Look",
2810 reply => undef,
2811 tooltip => "What you saw there",
2812 },
2813 "c/who" => {
2814 id => "infobox",
2815 title => "Players",
2816 reply => undef,
2817 tooltip => "Shows players who are currently online",
2818 },
2819 "c/body" => {
2820 id => "infobox",
2821 title => "Body Parts",
2822 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available",
2824 },
2825 "c/uptime" => {
2826 id => "infobox",
2827 title => "Uptime",
2828 reply => undef,
2829 tooltip => "How long the server has been running since last restart",
2830 },
2831 "c/mapinfo" => {
2832 id => "infobox",
2833 title => "Map Info",
2834 reply => undef,
2835 tooltip => "Information related to the maps",
2836 },
2837);
2838
2512sub cf::client::send_msg { 2839sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2840 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2841
2515 $msg = $self->pl->expand_cfpod ($msg); 2842 $msg = $self->pl->expand_cfpod ($msg);
2516 2843
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 2844 $color &= cf::NDI_CLIENT_MASK; # just in case...
2518 2845
2846 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel};
2849
2850 $self->ext_msg (channel_info => $channel)
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id};
2854
2519 if (ref $channel) { 2855 } elsif (ref $channel) {
2520 # send meta info to client, if not yet sent 2856 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2857 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2858 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => $channel); 2859 $self->ext_msg (channel_info => $channel)
2860 if $self->can_msg;
2524 } 2861 }
2525 2862
2526 $channel = $channel->{id}; 2863 $channel = $channel->{id};
2527 } 2864 }
2528 2865
2529 return unless @extra || length $msg; 2866 return unless @extra || length $msg;
2530 2867
2531 if ($self->can_msg) { 2868 if ($self->can_msg) {
2869 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF;
2872
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2873 $self->send_packet ("msg " . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2533 } else { 2875 } 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) { 2876 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones
2878 for ($msg) {
2879 1 while
2880 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2881 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2882 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2883 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2884 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2885 }
2886
2887 $color &= cf::NDI_COLOR_MASK;
2888
2889 utf8::encode $msg;
2890
2545 if (0 && $msg =~ /\[/) { 2891 if (0 && $msg =~ /\[/) {
2892 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2893 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else { 2894 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2895 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg") 2896 $self->send_packet ("drawinfo $color $msg")
2550 } 2897 }
2551 } 2898 }
2559=cut 2906=cut
2560 2907
2561sub cf::client::ext_msg($$@) { 2908sub cf::client::ext_msg($$@) {
2562 my ($self, $type, @msg) = @_; 2909 my ($self, $type, @msg) = @_;
2563 2910
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) { 2911 if ($self->extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove 2913 } elsif ($self->extcmd == 1) { # TODO: remove
2569 push @msg, msgtype => "event_$type"; 2914 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 }
2917}
2918
2919=item $client->ext_reply ($msgid, @msg)
2920
2921Sends an ext reply to the client.
2922
2923=cut
2924
2925sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_;
2927
2928 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id;
2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 } 2934 }
2572} 2935}
2573 2936
2574=item $success = $client->query ($flags, "text", \&cb) 2937=item $success = $client->query ($flags, "text", \&cb)
2636 my ($type, $reply, @payload) = 2999 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg 3000 "ARRAY" eq ref $msg
2638 ? @$msg 3001 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3002 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640 3003
3004 my @reply;
3005
2641 if (my $cb = $EXTICMD{$type}) { 3006 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload); 3007 @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 } 3008 }
3009
3010 $ns->ext_reply ($reply, @reply)
3011 if $reply;
3012
2647 } else { 3013 } else {
2648 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3014 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2649 } 3015 }
2650 3016
2651 cf::override; 3017 cf::override;
2698our $safe = new Safe "safe"; 3064our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 3065our $safe_hole = new Safe::Hole;
2700 3066
2701$SIG{FPE} = 'IGNORE'; 3067$SIG{FPE} = 'IGNORE';
2702 3068
2703$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3069$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math
3071 grepstart grepwhile mapstart mapwhile
3072 sort time
3073));
2704 3074
2705# here we export the classes and methods available to script code 3075# here we export the classes and methods available to script code
2706 3076
2707=pod 3077=pod
2708 3078
2709The following functions and methods are available within a safe environment: 3079The following functions and methods are available within a safe environment:
2710 3080
2711 cf::object 3081 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 3082 contr pay_amount pay_player map x y force_find force_add destroy
2713 insert remove 3083 insert remove name archname title slaying race decrease split
2714 3084
2715 cf::object::player 3085 cf::object::player
2716 player 3086 player
2717 3087
2718 cf::player 3088 cf::player
2723 3093
2724=cut 3094=cut
2725 3095
2726for ( 3096for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove)], 3098 insert remove inv name archname title slaying race
3099 decrease split destroy)],
2729 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
2732) { 3103) {
2733 no strict 'refs'; 3104 no strict 'refs';
2809# the server's init and main functions 3180# the server's init and main functions
2810 3181
2811sub load_facedata($) { 3182sub load_facedata($) {
2812 my ($path) = @_; 3183 my ($path) = @_;
2813 3184
3185 # HACK to clear player env face cache, we need some signal framework
3186 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = ();
3188
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190
2814 warn "loading facedata from $path\n"; 3191 warn "loading facedata from $path\n";
2815 3192
2816 my $facedata; 3193 my $facedata;
2817 0 < aio_load $path, $facedata 3194 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 3195 or die "$path: $!";
2820 $facedata = Coro::Storable::thaw $facedata; 3197 $facedata = Coro::Storable::thaw $facedata;
2821 3198
2822 $facedata->{version} == 2 3199 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3200 or cf::cleanup "$path: version mismatch, cannot proceed.";
2824 3201
3202 # patch in the exptable
3203 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC,
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3206 };
3207 cf::cede_to_tick;
3208
2825 { 3209 {
2826 my $faces = $facedata->{faceinfo}; 3210 my $faces = $facedata->{faceinfo};
2827 3211
2828 while (my ($face, $info) = each %$faces) { 3212 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3213 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214
2830 cf::face::set_visibility $idx, $info->{visibility}; 3215 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3216 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3219
2835 cf::cede_to_tick; 3220 cf::cede_to_tick;
2836 } 3221 }
2837 3222
2838 while (my ($face, $info) = each %$faces) { 3223 while (my ($face, $info) = each %$faces) {
2839 next unless $info->{smooth}; 3224 next unless $info->{smooth};
3225
2840 my $idx = cf::face::find $face 3226 my $idx = cf::face::find $face
2841 or next; 3227 or next;
3228
2842 if (my $smooth = cf::face::find $info->{smooth}) { 3229 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth; 3230 cf::face::set_smooth $idx, $smooth;
2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2845 } else { 3232 } else {
2846 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3233 warn "smooth face '$info->{smooth}' not found for face '$face'";
2863 3250
2864 { 3251 {
2865 # TODO: for gcfclient pleasure, we should give resources 3252 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3253 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3254 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869
2870 my $soundconf = delete $res->{"res/sound.conf"};
2871 3255
2872 while (my ($name, $info) = each %$res) { 3256 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({ 3257 if (defined $info->{type}) {
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3258 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
2879 3260
2880 if ($info->{type} & 1) { 3261 if ($info->{type} & 1) {
2881 # prepend meta info 3262 # prepend meta info
2882 3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3269 $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3270 } else {
3271 $data = $info->{data};
3272 }
2885 3273
2886 cf::face::set_data $idx, 0, $data, $chk; 3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type};
2887 } else { 3276 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3277 $RESOURCE{$name} = $info;
2889 } 3278 }
2890 3279
2891 cf::face::set_type $idx, $info->{type};
2892
2893 cf::cede_to_tick; 3280 cf::cede_to_tick;
2894 } 3281 }
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
2905 cf::sound::set $sound->[0] => $face;
2906 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2907 }
2908
2909 #TODO
2910 }
2911 } 3282 }
3283
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2912 3285
2913 1 3286 1
2914} 3287}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
2915 3308
2916register_exticmd fx_want => sub { 3309register_exticmd fx_want => sub {
2917 my ($ns, $want) = @_; 3310 my ($ns, $want) = @_;
2918 3311
2919 while (my ($k, $v) = each %$want) { 3312 while (my ($k, $v) = each %$want) {
2920 $ns->fx_want ($k, $v); 3313 $ns->fx_want ($k, $v);
2921 } 3314 }
2922}; 3315};
2923 3316
3317sub load_resource_file($) {
3318 my $guard = lock_acquire "load_resource_file";
3319
3320 my $status = load_resource_file_ $_[0];
3321 get_slot 0.1, 100;
3322 cf::arch::commit_load;
3323
3324 $status
3325}
3326
2924sub reload_regions { 3327sub reload_regions {
3328 # HACK to clear player env face cache, we need some signal framework
3329 # for this (global event?)
3330 %ext::player_env::MUSIC_FACE_CACHE = ();
3331
2925 load_resource_file "$MAPDIR/regions" 3332 load_resource_file "$MAPDIR/regions"
2926 or die "unable to load regions file\n"; 3333 or die "unable to load regions file\n";
2927 3334
2928 for (cf::region::list) { 3335 for (cf::region::list) {
2929 $_->{match} = qr/$_->{match}/ 3336 $_->{match} = qr/$_->{match}/
2937} 3344}
2938 3345
2939sub reload_archetypes { 3346sub reload_archetypes {
2940 load_resource_file "$DATADIR/archetypes" 3347 load_resource_file "$DATADIR/archetypes"
2941 or die "unable to load archetypes\n"; 3348 or die "unable to load archetypes\n";
2942 #d# NEED to laod twice to resolve forward references
2943 # this really needs to be done in an extra post-pass
2944 # (which needs to be synchronous, so solve it differently)
2945 load_resource_file "$DATADIR/archetypes"
2946 or die "unable to load archetypes\n";
2947} 3349}
2948 3350
2949sub reload_treasures { 3351sub reload_treasures {
2950 load_resource_file "$DATADIR/treasures" 3352 load_resource_file "$DATADIR/treasures"
2951 or die "unable to load treasurelists\n"; 3353 or die "unable to load treasurelists\n";
2952} 3354}
2953 3355
2954sub reload_resources { 3356sub reload_resources {
2955 warn "reloading resource files...\n"; 3357 warn "reloading resource files...\n";
2956 3358
3359 reload_facedata;
3360 reload_archetypes;
2957 reload_regions; 3361 reload_regions;
2958 reload_facedata;
2959 #reload_archetypes;#d#
2960 reload_archetypes;
2961 reload_treasures; 3362 reload_treasures;
2962 3363
2963 warn "finished reloading resource files\n"; 3364 warn "finished reloading resource files\n";
2964} 3365}
2965 3366
2966sub init { 3367sub init {
3368 my $guard = freeze_mainloop;
3369
2967 reload_resources; 3370 reload_resources;
2968} 3371}
2969 3372
2970sub cfg_load { 3373sub reload_config {
2971 open my $fh, "<:utf8", "$CONFDIR/config" 3374 open my $fh, "<:utf8", "$CONFDIR/config"
2972 or return; 3375 or return;
2973 3376
2974 local $/; 3377 local $/;
2975 *CFG = YAML::Syck::Load <$fh>; 3378 *CFG = YAML::Load <$fh>;
2976 3379
2977 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3380 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2978 3381
2979 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3382 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2980 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3383 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2991sub main { 3394sub main {
2992 # we must not ever block the main coroutine 3395 # we must not ever block the main coroutine
2993 local $Coro::idle = sub { 3396 local $Coro::idle = sub {
2994 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3397 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2995 (async { 3398 (async {
2996 Event::one_event; 3399 $Coro::current->{desc} = "IDLE BUG HANDLER";
3400 EV::loop EV::LOOP_ONESHOT;
2997 })->prio (Coro::PRIO_MAX); 3401 })->prio (Coro::PRIO_MAX);
2998 }; 3402 };
2999 3403
3000 cfg_load; 3404 {
3405 my $guard = freeze_mainloop;
3406 reload_config;
3001 db_init; 3407 db_init;
3002 load_extensions; 3408 load_extensions;
3003 3409
3004 $TICK_WATCHER->start; 3410 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3411 evthread_start IO::AIO::poll_fileno;
3412 }
3413
3005 Event::loop; 3414 EV::loop;
3006} 3415}
3007 3416
3008############################################################################# 3417#############################################################################
3009# initialisation and cleanup 3418# initialisation and cleanup
3010 3419
3011# install some emergency cleanup handlers 3420# install some emergency cleanup handlers
3012BEGIN { 3421BEGIN {
3422 our %SIGWATCHER = ();
3013 for my $signal (qw(INT HUP TERM)) { 3423 for my $signal (qw(INT HUP TERM)) {
3014 Event->signal ( 3424 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3015 reentrant => 0,
3016 data => WF_AUTOCANCEL,
3017 signal => $signal,
3018 prio => 0,
3019 cb => sub {
3020 cf::cleanup "SIG$signal"; 3425 cf::cleanup "SIG$signal";
3021 },
3022 ); 3426 };
3023 } 3427 }
3024} 3428}
3025 3429
3026sub write_runtime { 3430sub write_runtime_sync {
3027 my $runtime = "$LOCALDIR/runtime"; 3431 my $runtime = "$LOCALDIR/runtime";
3028 3432
3029 # first touch the runtime file to show we are still running: 3433 # first touch the runtime file to show we are still running:
3030 # the fsync below can take a very very long time. 3434 # the fsync below can take a very very long time.
3031 3435
3057 and return; 3461 and return;
3058 3462
3059 warn "runtime file written.\n"; 3463 warn "runtime file written.\n";
3060 3464
3061 1 3465 1
3466}
3467
3468our $uuid_lock;
3469our $uuid_skip;
3470
3471sub write_uuid_sync($) {
3472 $uuid_skip ||= $_[0];
3473
3474 return if $uuid_lock;
3475 local $uuid_lock = 1;
3476
3477 my $uuid = "$LOCALDIR/uuid";
3478
3479 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3480 or return;
3481
3482 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3483 $uuid_skip = 0;
3484
3485 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3486 and return;
3487
3488 # always fsync - this file is important
3489 aio_fsync $fh
3490 and return;
3491
3492 close $fh
3493 or return;
3494
3495 aio_rename "$uuid~", $uuid
3496 and return;
3497
3498 warn "uuid file written ($value).\n";
3499
3500 1
3501
3502}
3503
3504sub write_uuid($$) {
3505 my ($skip, $sync) = @_;
3506
3507 $sync ? write_uuid_sync $skip
3508 : async { write_uuid_sync $skip };
3062} 3509}
3063 3510
3064sub emergency_save() { 3511sub emergency_save() {
3065 my $freeze_guard = cf::freeze_mainloop; 3512 my $freeze_guard = cf::freeze_mainloop;
3066 3513
3072 # and maps saved/destroyed asynchronously. 3519 # and maps saved/destroyed asynchronously.
3073 warn "begin emergency player save\n"; 3520 warn "begin emergency player save\n";
3074 for my $login (keys %cf::PLAYER) { 3521 for my $login (keys %cf::PLAYER) {
3075 my $pl = $cf::PLAYER{$login} or next; 3522 my $pl = $cf::PLAYER{$login} or next;
3076 $pl->valid or next; 3523 $pl->valid or next;
3524 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3077 $pl->save; 3525 $pl->save;
3078 } 3526 }
3079 warn "end emergency player save\n"; 3527 warn "end emergency player save\n";
3080 3528
3081 warn "begin emergency map save\n"; 3529 warn "begin emergency map save\n";
3087 warn "end emergency map save\n"; 3535 warn "end emergency map save\n";
3088 3536
3089 warn "begin emergency database checkpoint\n"; 3537 warn "begin emergency database checkpoint\n";
3090 BDB::db_env_txn_checkpoint $DB_ENV; 3538 BDB::db_env_txn_checkpoint $DB_ENV;
3091 warn "end emergency database checkpoint\n"; 3539 warn "end emergency database checkpoint\n";
3540
3541 warn "begin write uuid\n";
3542 write_uuid_sync 1;
3543 warn "end write uuid\n";
3092 }; 3544 };
3093 3545
3094 warn "leave emergency perl save\n"; 3546 warn "leave emergency perl save\n";
3095} 3547}
3096 3548
3111 warn "reloading..."; 3563 warn "reloading...";
3112 3564
3113 warn "entering sync_job"; 3565 warn "entering sync_job";
3114 3566
3115 cf::sync_job { 3567 cf::sync_job {
3116 cf::write_runtime; # external watchdog should not bark 3568 cf::write_runtime_sync; # external watchdog should not bark
3117 cf::emergency_save; 3569 cf::emergency_save;
3118 cf::write_runtime; # external watchdog should not bark 3570 cf::write_runtime_sync; # external watchdog should not bark
3119 3571
3120 warn "syncing database to disk"; 3572 warn "syncing database to disk";
3121 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3122 3574
3123 # if anything goes wrong in here, we should simply crash as we already saved 3575 # if anything goes wrong in here, we should simply crash as we already saved
3124
3125 warn "cancelling all WF_AUTOCANCEL watchers";
3126 for (Event::all_watchers) {
3127 $_->cancel if $_->data & WF_AUTOCANCEL;
3128 }
3129 3576
3130 warn "flushing outstanding aio requests"; 3577 warn "flushing outstanding aio requests";
3131 for (;;) { 3578 for (;;) {
3132 BDB::flush; 3579 BDB::flush;
3133 IO::AIO::flush; 3580 IO::AIO::flush;
3134 Coro::cede; 3581 Coro::cede_notself;
3135 last unless IO::AIO::nreqs || BDB::nreqs; 3582 last unless IO::AIO::nreqs || BDB::nreqs;
3136 warn "iterate..."; 3583 warn "iterate...";
3137 } 3584 }
3138 3585
3139 ++$RELOAD; 3586 ++$RELOAD;
3198 warn "reloading cf.pm"; 3645 warn "reloading cf.pm";
3199 require cf; 3646 require cf;
3200 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3647 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3201 3648
3202 warn "loading config and database again"; 3649 warn "loading config and database again";
3203 cf::cfg_load; 3650 cf::reload_config;
3204 3651
3205 warn "loading extensions"; 3652 warn "loading extensions";
3206 cf::load_extensions; 3653 cf::load_extensions;
3207 3654
3208 warn "reattaching attachments to objects/players"; 3655 warn "reattaching attachments to objects/players";
3215 warn "leaving sync_job"; 3662 warn "leaving sync_job";
3216 3663
3217 1 3664 1
3218 } or do { 3665 } or do {
3219 warn $@; 3666 warn $@;
3220 warn "error while reloading, exiting."; 3667 cf::cleanup "error while reloading, exiting.";
3221 exit 1;
3222 }; 3668 };
3223 3669
3224 warn "reloaded"; 3670 warn "reloaded";
3225}; 3671};
3226 3672
3228 3674
3229sub reload_perl() { 3675sub reload_perl() {
3230 # doing reload synchronously and two reloads happen back-to-back, 3676 # doing reload synchronously and two reloads happen back-to-back,
3231 # coro crashes during coro_state_free->destroy here. 3677 # coro crashes during coro_state_free->destroy here.
3232 3678
3233 $RELOAD_WATCHER ||= Event->timer ( 3679 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3234 reentrant => 0,
3235 after => 0,
3236 data => WF_AUTOCANCEL,
3237 cb => sub {
3238 do_reload_perl; 3680 do_reload_perl;
3239 undef $RELOAD_WATCHER; 3681 undef $RELOAD_WATCHER;
3240 },
3241 ); 3682 };
3242} 3683}
3243 3684
3244register_command "reload" => sub { 3685register_command "reload" => sub {
3245 my ($who, $arg) = @_; 3686 my ($who, $arg) = @_;
3246 3687
3247 if ($who->flag (FLAG_WIZ)) { 3688 if ($who->flag (FLAG_WIZ)) {
3248 $who->message ("reloading server."); 3689 $who->message ("reloading server.");
3690 async {
3691 $Coro::current->{desc} = "perl_reload";
3249 async { reload_perl }; 3692 reload_perl;
3693 };
3250 } 3694 }
3251}; 3695};
3252 3696
3253unshift @INC, $LIBDIR; 3697unshift @INC, $LIBDIR;
3254 3698
3256 3700
3257our @WAIT_FOR_TICK; 3701our @WAIT_FOR_TICK;
3258our @WAIT_FOR_TICK_BEGIN; 3702our @WAIT_FOR_TICK_BEGIN;
3259 3703
3260sub wait_for_tick { 3704sub wait_for_tick {
3261 return unless $TICK_WATCHER->is_active;
3262 return if $Coro::current == $Coro::main; 3705 return if tick_inhibit || $Coro::current == $Coro::main;
3263 3706
3264 my $signal = new Coro::Signal; 3707 my $signal = new Coro::Signal;
3265 push @WAIT_FOR_TICK, $signal; 3708 push @WAIT_FOR_TICK, $signal;
3266 $signal->wait; 3709 $signal->wait;
3267} 3710}
3268 3711
3269sub wait_for_tick_begin { 3712sub wait_for_tick_begin {
3270 return unless $TICK_WATCHER->is_active;
3271 return if $Coro::current == $Coro::main; 3713 return if tick_inhibit || $Coro::current == $Coro::main;
3272 3714
3273 my $signal = new Coro::Signal; 3715 my $signal = new Coro::Signal;
3274 push @WAIT_FOR_TICK_BEGIN, $signal; 3716 push @WAIT_FOR_TICK_BEGIN, $signal;
3275 $signal->wait; 3717 $signal->wait;
3276} 3718}
3277 3719
3278 my $min = 1e6;#d# 3720sub tick {
3279 my $avg = 10;
3280$TICK_WATCHER = Event->timer (
3281 reentrant => 0,
3282 parked => 1,
3283 prio => 0,
3284 at => $NEXT_TICK || $TICK,
3285 data => WF_AUTOCANCEL,
3286 cb => sub {
3287 if ($Coro::current != $Coro::main) { 3721 if ($Coro::current != $Coro::main) {
3288 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3722 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3289 unless ++$bug_warning > 10; 3723 unless ++$bug_warning > 10;
3290 return; 3724 return;
3291 } 3725 }
3292 3726
3293 $NOW = $tick_start = Event::time;
3294
3295 cf::server_tick; # one server iteration 3727 cf::server_tick; # one server iteration
3296 3728
3297 0 && sync_job {#d# 3729 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3298 for(1..10) { 3730 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3299 my $t = Event::time; 3731 Coro::async_pool {
3300 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3732 $Coro::current->{desc} = "runtime saver";
3301 or die; 3733 write_runtime_sync
3302 3734 or warn "ERROR: unable to write runtime file: $!";
3303 $map->width (50);
3304 $map->height (50);
3305 $map->alloc;
3306 $map->_load_objects ("/tmp/x.map", 1);
3307 my $t = Event::time - $t;
3308
3309 #next unless $t < 0.0013;#d#
3310 if ($t < $min) {
3311 $min = $t;
3312 }
3313 $avg = $avg * 0.99 + $t * 0.01;
3314 }
3315 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3316 exit 0;
3317 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3318 }; 3735 };
3736 }
3319 3737
3320 $RUNTIME += $TICK;
3321 $NEXT_TICK += $TICK;
3322
3323 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3324 $NEXT_RUNTIME_WRITE = $NOW + 10;
3325 Coro::async_pool {
3326 write_runtime
3327 or warn "ERROR: unable to write runtime file: $!";
3328 };
3329 }
3330
3331# my $AFTER = Event::time;
3332# warn $AFTER - $NOW;#d#
3333
3334 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3738 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3335 $sig->send; 3739 $sig->send;
3336 } 3740 }
3337 while (my $sig = shift @WAIT_FOR_TICK) { 3741 while (my $sig = shift @WAIT_FOR_TICK) {
3338 $sig->send; 3742 $sig->send;
3339 } 3743 }
3340 3744
3341 $NOW = Event::time; 3745 $LOAD = ($NOW - $TICK_START) / $TICK;
3342
3343 # if we are delayed by four ticks or more, skip them all
3344 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3345
3346 $TICK_WATCHER->at ($NEXT_TICK);
3347 $TICK_WATCHER->start;
3348
3349 $LOAD = ($NOW - $tick_start) / $TICK;
3350 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3746 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3351 3747
3352 _post_tick; 3748 if (0) {
3353 3749 if ($NEXT_TICK) {
3354 3750 my $jitter = $TICK_START - $NEXT_TICK;
3751 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3752 warn "jitter $JITTER\n";#d#
3753 }
3355 }, 3754 }
3356); 3755}
3357 3756
3358{ 3757{
3359 BDB::max_poll_time $TICK * 0.1; 3758 # configure BDB
3360 $BDB_POLL_WATCHER = Event->io ( 3759
3361 reentrant => 0,
3362 fd => BDB::poll_fileno,
3363 poll => 'r',
3364 prio => 0,
3365 data => WF_AUTOCANCEL,
3366 cb => \&BDB::poll_cb,
3367 );
3368 BDB::min_parallel 8; 3760 BDB::min_parallel 8;
3369 3761 BDB::max_poll_reqs $TICK * 0.1;
3370 BDB::set_sync_prepare { 3762 $Coro::BDB::WATCHER->priority (1);
3371 my $status;
3372 my $current = $Coro::current;
3373 (
3374 sub {
3375 $status = $!;
3376 $current->ready; undef $current;
3377 },
3378 sub {
3379 Coro::schedule while defined $current;
3380 $! = $status;
3381 },
3382 )
3383 };
3384 3763
3385 unless ($DB_ENV) { 3764 unless ($DB_ENV) {
3386 $DB_ENV = BDB::db_env_create; 3765 $DB_ENV = BDB::db_env_create;
3766 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3767 | BDB::LOG_AUTOREMOVE, 1);
3768 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3769 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3387 3770
3388 cf::sync_job { 3771 cf::sync_job {
3389 eval { 3772 eval {
3390 BDB::db_env_open 3773 BDB::db_env_open
3391 $DB_ENV, 3774 $DB_ENV,
3393 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3776 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3394 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3777 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3395 0666; 3778 0666;
3396 3779
3397 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3780 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3398
3399 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3400 $DB_ENV->set_lk_detect;
3401 }; 3781 };
3402 3782
3403 cf::cleanup "db_env_open(db): $@" if $@; 3783 cf::cleanup "db_env_open(db): $@" if $@;
3404 }; 3784 };
3405 } 3785 }
3786
3787 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3788 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3789 };
3790 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3791 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3792 };
3793 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3794 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3795 };
3406} 3796}
3407 3797
3408{ 3798{
3799 # configure IO::AIO
3800
3409 IO::AIO::min_parallel 8; 3801 IO::AIO::min_parallel 8;
3410
3411 undef $Coro::AIO::WATCHER;
3412 IO::AIO::max_poll_time $TICK * 0.1; 3802 IO::AIO::max_poll_time $TICK * 0.1;
3413 $AIO_POLL_WATCHER = Event->io ( 3803 $Coro::AIO::WATCHER->priority (1);
3414 reentrant => 0,
3415 data => WF_AUTOCANCEL,
3416 fd => IO::AIO::poll_fileno,
3417 poll => 'r',
3418 prio => 6,
3419 cb => \&IO::AIO::poll_cb,
3420 );
3421} 3804}
3422 3805
3423my $_log_backtrace; 3806my $_log_backtrace;
3424 3807
3425sub _log_backtrace { 3808sub _log_backtrace {
3429 3812
3430 # limit the # of concurrent backtraces 3813 # limit the # of concurrent backtraces
3431 if ($_log_backtrace < 2) { 3814 if ($_log_backtrace < 2) {
3432 ++$_log_backtrace; 3815 ++$_log_backtrace;
3433 async { 3816 async {
3817 $Coro::current->{desc} = "abt $msg";
3818
3434 my @bt = fork_call { 3819 my @bt = fork_call {
3435 @addr = map { sprintf "%x", $_ } @addr; 3820 @addr = map { sprintf "%x", $_ } @addr;
3436 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3821 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3437 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3822 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3438 or die "addr2line: $!"; 3823 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines