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.316 by root, Mon Jul 23 21:02:50 2007 UTC vs.
Revision 1.434 by root, Thu May 29 03:27:37 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
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;
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 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::AnyEvent;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
22use Coro::AIO; 44use Coro::AIO;
45use Coro::BDB;
23use Coro::Storable; 46use Coro::Storable;
47use Coro::Util ();
24 48
25use JSON::XS 1.4 (); 49use JSON::XS 2.01 ();
26use BDB (); 50use BDB ();
27use Data::Dumper; 51use Data::Dumper;
28use Digest::MD5; 52use Digest::MD5;
29use Fcntl; 53use Fcntl;
30use YAML::Syck (); 54use YAML ();
31use IO::AIO 2.32 (); 55use IO::AIO ();
32use Time::HiRes; 56use Time::HiRes;
33use Compress::LZF; 57use Compress::LZF;
34use Digest::MD5 (); 58use Digest::MD5 ();
59
60AnyEvent::detect;
61
62IO::AIO::max_poll_reqs 1;#d#
35 63
36# configure various modules to our taste 64# configure various modules to our taste
37# 65#
38$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 68Compress::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 69
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 71
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 73
… …
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
74 98
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 101our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
82 103
104our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 106our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 107our $DB_ENV;
85 108
86our %CFG; 109our %CFG;
87 110
88our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 112our $RUNTIME;
113our $NOW;
90 114
91our %PLAYER; # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 116our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
94 118
95# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 121
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
101 126
102binmode STDOUT; 127binmode STDOUT;
103binmode STDERR; 128binmode STDERR;
104 129
105# read virtual server time, if available 130# read virtual server time, if available
… …
158 183
159The raw value load value from the last tick. 184The raw value load value from the last tick.
160 185
161=item %cf::CFG 186=item %cf::CFG
162 187
163Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 189from wherever your confdir points to.
165 190
166=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
167 192
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 193These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
186 $msg .= "\n" 211 $msg .= "\n"
187 unless $msg =~ /\n$/; 212 unless $msg =~ /\n$/;
188 213
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 215
191 utf8::encode $msg;
192 LOG llevError, $msg; 216 LOG llevError, $msg;
193 }; 217 };
194} 218}
219
220$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "=="
222
223 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d#
226 }#d#
227
228 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate
231};
232
233$SIG{__DIE__} = sub { }; #d#?
195 234
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
212)) { 251)) {
213 no strict 'refs'; 252 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 254}
216 255
217$Event::DIED = sub { 256$EV::DIED = sub {
218 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
219}; 258};
220 259
221############################################################################# 260#############################################################################
222 261
… …
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 284 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 285 $d
247 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
248} 287}
249 288
250=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
251 290
252Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
253 292
254=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
255 294
256Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
257 296
258=cut 297=cut
259 298
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 300
262sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
264 303
265=item cf::lock_wait $string 304=item cf::lock_wait $string
266 305
267Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
268 307
… …
271Wait until the given lock is available and then acquires it and returns 310Wait 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, 311a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 312for example when the coroutine gets canceled), the lock is automatically
274returned. 313returned.
275 314
315Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro.
317
276Lock names should begin with a unique identifier (for example, cf::map::find 318Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 319uses map_find and cf::map::load uses map_load).
278 320
279=item $locked = cf::lock_active $string 321=item $locked = cf::lock_active $string
280 322
281Return true if the lock is currently active, i.e. somebody has locked it. 323Return true if the lock is currently active, i.e. somebody has locked it.
282 324
283=cut 325=cut
284 326
285our %LOCK; 327our %LOCK;
328our %LOCKER;#d#
286 329
287sub lock_wait($) { 330sub lock_wait($) {
288 my ($key) = @_; 331 my ($key) = @_;
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
289 337
290 # wait for lock, if any 338 # wait for lock, if any
291 while ($LOCK{$key}) { 339 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 340 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 341 Coro::schedule;
… …
299 347
300 # wait, to be sure we are not locked 348 # wait, to be sure we are not locked
301 lock_wait $key; 349 lock_wait $key;
302 350
303 $LOCK{$key} = []; 351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
304 353
305 Coro::guard { 354 Coro::guard {
355 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 356 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 357 $_->ready for @{ delete $LOCK{$key} };
308 } 358 }
309} 359}
310 360
… …
313 363
314 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
315} 365}
316 366
317sub freeze_mainloop { 367sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
319 369
320 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
321 $TICK_WATCHER->start; 371}
322 }; 372
323 $TICK_WATCHER->stop; 373=item cf::periodic $interval, $cb
324 $guard 374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
325} 386}
326 387
327=item cf::get_slot $time[, $priority[, $name]] 388=item cf::get_slot $time[, $priority[, $name]]
328 389
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 390Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
340our @SLOT_QUEUE; 401our @SLOT_QUEUE;
341our $SLOT_QUEUE; 402our $SLOT_QUEUE;
342 403
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
345 my $signal = new Coro::Signal; 408 my $signal = new Coro::Signal;
346 409
347 while () { 410 while () {
348 next_job: 411 next_job:
349 my $avail = cf::till_tick; 412 my $avail = cf::till_tick;
… …
357 } 420 }
358 } 421 }
359 } 422 }
360 423
361 if (@SLOT_QUEUE) { 424 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 426 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 427 $signal->wait;
365 } else { 428 } else {
366 Coro::schedule; 429 Coro::schedule;
367 } 430 }
368 } 431 }
369}; 432};
370 433
371sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
372 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
373 438
374 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
376 441
… …
390 455
391BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
392 457
393=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
394 459
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 461is 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 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 463acceptable.
399 464
400If it must be done, put the blocking parts into C<sync_job>. This will run 465If 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 466the given BLOCK in another coroutine while waiting for the result. The
… …
406 471
407sub sync_job(&) { 472sub sync_job(&) {
408 my ($job) = @_; 473 my ($job) = @_;
409 474
410 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 476 my $time = EV::time;
412 477
413 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
415 480
416 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
417 # (but this is cancel-safe) 482
418 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
419 484
420 my $busy = 1; 485 my $busy = 1;
421 my @res; 486 my @res;
422 487
423 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 490 @res = eval { $job->() };
425 warn $@ if $@; 491 warn $@ if $@;
426 undef $busy; 492 undef $busy;
427 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
428 494
429 while ($busy) { 495 while ($busy) {
430 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
431 } 500 }
501 }
432 502
433 $time = Event::time - $time; 503 my $time = EV::time - $time;
434 504
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 505 $TICK_START += $time; # do not account sync jobs to server load
439 506
440 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
441 } else { 508 } else {
442 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
443 510
… …
468=item fork_call { }, $args 535=item fork_call { }, $args
469 536
470Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
474 541
475=cut 542=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 543
486sub fork_call(&@) { 544sub fork_call(&@) {
487 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
488 546
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 547 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 548 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 549 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 550
494 if (my $pid = fork) { 551 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; 552 reset_signals;
508 local $SIG{__WARN__}; 553 &$cb
509 local $SIG{__DIE__}; 554 }, @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 555
516 eval { 556 wantarray ? @res : $res[-1]
517 close $fh1; 557}
518 558
519 my @res = eval { $cb->(@args) }; 559=item $coin = coin_from_name $name
520 560
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 561=cut
522 close $fh2;
523 };
524 562
525 warn $@ if $@; 563our %coin_alias = (
526 _exit 0; 564 "silver" => "silvercoin",
527 } 565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
528} 584}
529 585
530=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
531 587
532Returns a single value from the environment database. 588Returns a single value from the environment database.
… …
534=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
535 591
536Stores the given C<$value> in the family. It can currently store binary 592Stores 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). 593data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 594
595=item $db = cf::db_table "name"
596
597Create and/or open a new database table. The string must not be "db" and must be unique
598within each server.
599
539=cut 600=cut
601
602sub db_table($) {
603 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV;
605
606 eval {
607 $db->set_flags (BDB::CHKSUM);
608
609 utf8::encode $name;
610 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
611 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
612 cf::cleanup "db_open(db): $!" if $!;
613 };
614 cf::cleanup "db_open(db): $@" if $@;
615
616 $db
617}
540 618
541our $DB; 619our $DB;
542 620
543sub db_init { 621sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 622 cf::sync_job {
548 eval { 623 $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 } 624 };
558} 625}
559 626
560sub db_get($$) { 627sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
562 629
… …
612 if (1) { 679 if (1) {
613 $md5 = 680 $md5 =
614 join "\x00", 681 join "\x00",
615 $processversion, 682 $processversion,
616 map { 683 map {
617 Coro::cede; 684 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 685 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 686 } 0.. $#$src;
620 687
621 688
622 my $dbmd5 = db_get cache => "$id/md5"; 689 my $dbmd5 = db_get cache => "$id/md5";
… …
666attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
668 735
669In the following description, CLASS can be any of C<global>, C<object> 736In 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 737C<player>, C<client> or C<map> (i.e. the attachable objects in
671Crossfire TRT). 738Deliantra).
672 739
673=over 4 740=over 4
674 741
675=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
676 743
… …
958 } 1025 }
959 1026
960 0 1027 0
961} 1028}
962 1029
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 1031
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 1033
967Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
968 1035
… …
974 1041
975=cut 1042=cut
976 1043
977############################################################################# 1044#############################################################################
978# object support 1045# object support
979#
980 1046
1047sub _object_equal($$);
1048sub _object_equal($$) {
1049 my ($a, $b) = @_;
1050
1051 return 0 unless (ref $a) eq (ref $b);
1052
1053 if ("HASH" eq ref $a) {
1054 my @ka = keys %$a;
1055 my @kb = keys %$b;
1056
1057 return 0 if @ka != @kb;
1058
1059 for (0 .. $#ka) {
1060 return 0 unless $ka[$_] eq $kb[$_];
1061 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1062 }
1063
1064 } elsif ("ARRAY" eq ref $a) {
1065
1066 return 0 if @$a != @$b;
1067
1068 for (0 .. $#$a) {
1069 return 0 unless _object_equal $a->[$_], $b->[$_];
1070 }
1071
1072 } elsif ($a ne $b) {
1073 return 0;
1074 }
1075
1076 1
1077}
1078
1079our $SLOW_MERGES;#d#
981sub _can_merge { 1080sub _can_merge {
982 my ($ob1, $ob2) = @_; 1081 my ($ob1, $ob2) = @_;
983 1082
984 local $Storable::canonical = 1; 1083 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1084
988 $fob1 eq $fob2 1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
989} 1087}
990 1088
991sub reattach { 1089sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1091 my ($obj) = @_;
… …
1015cf::attachable->attach ( 1113cf::attachable->attach (
1016 prio => -1000000, 1114 prio => -1000000,
1017 on_instantiate => sub { 1115 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1116 my ($obj, $data) = @_;
1019 1117
1020 $data = from_json $data; 1118 $data = decode_json $data;
1021 1119
1022 for (@$data) { 1120 for (@$data) {
1023 my ($name, $args) = @$_; 1121 my ($name, $args) = @$_;
1024 1122
1025 $obj->attach ($name, %{$args || {} }); 1123 $obj->attach ($name, %{$args || {} });
… …
1041sub object_freezer_save { 1139sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1140 my ($filename, $rdata, $objs) = @_;
1043 1141
1044 sync_job { 1142 sync_job {
1045 if (length $$rdata) { 1143 if (length $$rdata) {
1144 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1145 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1146 $decname, length $$rdata, scalar @$objs;
1048 1147
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1148 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1149 aio_chmod $fh, SAVE_MODE;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1150 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1151 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1152 aio_close $fh;
1054 1153
1055 if (@$objs) { 1154 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1155 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1156 aio_chmod $fh, SAVE_MODE;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1157 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1158 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1159 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1160 aio_close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1161 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1162 }
1064 } else { 1163 } else {
1065 aio_unlink "$filename.pst"; 1164 aio_unlink "$filename.pst";
1066 } 1165 }
… …
1071 } 1170 }
1072 } else { 1171 } else {
1073 aio_unlink $filename; 1172 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1173 aio_unlink "$filename.pst";
1075 } 1174 }
1076 } 1175 };
1077} 1176}
1078 1177
1079sub object_freezer_as_string { 1178sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1179 my ($rdata, $objs) = @_;
1081 1180
… …
1093 or return; 1192 or return;
1094 1193
1095 unless (aio_stat "$filename.pst") { 1194 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1195 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1196 or return;
1197
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1198 my $st = eval { Coro::Storable::thaw $av };
1199 $av = $st->{objs};
1099 } 1200 }
1100 1201
1202 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1203 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1204 $decname, length $data, scalar @{$av || []};
1205
1103 return ($data, $av); 1206 ($data, $av)
1104} 1207}
1105 1208
1106=head2 COMMAND CALLBACKS 1209=head2 COMMAND CALLBACKS
1107 1210
1108=over 4 1211=over 4
… …
1186 my ($type, $reply, @payload) = 1289 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1290 "ARRAY" eq ref $msg
1188 ? @$msg 1291 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1292 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1293
1294 my @reply;
1295
1191 if (my $cb = $EXTCMD{$type}) { 1296 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1297 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1298 }
1299
1300 $pl->ext_reply ($reply, @reply)
1301 if $reply;
1302
1197 } else { 1303 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1304 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1305 }
1200 1306
1201 cf::override; 1307 cf::override;
… …
1254 my $msg = $@ ? "$v->{path}: $@\n" 1360 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1361 : "$v->{base}: extension inactive.\n";
1256 1362
1257 if (exists $v->{meta}{mandatory}) { 1363 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1364 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1365 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1366 }
1262 1367
1263 warn $msg; 1368 warn $msg;
1264 } 1369 }
1265 1370
… …
1290use Coro::AIO; 1395use Coro::AIO;
1291 1396
1292=head3 cf::player 1397=head3 cf::player
1293 1398
1294=over 4 1399=over 4
1400
1401=item cf::player::num_playing
1402
1403Returns the official number of playing players, as per the Crossfire metaserver rules.
1404
1405=cut
1406
1407sub num_playing {
1408 scalar grep
1409 $_->ob->map
1410 && !$_->hidden
1411 && !$_->ob->flag (cf::FLAG_WIZ),
1412 cf::player::list
1413}
1295 1414
1296=item cf::player::find $login 1415=item cf::player::find $login
1297 1416
1298Returns the given player object, loading it if necessary (might block). 1417Returns the given player object, loading it if necessary (might block).
1299 1418
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1454 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1455 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1456 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1457 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1458
1340 my $pl = load_pl path $login 1459 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1460 or return;
1461
1462 my $pl = cf::player::load_pl $f
1463 or return;
1464
1465 local $cf::PLAYER_LOADING{$login} = $pl;
1466 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1467 $cf::PLAYER{$login} = $pl
1343 } 1468 }
1344 } 1469 }
1345} 1470}
1346 1471
… …
1355 return if $pl->{deny_save}; 1480 return if $pl->{deny_save};
1356 1481
1357 aio_mkdir playerdir $pl, 0770; 1482 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1483 $pl->{last_save} = $cf::RUNTIME;
1359 1484
1485 cf::get_slot 0.01;
1486
1360 $pl->save_pl ($path); 1487 $pl->save_pl ($path);
1361 Coro::cede; 1488 cf::cede_to_tick;
1362} 1489}
1363 1490
1364sub new($) { 1491sub new($) {
1365 my ($login) = @_; 1492 my ($login) = @_;
1366 1493
… …
1372 $cf::PLAYER{$login} = $self; 1499 $cf::PLAYER{$login} = $self;
1373 1500
1374 $self 1501 $self
1375} 1502}
1376 1503
1504=item $player->send_msg ($channel, $msg, $color, [extra...])
1505
1506=cut
1507
1508sub send_msg {
1509 my $ns = shift->ns
1510 or return;
1511 $ns->send_msg (@_);
1512}
1513
1377=item $pl->quit_character 1514=item $pl->quit_character
1378 1515
1379Nukes the player without looking back. If logged in, the connection will 1516Nukes the player without looking back. If logged in, the connection will
1380be destroyed. May block for a long time. 1517be destroyed. May block for a long time.
1381 1518
… …
1389 $pl->{deny_save} = 1; 1526 $pl->{deny_save} = 1;
1390 $pl->password ("*"); # this should lock out the player until we nuked the dir 1527 $pl->password ("*"); # this should lock out the player until we nuked the dir
1391 1528
1392 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1529 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1393 $pl->deactivate; 1530 $pl->deactivate;
1531 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1532 $pl->ob->check_score;
1394 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1533 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1395 $pl->ns->destroy if $pl->ns; 1534 $pl->ns->destroy if $pl->ns;
1396 1535
1397 my $path = playerdir $pl; 1536 my $path = playerdir $pl;
1398 my $temp = "$path~$cf::RUNTIME~deleting~"; 1537 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1434 or return []; 1573 or return [];
1435 1574
1436 my @logins; 1575 my @logins;
1437 1576
1438 for my $login (@$dirs) { 1577 for my $login (@$dirs) {
1578 my $path = path $login;
1579
1580 # a .pst is a dead give-away for a valid player
1581 # if no pst file found, open and chekc for blocked users
1582 if (aio_stat "$path.pst") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1583 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1584 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1585 $buf !~ /^password -------------$/m or next; # official not-valid tag
1586 }
1442 1587
1443 utf8::decode $login; 1588 utf8::decode $login;
1444 push @logins, $login; 1589 push @logins, $login;
1445 } 1590 }
1446 1591
… …
1479 1624
1480Expand crossfire pod fragments into protocol xml. 1625Expand crossfire pod fragments into protocol xml.
1481 1626
1482=cut 1627=cut
1483 1628
1629use re 'eval';
1630
1631my $group;
1632my $interior; $interior = qr{
1633 # match a pod interior sequence sans C<< >>
1634 (?:
1635 \ (.*?)\ (?{ $group = $^N })
1636 | < (??{$interior}) >
1637 )
1638}x;
1639
1484sub expand_cfpod { 1640sub expand_cfpod {
1485 ((my $self), (local $_)) = @_; 1641 my ($self, $pod) = @_;
1486 1642
1487 # escape & and < 1643 my $xml;
1488 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g;
1490 1644
1491 # this is buggy, it needs to properly take care of nested <'s 1645 while () {
1646 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1647 $group = $1;
1492 1648
1493 1 while 1649 $group =~ s/&/&amp;/g;
1494 # replace B<>, I<>, U<> etc. 1650 $group =~ s/</&lt;/g;
1495 s/B<([^\>]*)>/<b>$1<\/b>/ 1651
1496 || s/I<([^\>]*)>/<i>$1<\/i>/ 1652 $xml .= $group;
1497 || s/U<([^\>]*)>/<u>$1<\/u>/ 1653 } elsif ($pod =~ m%\G
1498 # replace G<male|female> tags 1654 ([BCGHITU])
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1655 <
1500 $self->gender ? $2 : $1 1656 (?:
1501 }ge 1657 ([^<>]*) (?{ $group = $^N })
1502 # replace H<hint text> 1658 | < $interior >
1503 || s{H<([^\>]*)>} 1659 )
1660 >
1661 %gcsx
1504 { 1662 ) {
1663 my ($code, $data) = ($1, $group);
1664
1665 if ($code eq "B") {
1666 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1667 } elsif ($code eq "I") {
1668 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1669 } elsif ($code eq "U") {
1670 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1671 } elsif ($code eq "C") {
1672 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1673 } elsif ($code eq "T") {
1674 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1675 } elsif ($code eq "G") {
1676 my ($male, $female) = split /\|/, $data;
1677 $data = $self->gender ? $female : $male;
1678 $xml .= expand_cfpod ($self, $data);
1679 } elsif ($code eq "H") {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1680 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1681 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "") 1682 "")
1508 [$self->{hintmode}] 1683 [$self->{hintmode}];
1684 } else {
1685 $xml .= "error processing '$code($data)' directive";
1509 }ge; 1686 }
1687 } else {
1688 if ($pod =~ /\G(.+)/) {
1689 warn "parse error while expanding $pod (at $1)";
1690 }
1691 last;
1692 }
1693 }
1510 1694
1695 for ($xml) {
1511 # create single paragraphs (very hackish) 1696 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g; 1697 s/(?<=\S)\n(?=\w)/ /g;
1513 1698
1514 # compress some whitespace 1699 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends 1700 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines 1701 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines 1702 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines 1703 s/\n+$//; # ending lines
1704 }
1519 1705
1520 $_ 1706 $xml
1521} 1707}
1708
1709no re 'eval';
1522 1710
1523sub hintmode { 1711sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1; 1712 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode} 1713 $_[0]{hintmode}
1526} 1714}
… …
1532=cut 1720=cut
1533 1721
1534sub ext_reply($$@) { 1722sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1723 my ($self, $id, @msg) = @_;
1536 1724
1537 if ($self->ns->extcmd == 2) { 1725 $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} 1726}
1545 1727
1546=item $player->ext_msg ($type, @msg) 1728=item $player->ext_msg ($type, @msg)
1547 1729
1548Sends an ext event to the client. 1730Sends an ext event to the client.
… …
1604our $MAX_RESET = 3600; 1786our $MAX_RESET = 3600;
1605our $DEFAULT_RESET = 3000; 1787our $DEFAULT_RESET = 3000;
1606 1788
1607sub generate_random_map { 1789sub generate_random_map {
1608 my ($self, $rmp) = @_; 1790 my ($self, $rmp) = @_;
1791
1792 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1793
1609 # mit "rum" bekleckern, nicht 1794 # mit "rum" bekleckern, nicht
1610 $self->_create_random_map ( 1795 $self->_create_random_map (
1611 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1796 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1612 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1797 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1613 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1798 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1735 1920
1736# the temporary/swap location 1921# the temporary/swap location
1737sub save_path { 1922sub save_path {
1738 my ($self) = @_; 1923 my ($self) = @_;
1739 1924
1740 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1925 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1741 "$TMPDIR/$path.map" 1926 "$TMPDIR/$path.map"
1742} 1927}
1743 1928
1744# the unique path, undef == no special unique path 1929# the unique path, undef == no special unique path
1745sub uniq_path { 1930sub uniq_path {
1746 my ($self) = @_; 1931 my ($self) = @_;
1747 1932
1748 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1933 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1749 "$UNIQUEDIR/$path" 1934 "$UNIQUEDIR/$path"
1750} 1935}
1751 1936
1752# and all this just because we cannot iterate over 1937# and all this just because we cannot iterate over
1753# all maps in C++... 1938# all maps in C++...
… …
1776 1961
1777sub load_header_from($) { 1962sub load_header_from($) {
1778 my ($self, $path) = @_; 1963 my ($self, $path) = @_;
1779 1964
1780 utf8::encode $path; 1965 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1966 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 or return; 1967 or return;
1968
1969 $self->_load_header ($f)
1970 or return;
1971
1972 local $MAP_LOADING{$self->{path}} = $self;
1973 $f->resolve_delayed_derefs;
1786 1974
1787 $self->{load_path} = $path; 1975 $self->{load_path} = $path;
1788 1976
1789 1 1977 1
1790} 1978}
… …
1844sub find { 2032sub find {
1845 my ($path, $origin) = @_; 2033 my ($path, $origin) = @_;
1846 2034
1847 $path = normalise $path, $origin && $origin->path; 2035 $path = normalise $path, $origin && $origin->path;
1848 2036
2037 cf::lock_wait "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 2038 cf::lock_wait "map_find:$path";
1850 2039
1851 $cf::MAP{$path} || do { 2040 $cf::MAP{$path} || do {
2041 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1852 my $guard = cf::lock_acquire "map_find:$path"; 2042 my $guard2 = cf::lock_acquire "map_find:$path";
2043
1853 my $map = new_from_path cf::map $path 2044 my $map = new_from_path cf::map $path
1854 or return; 2045 or return;
1855 2046
1856 $map->{last_save} = $cf::RUNTIME; 2047 $map->{last_save} = $cf::RUNTIME;
1857 2048
… …
1859 or return; 2050 or return;
1860 2051
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2052 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 2053 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 2054 #$cf::WAIT_FOR_TICK->wait;
2055 undef $guard2;
2056 undef $guard1;
1864 $map->reset; 2057 $map->reset;
1865 undef $guard;
1866 return find $path; 2058 return find $path;
1867 } 2059 }
1868 2060
1869 $cf::MAP{$path} = $map 2061 $cf::MAP{$path} = $map
1870 } 2062 }
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 2071 local $self->{deny_reset} = 1; # loading can take a long time
1880 2072
1881 my $path = $self->{path}; 2073 my $path = $self->{path};
1882 2074
1883 { 2075 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 2076 my $guard = cf::lock_acquire "map_data:$path";
1885 2077
2078 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 2079 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 2080
1888 $self->in_memory (cf::MAP_LOADING); 2081 $self->in_memory (cf::MAP_LOADING);
1889 2082
1890 $self->alloc; 2083 $self->alloc;
1891 2084
1892 $self->pre_load; 2085 $self->pre_load;
1893 Coro::cede; 2086 cf::cede_to_tick;
1894 2087
2088 my $f = new_from_file cf::object::thawer $self->{load_path};
2089 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 2090 $self->_load_objects ($f)
1896 or return; 2091 or return;
1897 2092
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2093 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1899 if delete $self->{load_original}; 2094 if delete $self->{load_original};
1900 2095
1901 if (my $uniq = $self->uniq_path) { 2096 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 2097 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 2098 unless (aio_stat $uniq) {
2099 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 2100 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 2101 $self->_load_objects ($f);
2102 $f->resolve_delayed_derefs;
2103 }
1906 } 2104 }
1907 } 2105 }
1908 2106
1909 Coro::cede; 2107 $f->resolve_delayed_derefs;
2108
2109 cf::cede_to_tick;
1910 # now do the right thing for maps 2110 # now do the right thing for maps
1911 $self->link_multipart_objects; 2111 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 2112 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 2113 unless $self->difficulty;
1914 Coro::cede; 2114 cf::cede_to_tick;
1915 2115
1916 unless ($self->{deny_activate}) { 2116 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 2117 $self->decay_objects;
1918 $self->fix_auto_apply; 2118 $self->fix_auto_apply;
1919 $self->update_buttons; 2119 $self->update_buttons;
1920 Coro::cede; 2120 cf::cede_to_tick;
1921 $self->set_darkness_map; 2121 $self->set_darkness_map;
1922 Coro::cede; 2122 cf::cede_to_tick;
1923 $self->activate; 2123 $self->activate;
1924 } 2124 }
1925 2125
2126 $self->{last_save} = $cf::RUNTIME;
2127 $self->last_access ($cf::RUNTIME);
2128
1926 $self->in_memory (cf::MAP_IN_MEMORY); 2129 $self->in_memory (cf::MAP_ACTIVE);
1927 } 2130 }
1928 2131
1929 $self->post_load; 2132 $self->post_load;
1930} 2133}
1931 2134
… …
1940 2143
1941 $self 2144 $self
1942} 2145}
1943 2146
1944# find and load all maps in the 3x3 area around a map 2147# find and load all maps in the 3x3 area around a map
1945sub load_diag { 2148sub load_neighbours {
1946 my ($map) = @_; 2149 my ($map) = @_;
1947 2150
1948 my @diag; # diagonal neighbours 2151 my @neigh; # diagonal neighbours
1949 2152
1950 for (0 .. 3) { 2153 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 2154 my $neigh = $map->tile_path ($_)
1952 or next; 2155 or next;
1953 $neigh = find $neigh, $map 2156 $neigh = find $neigh, $map
1954 or next; 2157 or next;
1955 $neigh->load; 2158 $neigh->load;
1956 2159
2160 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2161 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2162 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 2163 }
1960 2164
1961 for (@diag) { 2165 for (grep defined $_->[0], @neigh) {
2166 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 2167 my $neigh = find $path, $origin
1963 or next; 2168 or next;
1964 $neigh->load; 2169 $neigh->load;
1965 } 2170 }
1966} 2171}
1967 2172
… …
1972} 2177}
1973 2178
1974sub do_load_sync { 2179sub do_load_sync {
1975 my ($map) = @_; 2180 my ($map) = @_;
1976 2181
2182 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2183 if $Coro::current == $Coro::main;
2184
1977 cf::sync_job { $map->load }; 2185 cf::sync_job { $map->load };
1978} 2186}
1979 2187
1980our %MAP_PREFETCH; 2188our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 2189our $MAP_PREFETCHER = undef;
1982 2190
1983sub find_async { 2191sub find_async {
1984 my ($path, $origin) = @_; 2192 my ($path, $origin, $load) = @_;
1985 2193
1986 $path = normalise $path, $origin && $origin->{path}; 2194 $path = normalise $path, $origin && $origin->{path};
1987 2195
1988 if (my $map = $cf::MAP{$path}) { 2196 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2197 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1990 } 2198 }
1991 2199
1992 undef $MAP_PREFETCH{$path}; 2200 $MAP_PREFETCH{$path} |= $load;
2201
1993 $MAP_PREFETCHER ||= cf::async { 2202 $MAP_PREFETCHER ||= cf::async {
2203 $Coro::current->{desc} = "map prefetcher";
2204
1994 while (%MAP_PREFETCH) { 2205 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 2206 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 2207 if (my $map = find $k) {
1997 $map->load; 2208 $map->load if $v;
1998 } 2209 }
1999 2210
2000 delete $MAP_PREFETCH{$path}; 2211 delete $MAP_PREFETCH{$k};
2001 } 2212 }
2002 } 2213 }
2003 undef $MAP_PREFETCHER; 2214 undef $MAP_PREFETCHER;
2004 }; 2215 };
2005 $MAP_PREFETCHER->prio (6); 2216 $MAP_PREFETCHER->prio (6);
… …
2008} 2219}
2009 2220
2010sub save { 2221sub save {
2011 my ($self) = @_; 2222 my ($self) = @_;
2012 2223
2013 my $lock = cf::lock_acquire "map_data:" . $self->path; 2224 my $lock = cf::lock_acquire "map_data:$self->{path}";
2014 2225
2015 $self->{last_save} = $cf::RUNTIME; 2226 $self->{last_save} = $cf::RUNTIME;
2016 2227
2017 return unless $self->dirty; 2228 return unless $self->dirty;
2018 2229
… …
2024 return if $self->{deny_save}; 2235 return if $self->{deny_save};
2025 2236
2026 local $self->{last_access} = $self->last_access;#d# 2237 local $self->{last_access} = $self->last_access;#d#
2027 2238
2028 cf::async { 2239 cf::async {
2240 $Coro::current->{desc} = "map player save";
2029 $_->contr->save for $self->players; 2241 $_->contr->save for $self->players;
2030 }; 2242 };
2243
2244 cf::get_slot 0.02;
2031 2245
2032 if ($uniq) { 2246 if ($uniq) {
2033 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2247 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2034 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2248 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2035 } else { 2249 } else {
… …
2041 my ($self) = @_; 2255 my ($self) = @_;
2042 2256
2043 # save first because save cedes 2257 # save first because save cedes
2044 $self->save; 2258 $self->save;
2045 2259
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2261
2048 return if $self->players; 2262 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY; 2263 return if $self->in_memory != cf::MAP_ACTIVE;
2050 return if $self->{deny_save}; 2264 return if $self->{deny_save};
2051 2265
2266 $self->in_memory (cf::MAP_SWAPPED);
2267
2268 $self->deactivate;
2269 $_->clear_links_to ($self) for values %cf::MAP;
2052 $self->clear; 2270 $self->clear;
2053 $self->in_memory (cf::MAP_SWAPPED);
2054} 2271}
2055 2272
2056sub reset_at { 2273sub reset_at {
2057 my ($self) = @_; 2274 my ($self) = @_;
2058 2275
… …
2090 if $uniq; 2307 if $uniq;
2091 } 2308 }
2092 2309
2093 delete $cf::MAP{$self->path}; 2310 delete $cf::MAP{$self->path};
2094 2311
2312 $self->deactivate;
2313 $_->clear_links_to ($self) for values %cf::MAP;
2095 $self->clear; 2314 $self->clear;
2096
2097 $_->clear_links_to ($self) for values %cf::MAP;
2098 2315
2099 $self->unlink_save; 2316 $self->unlink_save;
2100 $self->destroy; 2317 $self->destroy;
2101} 2318}
2102 2319
2103my $nuke_counter = "aaaa"; 2320my $nuke_counter = "aaaa";
2104 2321
2105sub nuke { 2322sub nuke {
2106 my ($self) = @_; 2323 my ($self) = @_;
2107 2324
2325 {
2326 my $lock = cf::lock_acquire "map_data:$self->{path}";
2327
2108 delete $cf::MAP{$self->path}; 2328 delete $cf::MAP{$self->path};
2109 2329
2110 $self->unlink_save; 2330 $self->unlink_save;
2111 2331
2112 bless $self, "cf::map"; 2332 bless $self, "cf::map";
2113 delete $self->{deny_reset}; 2333 delete $self->{deny_reset};
2114 $self->{deny_save} = 1; 2334 $self->{deny_save} = 1;
2115 $self->reset_timeout (1); 2335 $self->reset_timeout (1);
2116 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2336 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117 2337
2118 $cf::MAP{$self->path} = $self; 2338 $cf::MAP{$self->path} = $self;
2339 }
2119 2340
2120 $self->reset; # polite request, might not happen 2341 $self->reset; # polite request, might not happen
2121} 2342}
2122 2343
2123=item $maps = cf::map::tmp_maps 2344=item $maps = cf::map::tmp_maps
… …
2165 2386
2166sub unique_maps() { 2387sub unique_maps() {
2167 [ 2388 [
2168 map { 2389 map {
2169 utf8::decode $_; 2390 utf8::decode $_;
2170 /\.map$/ 2391 s/\.map$//; # TODO future compatibility hack
2392 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2393 ? ()
2171 ? normalise $_ 2394 : normalise $_
2172 : ()
2173 } @{ aio_readdir $UNIQUEDIR or [] } 2395 } @{ aio_readdir $UNIQUEDIR or [] }
2174 ] 2396 ]
2175} 2397}
2176 2398
2177package cf;
2178
2179=back 2399=back
2180 2400
2181=head3 cf::object 2401=head3 cf::object
2182 2402
2183=cut 2403=cut
… …
2186 2406
2187=over 4 2407=over 4
2188 2408
2189=item $ob->inv_recursive 2409=item $ob->inv_recursive
2190 2410
2191Returns the inventory of the object _and_ their inventories, recursively. 2411Returns the inventory of the object I<and> their inventories, recursively,
2412but I<not> the object itself.
2192 2413
2193=cut 2414=cut
2194 2415
2195sub inv_recursive_; 2416sub inv_recursive_;
2196sub inv_recursive_ { 2417sub inv_recursive_ {
… …
2199 2420
2200sub inv_recursive { 2421sub inv_recursive {
2201 inv_recursive_ inv $_[0] 2422 inv_recursive_ inv $_[0]
2202} 2423}
2203 2424
2425=item $ref = $ob->ref
2426
2427Creates and returns a persistent reference to an object that can be stored as a string.
2428
2429=item $ob = cf::object::deref ($refstring)
2430
2431returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2432even if the object actually exists. May block.
2433
2434=cut
2435
2436sub deref {
2437 my ($ref) = @_;
2438
2439 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2440 my ($uuid, $name) = ($1, $2);
2441 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2442 or return;
2443 $pl->ob->uuid eq $uuid
2444 or return;
2445
2446 $pl->ob
2447 } else {
2448 warn "$ref: cannot resolve object reference\n";
2449 undef
2450 }
2451}
2452
2204package cf; 2453package cf;
2205 2454
2206=back 2455=back
2207 2456
2208=head3 cf::object::player 2457=head3 cf::object::player
… …
2214Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2463Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2215can be C<undef>. Does the right thing when the player is currently in a 2464can be C<undef>. Does the right thing when the player is currently in a
2216dialogue with the given NPC character. 2465dialogue with the given NPC character.
2217 2466
2218=cut 2467=cut
2468
2469our $SAY_CHANNEL = {
2470 id => "say",
2471 title => "Map",
2472 reply => "say ",
2473 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2474};
2475
2476our $CHAT_CHANNEL = {
2477 id => "chat",
2478 title => "Chat",
2479 reply => "chat ",
2480 tooltip => "Player chat and shouts, global to the server.",
2481};
2219 2482
2220# rough implementation of a future "reply" method that works 2483# rough implementation of a future "reply" method that works
2221# with dialog boxes. 2484# with dialog boxes.
2222#TODO: the first argument must go, split into a $npc->reply_to ( method 2485#TODO: the first argument must go, split into a $npc->reply_to ( method
2223sub cf::object::player::reply($$$;$) { 2486sub cf::object::player::reply($$$;$) {
… …
2235 my $dialog = $pl->{npc_dialog}; 2498 my $dialog = $pl->{npc_dialog};
2236 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2499 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2237 2500
2238 } else { 2501 } else {
2239 $msg = $npc->name . " says: $msg" if $npc; 2502 $msg = $npc->name . " says: $msg" if $npc;
2240 $self->message ($msg, $flags); 2503 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2241 } 2504 }
2242 } 2505 }
2506}
2507
2508=item $object->send_msg ($channel, $msg, $color, [extra...])
2509
2510=cut
2511
2512sub cf::object::send_msg {
2513 my $pl = shift->contr
2514 or return;
2515 $pl->send_msg (@_);
2243} 2516}
2244 2517
2245=item $player_object->may ("access") 2518=item $player_object->may ("access")
2246 2519
2247Returns wether the given player is authorized to access resource "access" 2520Returns wether the given player is authorized to access resource "access"
… …
2326 # use -1 or undef as default coordinates, not 0, 0 2599 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2600 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2601 if $x <=0 && $y <= 0;
2329 2602
2330 $map->load; 2603 $map->load;
2331 $map->load_diag; 2604 $map->load_neighbours;
2332 2605
2333 return unless $self->contr->active; 2606 return unless $self->contr->active;
2334 $self->activate_recursive; 2607 $self->activate_recursive;
2335 2608
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2609 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2356 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2629 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2357 2630
2358 $self->enter_link; 2631 $self->enter_link;
2359 2632
2360 (async { 2633 (async {
2634 $Coro::current->{desc} = "player::goto $path $x $y";
2635
2636 # *tag paths override both path and x|y
2637 if ($path =~ /^\*(.*)$/) {
2638 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2639 my $ob = $obs[rand @obs];
2640
2641 # see if we actually can go there
2642 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2643 $ob = $obs[rand @obs];
2644 } else {
2645 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2646 }
2647 # else put us there anyways for now #d#
2648
2649 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2650 } else {
2651 ($path, $x, $y) = (undef, undef, undef);
2652 }
2653 }
2654
2361 my $map = eval { 2655 my $map = eval {
2362 my $map = cf::map::find $path; 2656 my $map = defined $path ? cf::map::find $path : undef;
2363 2657
2364 if ($map) { 2658 if ($map) {
2365 $map = $map->customise_for ($self); 2659 $map = $map->customise_for ($self);
2366 $map = $check->($map) if $check && $map; 2660 $map = $check->($map) if $check && $map;
2367 } else { 2661 } else {
2368 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2662 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2369 } 2663 }
2370 2664
2371 $map 2665 $map
2372 }; 2666 };
2373 2667
… …
2409} 2703}
2410 2704
2411sub prepare_random_map { 2705sub prepare_random_map {
2412 my ($exit) = @_; 2706 my ($exit) = @_;
2413 2707
2414 my $guard = cf::lock_acquire "exit_prepare:$exit";
2415
2416 # all this does is basically replace the /! path by 2708 # all this does is basically replace the /! path by
2417 # a new random map path (?random/...) with a seed 2709 # a new random map path (?random/...) with a seed
2418 # that depends on the exit object 2710 # that depends on the exit object
2419 2711
2420 my $rmp = parse_random_map_params $exit->msg; 2712 my $rmp = parse_random_map_params $exit->msg;
… …
2422 if ($exit->map) { 2714 if ($exit->map) {
2423 $rmp->{region} = $exit->region->name; 2715 $rmp->{region} = $exit->region->name;
2424 $rmp->{origin_map} = $exit->map->path; 2716 $rmp->{origin_map} = $exit->map->path;
2425 $rmp->{origin_x} = $exit->x; 2717 $rmp->{origin_x} = $exit->x;
2426 $rmp->{origin_y} = $exit->y; 2718 $rmp->{origin_y} = $exit->y;
2719
2720 $exit->map->touch;
2427 } 2721 }
2428 2722
2429 $rmp->{random_seed} ||= $exit->random_seed; 2723 $rmp->{random_seed} ||= $exit->random_seed;
2430 2724
2431 my $data = cf::to_json $rmp; 2725 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2432 my $md5 = Digest::MD5::md5_hex $data; 2726 my $md5 = Digest::MD5::md5_hex $data;
2433 my $meta = "$RANDOMDIR/$md5.meta"; 2727 my $meta = "$RANDOMDIR/$md5.meta";
2434 2728
2435 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2729 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2436 aio_write $fh, 0, (length $data), $data, 0; 2730 aio_write $fh, 0, (length $data), $data, 0;
2437 undef $fh; 2731 undef $fh;
2438 aio_rename "$meta~", $meta; 2732 aio_rename "$meta~", $meta;
2439 2733
2734 my $slaying = "?random/$md5";
2735
2736 if ($exit->valid) {
2440 $exit->slaying ("?random/$md5"); 2737 $exit->slaying ("?random/$md5");
2441 $exit->msg (undef); 2738 $exit->msg (undef);
2739 }
2442 } 2740 }
2443} 2741}
2444 2742
2445sub cf::object::player::enter_exit { 2743sub cf::object::player::enter_exit {
2446 my ($self, $exit) = @_; 2744 my ($self, $exit) = @_;
2447 2745
2448 return unless $self->type == cf::PLAYER; 2746 return unless $self->type == cf::PLAYER;
2449 2747
2450 if ($exit->slaying eq "/!") {
2451 #TODO: this should de-fi-ni-te-ly not be a sync-job
2452 # the problem is that $exit might not survive long enough
2453 # so it needs to be done right now, right here
2454 cf::sync_job { prepare_random_map $exit };
2455 }
2456
2457 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2458 my $hp = $exit->stats->hp;
2459 my $sp = $exit->stats->sp;
2460
2461 $self->enter_link; 2748 $self->enter_link;
2462 2749
2463 # if exit is damned, update players death & WoR home-position
2464 $self->contr->savebed ($slaying, $hp, $sp)
2465 if $exit->flag (FLAG_DAMNED);
2466
2467 (async { 2750 (async {
2468 $self->deactivate_recursive; # just to be sure 2751 $Coro::current->{desc} = "enter_exit";
2752
2469 unless (eval { 2753 unless (eval {
2754 $self->deactivate_recursive; # just to be sure
2755
2756 # random map handling
2757 {
2758 my $guard = cf::lock_acquire "exit_prepare:$exit";
2759
2760 prepare_random_map $exit
2761 if $exit->slaying eq "/!";
2762 }
2763
2764 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2765 my $x = $exit->stats->hp;
2766 my $y = $exit->stats->sp;
2767
2470 $self->goto ($slaying, $hp, $sp); 2768 $self->goto ($map, $x, $y);
2471 2769
2770 # if exit is damned, update players death & WoR home-position
2771 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED);
2773
2472 1; 2774 1
2473 }) { 2775 }) {
2474 $self->message ("Something went wrong deep within the crossfire server. " 2776 $self->message ("Something went wrong deep within the crossfire server. "
2475 . "I'll try to bring you back to the map you were before. " 2777 . "I'll try to bring you back to the map you were before. "
2476 . "Please report this to the dungeon master!", 2778 . "Please report this to the dungeon master!",
2477 cf::NDI_UNIQUE | cf::NDI_RED); 2779 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2507the message, with C<log> being the default. If C<$color> is negative, suppress 2809the message, with C<log> being the default. If C<$color> is negative, suppress
2508the message unless the client supports the msg packet. 2810the message unless the client supports the msg packet.
2509 2811
2510=cut 2812=cut
2511 2813
2814# non-persistent channels (usually the info channel)
2815our %CHANNEL = (
2816 "c/identify" => {
2817 id => "infobox",
2818 title => "Identify",
2819 reply => undef,
2820 tooltip => "Items recently identified",
2821 },
2822 "c/examine" => {
2823 id => "infobox",
2824 title => "Examine",
2825 reply => undef,
2826 tooltip => "Signs and other items you examined",
2827 },
2828 "c/book" => {
2829 id => "infobox",
2830 title => "Book",
2831 reply => undef,
2832 tooltip => "The contents of a note or book",
2833 },
2834 "c/lookat" => {
2835 id => "infobox",
2836 title => "Look",
2837 reply => undef,
2838 tooltip => "What you saw there",
2839 },
2840 "c/who" => {
2841 id => "infobox",
2842 title => "Players",
2843 reply => undef,
2844 tooltip => "Shows players who are currently online",
2845 },
2846 "c/body" => {
2847 id => "infobox",
2848 title => "Body Parts",
2849 reply => undef,
2850 tooltip => "Shows which body parts you posess and are available",
2851 },
2852 "c/uptime" => {
2853 id => "infobox",
2854 title => "Uptime",
2855 reply => undef,
2856 tooltip => "How long the server has been running since last restart",
2857 },
2858 "c/mapinfo" => {
2859 id => "infobox",
2860 title => "Map Info",
2861 reply => undef,
2862 tooltip => "Information related to the maps",
2863 },
2864 "c/party" => {
2865 id => "party",
2866 title => "Party",
2867 reply => "gsay ",
2868 tooltip => "Messages and chat related to your party",
2869 },
2870);
2871
2512sub cf::client::send_msg { 2872sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2873 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2874
2515 $msg = $self->pl->expand_cfpod ($msg); 2875 $msg = $self->pl->expand_cfpod ($msg);
2516 2876
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 2877 $color &= cf::NDI_CLIENT_MASK; # just in case...
2518 2878
2879 # check predefined channels, for the benefit of C
2880 if ($CHANNEL{$channel}) {
2881 $channel = $CHANNEL{$channel};
2882
2883 $self->ext_msg (channel_info => $channel)
2884 if $self->can_msg;
2885
2886 $channel = $channel->{id};
2887
2519 if (ref $channel) { 2888 } elsif (ref $channel) {
2520 # send meta info to client, if not yet sent 2889 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2890 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2891 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => %$channel); 2892 $self->ext_msg (channel_info => $channel)
2893 if $self->can_msg;
2524 } 2894 }
2525 2895
2526 $channel = $channel->{id}; 2896 $channel = $channel->{id};
2527 } 2897 }
2528 2898
2529 return unless @extra || length $msg; 2899 return unless @extra || length $msg;
2530 2900
2531 if ($self->can_msg) { 2901 if ($self->can_msg) {
2902 # default colour, mask it out
2903 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2904 if $color & cf::NDI_DEF;
2905
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2906 $self->send_packet ("msg " . $self->{json_coder}->encode (
2907 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2533 } else { 2908 } 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) { 2909 if ($color >= 0) {
2910 # replace some tags by gcfclient-compatible ones
2911 for ($msg) {
2912 1 while
2913 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2914 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2915 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2916 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2917 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2918 }
2919
2920 $color &= cf::NDI_COLOR_MASK;
2921
2922 utf8::encode $msg;
2923
2545 if (0 && $msg =~ /\[/) { 2924 if (0 && $msg =~ /\[/) {
2925 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2926 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else { 2927 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2928 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg") 2929 $self->send_packet ("drawinfo $color $msg")
2550 } 2930 }
2551 } 2931 }
… …
2559=cut 2939=cut
2560 2940
2561sub cf::client::ext_msg($$@) { 2941sub cf::client::ext_msg($$@) {
2562 my ($self, $type, @msg) = @_; 2942 my ($self, $type, @msg) = @_;
2563 2943
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) { 2944 if ($self->extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2945 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove 2946 } elsif ($self->extcmd == 1) { # TODO: remove
2569 push @msg, msgtype => "event_$type"; 2947 push @msg, msgtype => "event_$type";
2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 }
2950}
2951
2952=item $client->ext_reply ($msgid, @msg)
2953
2954Sends an ext reply to the client.
2955
2956=cut
2957
2958sub cf::client::ext_reply($$@) {
2959 my ($self, $id, @msg) = @_;
2960
2961 if ($self->extcmd == 2) {
2962 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2963 } elsif ($self->extcmd == 1) {
2964 #TODO: version 1, remove
2965 unshift @msg, msgtype => "reply", msgid => $id;
2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2966 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 } 2967 }
2572} 2968}
2573 2969
2574=item $success = $client->query ($flags, "text", \&cb) 2970=item $success = $client->query ($flags, "text", \&cb)
… …
2636 my ($type, $reply, @payload) = 3032 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg 3033 "ARRAY" eq ref $msg
2638 ? @$msg 3034 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3035 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640 3036
3037 my @reply;
3038
2641 if (my $cb = $EXTICMD{$type}) { 3039 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload); 3040 @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 } 3041 }
3042
3043 $ns->ext_reply ($reply, @reply)
3044 if $reply;
3045
2647 } else { 3046 } else {
2648 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3047 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2649 } 3048 }
2650 3049
2651 cf::override; 3050 cf::override;
… …
2698our $safe = new Safe "safe"; 3097our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 3098our $safe_hole = new Safe::Hole;
2700 3099
2701$SIG{FPE} = 'IGNORE'; 3100$SIG{FPE} = 'IGNORE';
2702 3101
2703$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3102$safe->permit_only (Opcode::opset qw(
3103 :base_core :base_mem :base_orig :base_math
3104 grepstart grepwhile mapstart mapwhile
3105 sort time
3106));
2704 3107
2705# here we export the classes and methods available to script code 3108# here we export the classes and methods available to script code
2706 3109
2707=pod 3110=pod
2708 3111
2709The following functions and methods are available within a safe environment: 3112The following functions and methods are available within a safe environment:
2710 3113
2711 cf::object 3114 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 3115 contr pay_amount pay_player map x y force_find force_add destroy
2713 insert remove 3116 insert remove name archname title slaying race decrease split
2714 3117
2715 cf::object::player 3118 cf::object::player
2716 player 3119 player
2717 3120
2718 cf::player 3121 cf::player
… …
2723 3126
2724=cut 3127=cut
2725 3128
2726for ( 3129for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3130 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove)], 3131 insert remove inv nrof name archname title slaying race
3132 decrease split destroy)],
2729 ["cf::object::player" => qw(player)], 3133 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 3134 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 3135 ["cf::map" => qw(trigger)],
2732) { 3136) {
2733 no strict 'refs'; 3137 no strict 'refs';
… …
2809# the server's init and main functions 3213# the server's init and main functions
2810 3214
2811sub load_facedata($) { 3215sub load_facedata($) {
2812 my ($path) = @_; 3216 my ($path) = @_;
2813 3217
3218 # HACK to clear player env face cache, we need some signal framework
3219 # for this (global event?)
3220 %ext::player_env::MUSIC_FACE_CACHE = ();
3221
3222 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3223
2814 warn "loading facedata from $path\n"; 3224 warn "loading facedata from $path\n";
2815 3225
2816 my $facedata; 3226 my $facedata;
2817 0 < aio_load $path, $facedata 3227 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 3228 or die "$path: $!";
… …
2820 $facedata = Coro::Storable::thaw $facedata; 3230 $facedata = Coro::Storable::thaw $facedata;
2821 3231
2822 $facedata->{version} == 2 3232 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3233 or cf::cleanup "$path: version mismatch, cannot proceed.";
2824 3234
3235 # patch in the exptable
3236 $facedata->{resource}{"res/exp_table"} = {
3237 type => FT_RSRC,
3238 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3239 };
3240 cf::cede_to_tick;
3241
2825 { 3242 {
2826 my $faces = $facedata->{faceinfo}; 3243 my $faces = $facedata->{faceinfo};
2827 3244
2828 while (my ($face, $info) = each %$faces) { 3245 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3246 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3247
2830 cf::face::set_visibility $idx, $info->{visibility}; 3248 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3249 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3250 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3251 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3252
2835 cf::cede_to_tick; 3253 cf::cede_to_tick;
2836 } 3254 }
2837 3255
2838 while (my ($face, $info) = each %$faces) { 3256 while (my ($face, $info) = each %$faces) {
2839 next unless $info->{smooth}; 3257 next unless $info->{smooth};
3258
2840 my $idx = cf::face::find $face 3259 my $idx = cf::face::find $face
2841 or next; 3260 or next;
3261
2842 if (my $smooth = cf::face::find $info->{smooth}) { 3262 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth; 3263 cf::face::set_smooth $idx, $smooth;
2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3264 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2845 } else { 3265 } else {
2846 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3266 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2863 3283
2864 { 3284 {
2865 # TODO: for gcfclient pleasure, we should give resources 3285 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3286 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3287 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 3288
2870 while (my ($name, $info) = each %$res) { 3289 while (my ($name, $info) = each %$res) {
2871 my $meta = $enc->encode ({ 3290 if (defined $info->{type}) {
2872 name => $name,
2873 type => $info->{type},
2874 copyright => $info->{copyright}, #TODO#
2875 });
2876
2877 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3291 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3292 my $data;
2878 3293
2879 if ($name =~ /\.jpg$/) { 3294 if ($info->{type} & 1) {
2880 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3295 # prepend meta info
2881 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3296
3297 my $meta = $enc->encode ({
3298 name => $name,
3299 %{ $info->{meta} || {} },
3300 });
3301
3302 $data = pack "(w/a*)*", $meta, $info->{data};
3303 } else {
3304 $data = $info->{data};
3305 }
3306
3307 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3308 cf::face::set_type $idx, $info->{type};
2882 } else { 3309 } else {
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3310 $RESOURCE{$name} = $info;
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_type $idx, 1;
2887 cf::face::set_data $idx, 0, $data, $chk;
2888 } 3311 }
2889 3312
2890 cf::cede_to_tick; 3313 cf::cede_to_tick;
2891 } 3314 }
2892 } 3315 }
2893 3316
3317 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3318
2894 1 3319 1
2895} 3320}
2896 3321
3322cf::global->attach (on_resource_update => sub {
3323 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3324 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3325
3326 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3327 my $sound = $soundconf->{compat}[$_]
3328 or next;
3329
3330 my $face = cf::face::find "sound/$sound->[1]";
3331 cf::sound::set $sound->[0] => $face;
3332 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3333 }
3334
3335 while (my ($k, $v) = each %{$soundconf->{event}}) {
3336 my $face = cf::face::find "sound/$v";
3337 cf::sound::set $k => $face;
3338 }
3339 }
3340});
3341
3342register_exticmd fx_want => sub {
3343 my ($ns, $want) = @_;
3344
3345 while (my ($k, $v) = each %$want) {
3346 $ns->fx_want ($k, $v);
3347 }
3348};
3349
3350sub load_resource_file($) {
3351 my $guard = lock_acquire "load_resource_file";
3352
3353 my $status = load_resource_file_ $_[0];
3354 get_slot 0.1, 100;
3355 cf::arch::commit_load;
3356
3357 $status
3358}
3359
2897sub reload_regions { 3360sub reload_regions {
3361 # HACK to clear player env face cache, we need some signal framework
3362 # for this (global event?)
3363 %ext::player_env::MUSIC_FACE_CACHE = ();
3364
2898 load_resource_file "$MAPDIR/regions" 3365 load_resource_file "$MAPDIR/regions"
2899 or die "unable to load regions file\n"; 3366 or die "unable to load regions file\n";
2900 3367
2901 for (cf::region::list) { 3368 for (cf::region::list) {
2902 $_->{match} = qr/$_->{match}/ 3369 $_->{match} = qr/$_->{match}/
… …
2910} 3377}
2911 3378
2912sub reload_archetypes { 3379sub reload_archetypes {
2913 load_resource_file "$DATADIR/archetypes" 3380 load_resource_file "$DATADIR/archetypes"
2914 or die "unable to load archetypes\n"; 3381 or die "unable to load archetypes\n";
2915 #d# NEED to laod twice to resolve forward references
2916 # this really needs to be done in an extra post-pass
2917 # (which needs to be synchronous, so solve it differently)
2918 load_resource_file "$DATADIR/archetypes"
2919 or die "unable to load archetypes\n";
2920} 3382}
2921 3383
2922sub reload_treasures { 3384sub reload_treasures {
2923 load_resource_file "$DATADIR/treasures" 3385 load_resource_file "$DATADIR/treasures"
2924 or die "unable to load treasurelists\n"; 3386 or die "unable to load treasurelists\n";
2925} 3387}
2926 3388
2927sub reload_resources { 3389sub reload_resources {
2928 warn "reloading resource files...\n"; 3390 warn "reloading resource files...\n";
2929 3391
3392 reload_facedata;
3393 reload_archetypes;
2930 reload_regions; 3394 reload_regions;
2931 reload_facedata;
2932 #reload_archetypes;#d#
2933 reload_archetypes;
2934 reload_treasures; 3395 reload_treasures;
2935 3396
2936 warn "finished reloading resource files\n"; 3397 warn "finished reloading resource files\n";
2937} 3398}
2938 3399
2939sub init { 3400sub init {
3401 my $guard = freeze_mainloop;
3402
2940 reload_resources; 3403 reload_resources;
2941} 3404}
2942 3405
2943sub cfg_load { 3406sub reload_config {
2944 open my $fh, "<:utf8", "$CONFDIR/config" 3407 open my $fh, "<:utf8", "$CONFDIR/config"
2945 or return; 3408 or return;
2946 3409
2947 local $/; 3410 local $/;
2948 *CFG = YAML::Syck::Load <$fh>; 3411 *CFG = YAML::Load <$fh>;
2949 3412
2950 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2951 3414
2952 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2953 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2964sub main { 3427sub main {
2965 # we must not ever block the main coroutine 3428 # we must not ever block the main coroutine
2966 local $Coro::idle = sub { 3429 local $Coro::idle = sub {
2967 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2968 (async { 3431 (async {
2969 Event::one_event; 3432 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT;
2970 })->prio (Coro::PRIO_MAX); 3434 })->prio (Coro::PRIO_MAX);
2971 }; 3435 };
2972 3436
2973 cfg_load; 3437 {
3438 my $guard = freeze_mainloop;
3439 reload_config;
2974 db_init; 3440 db_init;
2975 load_extensions; 3441 load_extensions;
2976 3442
2977 $TICK_WATCHER->start; 3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3444 }
3445
2978 Event::loop; 3446 EV::loop;
2979} 3447}
2980 3448
2981############################################################################# 3449#############################################################################
2982# initialisation and cleanup 3450# initialisation and cleanup
2983 3451
2984# install some emergency cleanup handlers 3452# install some emergency cleanup handlers
2985BEGIN { 3453BEGIN {
3454 our %SIGWATCHER = ();
2986 for my $signal (qw(INT HUP TERM)) { 3455 for my $signal (qw(INT HUP TERM)) {
2987 Event->signal ( 3456 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2988 reentrant => 0,
2989 data => WF_AUTOCANCEL,
2990 signal => $signal,
2991 prio => 0,
2992 cb => sub {
2993 cf::cleanup "SIG$signal"; 3457 cf::cleanup "SIG$signal";
2994 },
2995 ); 3458 };
2996 } 3459 }
2997} 3460}
2998 3461
2999sub write_runtime { 3462sub write_runtime_sync {
3000 my $runtime = "$LOCALDIR/runtime"; 3463 my $runtime = "$LOCALDIR/runtime";
3001 3464
3002 # first touch the runtime file to show we are still running: 3465 # first touch the runtime file to show we are still running:
3003 # the fsync below can take a very very long time. 3466 # the fsync below can take a very very long time.
3004 3467
… …
3030 and return; 3493 and return;
3031 3494
3032 warn "runtime file written.\n"; 3495 warn "runtime file written.\n";
3033 3496
3034 1 3497 1
3498}
3499
3500our $uuid_lock;
3501our $uuid_skip;
3502
3503sub write_uuid_sync($) {
3504 $uuid_skip ||= $_[0];
3505
3506 return if $uuid_lock;
3507 local $uuid_lock = 1;
3508
3509 my $uuid = "$LOCALDIR/uuid";
3510
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return;
3513
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3515 $uuid_skip = 0;
3516
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return;
3519
3520 # always fsync - this file is important
3521 aio_fsync $fh
3522 and return;
3523
3524 close $fh
3525 or return;
3526
3527 aio_rename "$uuid~", $uuid
3528 and return;
3529
3530 warn "uuid file written ($value).\n";
3531
3532 1
3533
3534}
3535
3536sub write_uuid($$) {
3537 my ($skip, $sync) = @_;
3538
3539 $sync ? write_uuid_sync $skip
3540 : async { write_uuid_sync $skip };
3035} 3541}
3036 3542
3037sub emergency_save() { 3543sub emergency_save() {
3038 my $freeze_guard = cf::freeze_mainloop; 3544 my $freeze_guard = cf::freeze_mainloop;
3039 3545
… …
3045 # and maps saved/destroyed asynchronously. 3551 # and maps saved/destroyed asynchronously.
3046 warn "begin emergency player save\n"; 3552 warn "begin emergency player save\n";
3047 for my $login (keys %cf::PLAYER) { 3553 for my $login (keys %cf::PLAYER) {
3048 my $pl = $cf::PLAYER{$login} or next; 3554 my $pl = $cf::PLAYER{$login} or next;
3049 $pl->valid or next; 3555 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3050 $pl->save; 3557 $pl->save;
3051 } 3558 }
3052 warn "end emergency player save\n"; 3559 warn "end emergency player save\n";
3053 3560
3054 warn "begin emergency map save\n"; 3561 warn "begin emergency map save\n";
… …
3060 warn "end emergency map save\n"; 3567 warn "end emergency map save\n";
3061 3568
3062 warn "begin emergency database checkpoint\n"; 3569 warn "begin emergency database checkpoint\n";
3063 BDB::db_env_txn_checkpoint $DB_ENV; 3570 BDB::db_env_txn_checkpoint $DB_ENV;
3064 warn "end emergency database checkpoint\n"; 3571 warn "end emergency database checkpoint\n";
3572
3573 warn "begin write uuid\n";
3574 write_uuid_sync 1;
3575 warn "end write uuid\n";
3065 }; 3576 };
3066 3577
3067 warn "leave emergency perl save\n"; 3578 warn "leave emergency perl save\n";
3068} 3579}
3069 3580
… …
3084 warn "reloading..."; 3595 warn "reloading...";
3085 3596
3086 warn "entering sync_job"; 3597 warn "entering sync_job";
3087 3598
3088 cf::sync_job { 3599 cf::sync_job {
3089 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3090 cf::emergency_save; 3601 cf::emergency_save;
3091 cf::write_runtime; # external watchdog should not bark 3602 cf::write_runtime_sync; # external watchdog should not bark
3092 3603
3093 warn "syncing database to disk"; 3604 warn "syncing database to disk";
3094 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
3095 3606
3096 # if anything goes wrong in here, we should simply crash as we already saved 3607 # if anything goes wrong in here, we should simply crash as we already saved
3097
3098 warn "cancelling all WF_AUTOCANCEL watchers";
3099 for (Event::all_watchers) {
3100 $_->cancel if $_->data & WF_AUTOCANCEL;
3101 }
3102 3608
3103 warn "flushing outstanding aio requests"; 3609 warn "flushing outstanding aio requests";
3104 for (;;) { 3610 for (;;) {
3105 BDB::flush; 3611 BDB::flush;
3106 IO::AIO::flush; 3612 IO::AIO::flush;
3107 Coro::cede; 3613 Coro::cede_notself;
3108 last unless IO::AIO::nreqs || BDB::nreqs; 3614 last unless IO::AIO::nreqs || BDB::nreqs;
3109 warn "iterate..."; 3615 warn "iterate...";
3110 } 3616 }
3111 3617
3112 ++$RELOAD; 3618 ++$RELOAD;
… …
3171 warn "reloading cf.pm"; 3677 warn "reloading cf.pm";
3172 require cf; 3678 require cf;
3173 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3174 3680
3175 warn "loading config and database again"; 3681 warn "loading config and database again";
3176 cf::cfg_load; 3682 cf::reload_config;
3177 3683
3178 warn "loading extensions"; 3684 warn "loading extensions";
3179 cf::load_extensions; 3685 cf::load_extensions;
3180 3686
3181 warn "reattaching attachments to objects/players"; 3687 warn "reattaching attachments to objects/players";
… …
3188 warn "leaving sync_job"; 3694 warn "leaving sync_job";
3189 3695
3190 1 3696 1
3191 } or do { 3697 } or do {
3192 warn $@; 3698 warn $@;
3193 warn "error while reloading, exiting."; 3699 cf::cleanup "error while reloading, exiting.";
3194 exit 1;
3195 }; 3700 };
3196 3701
3197 warn "reloaded"; 3702 warn "reloaded";
3198}; 3703};
3199 3704
… …
3201 3706
3202sub reload_perl() { 3707sub reload_perl() {
3203 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
3204 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
3205 3710
3206 $RELOAD_WATCHER ||= Event->timer ( 3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3207 reentrant => 0,
3208 after => 0,
3209 data => WF_AUTOCANCEL,
3210 cb => sub {
3211 do_reload_perl; 3712 do_reload_perl;
3212 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
3213 },
3214 ); 3714 };
3215} 3715}
3216 3716
3217register_command "reload" => sub { 3717register_command "reload" => sub {
3218 my ($who, $arg) = @_; 3718 my ($who, $arg) = @_;
3219 3719
3220 if ($who->flag (FLAG_WIZ)) { 3720 if ($who->flag (FLAG_WIZ)) {
3221 $who->message ("reloading server."); 3721 $who->message ("reloading server.");
3722 async {
3723 $Coro::current->{desc} = "perl_reload";
3222 async { reload_perl }; 3724 reload_perl;
3725 };
3223 } 3726 }
3224}; 3727};
3225 3728
3226unshift @INC, $LIBDIR; 3729unshift @INC, $LIBDIR;
3227 3730
… …
3229 3732
3230our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
3231our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
3232 3735
3233sub wait_for_tick { 3736sub wait_for_tick {
3234 return unless $TICK_WATCHER->is_active;
3235 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3236 3738
3237 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3238 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
3239 $signal->wait; 3741 $signal->wait;
3240} 3742}
3241 3743
3242sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
3243 return unless $TICK_WATCHER->is_active;
3244 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3245 3746
3246 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3247 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
3248 $signal->wait; 3749 $signal->wait;
3249} 3750}
3250 3751
3251 my $min = 1e6;#d# 3752sub tick {
3252 my $avg = 10;
3253$TICK_WATCHER = Event->timer (
3254 reentrant => 0,
3255 parked => 1,
3256 prio => 0,
3257 at => $NEXT_TICK || $TICK,
3258 data => WF_AUTOCANCEL,
3259 cb => sub {
3260 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
3261 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3754 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3262 unless ++$bug_warning > 10; 3755 unless ++$bug_warning > 10;
3263 return; 3756 return;
3264 } 3757 }
3265 3758
3266 $NOW = $tick_start = Event::time;
3267
3268 cf::server_tick; # one server iteration 3759 cf::server_tick; # one server iteration
3269 3760
3270 0 && sync_job {#d# 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3271 for(1..10) { 3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3272 my $t = Event::time; 3763 Coro::async_pool {
3273 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3764 $Coro::current->{desc} = "runtime saver";
3274 or die; 3765 write_runtime_sync
3275 3766 or warn "ERROR: unable to write runtime file: $!";
3276 $map->width (50);
3277 $map->height (50);
3278 $map->alloc;
3279 $map->_load_objects ("/tmp/x.map", 1);
3280 my $t = Event::time - $t;
3281
3282 #next unless $t < 0.0013;#d#
3283 if ($t < $min) {
3284 $min = $t;
3285 }
3286 $avg = $avg * 0.99 + $t * 0.01;
3287 }
3288 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3289 exit 0;
3290 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3291 }; 3767 };
3768 }
3292 3769
3293 $RUNTIME += $TICK;
3294 $NEXT_TICK += $TICK;
3295
3296 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3297 $NEXT_RUNTIME_WRITE = $NOW + 10;
3298 Coro::async_pool {
3299 write_runtime
3300 or warn "ERROR: unable to write runtime file: $!";
3301 };
3302 }
3303
3304# my $AFTER = Event::time;
3305# warn $AFTER - $NOW;#d#
3306
3307 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3308 $sig->send; 3771 $sig->send;
3309 } 3772 }
3310 while (my $sig = shift @WAIT_FOR_TICK) { 3773 while (my $sig = shift @WAIT_FOR_TICK) {
3311 $sig->send; 3774 $sig->send;
3312 } 3775 }
3313 3776
3314 $NOW = Event::time; 3777 $LOAD = ($NOW - $TICK_START) / $TICK;
3315
3316 # if we are delayed by four ticks or more, skip them all
3317 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3318
3319 $TICK_WATCHER->at ($NEXT_TICK);
3320 $TICK_WATCHER->start;
3321
3322 $LOAD = ($NOW - $tick_start) / $TICK;
3323 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3324 3779
3325 _post_tick; 3780 if (0) {
3326 3781 if ($NEXT_TICK) {
3327 3782 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d#
3785 }
3328 }, 3786 }
3329); 3787}
3330 3788
3331{ 3789{
3332 BDB::max_poll_time $TICK * 0.1; 3790 # configure BDB
3333 $BDB_POLL_WATCHER = Event->io ( 3791
3334 reentrant => 0,
3335 fd => BDB::poll_fileno,
3336 poll => 'r',
3337 prio => 0,
3338 data => WF_AUTOCANCEL,
3339 cb => \&BDB::poll_cb,
3340 );
3341 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3342 3793 BDB::max_poll_reqs $TICK * 0.1;
3343 BDB::set_sync_prepare { 3794 $AnyEvent::BDB::WATCHER->priority (1);
3344 my $status;
3345 my $current = $Coro::current;
3346 (
3347 sub {
3348 $status = $!;
3349 $current->ready; undef $current;
3350 },
3351 sub {
3352 Coro::schedule while defined $current;
3353 $! = $status;
3354 },
3355 )
3356 };
3357 3795
3358 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3359 $DB_ENV = BDB::db_env_create; 3797 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3799 | BDB::LOG_AUTOREMOVE, 1);
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3360 3802
3361 cf::sync_job { 3803 cf::sync_job {
3362 eval { 3804 eval {
3363 BDB::db_env_open 3805 BDB::db_env_open
3364 $DB_ENV, 3806 $DB_ENV,
… …
3366 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3808 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3367 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3809 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3368 0666; 3810 0666;
3369 3811
3370 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3812 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3371
3372 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3373 $DB_ENV->set_lk_detect;
3374 }; 3813 };
3375 3814
3376 cf::cleanup "db_env_open(db): $@" if $@; 3815 cf::cleanup "db_env_open(db): $@" if $@;
3377 }; 3816 };
3378 } 3817 }
3818
3819 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3820 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3821 };
3822 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3823 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3824 };
3825 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3826 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3827 };
3379} 3828}
3380 3829
3381{ 3830{
3831 # configure IO::AIO
3832
3382 IO::AIO::min_parallel 8; 3833 IO::AIO::min_parallel 8;
3383
3384 undef $Coro::AIO::WATCHER;
3385 IO::AIO::max_poll_time $TICK * 0.1; 3834 IO::AIO::max_poll_time $TICK * 0.1;
3386 $AIO_POLL_WATCHER = Event->io ( 3835 #undef $AnyEvent::AIO::WATCHER;
3387 reentrant => 0,
3388 data => WF_AUTOCANCEL,
3389 fd => IO::AIO::poll_fileno,
3390 poll => 'r',
3391 prio => 6,
3392 cb => \&IO::AIO::poll_cb,
3393 );
3394} 3836}
3395 3837
3396my $_log_backtrace; 3838my $_log_backtrace;
3397 3839
3398sub _log_backtrace { 3840sub _log_backtrace {
… …
3402 3844
3403 # limit the # of concurrent backtraces 3845 # limit the # of concurrent backtraces
3404 if ($_log_backtrace < 2) { 3846 if ($_log_backtrace < 2) {
3405 ++$_log_backtrace; 3847 ++$_log_backtrace;
3406 async { 3848 async {
3849 $Coro::current->{desc} = "abt $msg";
3850
3407 my @bt = fork_call { 3851 my @bt = fork_call {
3408 @addr = map { sprintf "%x", $_ } @addr; 3852 @addr = map { sprintf "%x", $_ } @addr;
3409 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3853 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3410 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3854 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3411 or die "addr2line: $!"; 3855 or die "addr2line: $!";
… …
3434# load additional modules 3878# load additional modules
3435use cf::pod; 3879use cf::pod;
3436 3880
3437END { cf::emergency_save } 3881END { cf::emergency_save }
3438 3882
3883evthread_start IO::AIO::poll_fileno;
3884
34391 38851
3440 3886

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines