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.348 by root, Thu Aug 30 08:34:40 2007 UTC vs.
Revision 1.441 by root, Sat Aug 30 05:19:03 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.64 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
24use Coro::Util (); 49use Coro::Util ();
25 50
26use JSON::XS (); 51use JSON::XS 2.01 ();
27use BDB (); 52use BDB ();
28use Data::Dumper; 53use Data::Dumper;
29use Digest::MD5; 54use Digest::MD5;
30use Fcntl; 55use Fcntl;
31use YAML::Syck (); 56use YAML ();
32use IO::AIO 2.32 (); 57use IO::AIO ();
33use Time::HiRes; 58use Time::HiRes;
34use Compress::LZF; 59use Compress::LZF;
35use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::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
41Compress::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
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 69
48$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
49 71
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 73
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
75 98
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 101our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
83 103
104our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 106our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 107our $DB_ENV;
86 108
87our %CFG; 109our %CFG;
88 110
89our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 112our $RUNTIME;
113our $NOW;
91 114
92our %PLAYER; # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 116our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
95 118
96# 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 ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 121
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
102 126
103binmode STDOUT; 127binmode STDOUT;
104binmode STDERR; 128binmode STDERR;
105 129
106# read virtual server time, if available 130# read virtual server time, if available
159 183
160The raw value load value from the last tick. 184The raw value load value from the last tick.
161 185
162=item %cf::CFG 186=item %cf::CFG
163 187
164Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 189from wherever your confdir points to.
166 190
167=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
168 192
169These 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
187 $msg .= "\n" 211 $msg .= "\n"
188 unless $msg =~ /\n$/; 212 unless $msg =~ /\n$/;
189 213
190 $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;
191 215
192 utf8::encode $msg;
193 LOG llevError, $msg; 216 LOG llevError, $msg;
194 }; 217 };
195} 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#?
196 234
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 245for my $pkg (qw(
208 cf::global cf::attachable 246 cf::global cf::attachable
209 cf::object cf::object::player 247 cf::object cf::object::player
210 cf::client cf::player 248 cf::client cf::player
211 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
212 cf::map cf::party cf::region 251 cf::party cf::region
213)) { 252)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 254}
217 255
218$Event::DIED = sub { 256$EV::DIED = sub {
219 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
220}; 258};
221 259
222############################################################################# 260#############################################################################
223 261
246 $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;
247 $d 285 $d
248 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
249} 287}
250 288
251=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
252 290
253Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
254 292
255=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
256 294
257Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
258 296
259=cut 297=cut
260 298
261our $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
262 300
263sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
265 303
266=item cf::lock_wait $string 304=item cf::lock_wait $string
267 305
268Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
269 307
285Return 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.
286 324
287=cut 325=cut
288 326
289our %LOCK; 327our %LOCK;
328our %LOCKER;#d#
290 329
291sub lock_wait($) { 330sub lock_wait($) {
292 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#
293 337
294 # wait for lock, if any 338 # wait for lock, if any
295 while ($LOCK{$key}) { 339 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 340 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 341 Coro::schedule;
303 347
304 # wait, to be sure we are not locked 348 # wait, to be sure we are not locked
305 lock_wait $key; 349 lock_wait $key;
306 350
307 $LOCK{$key} = []; 351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
308 353
309 Coro::guard { 354 Coro::guard {
355 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 356 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 357 $_->ready for @{ delete $LOCK{$key} };
312 } 358 }
313} 359}
314 360
317 363
318 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
319} 365}
320 366
321sub freeze_mainloop { 367sub freeze_mainloop {
322 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
323 369
324 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
325 $TICK_WATCHER->start; 371}
326 }; 372
327 $TICK_WATCHER->stop; 373=item cf::periodic $interval, $cb
328 $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
329} 386}
330 387
331=item cf::get_slot $time[, $priority[, $name]] 388=item cf::get_slot $time[, $priority[, $name]]
332 389
333Allocate $time seconds of blocking CPU time at priority C<$priority>: 390Allocate $time seconds of blocking CPU time at priority C<$priority>:
344our @SLOT_QUEUE; 401our @SLOT_QUEUE;
345our $SLOT_QUEUE; 402our $SLOT_QUEUE;
346 403
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
349 my $signal = new Coro::Signal; 408 my $signal = new Coro::Signal;
350 409
351 while () { 410 while () {
352 next_job: 411 next_job:
353 my $avail = cf::till_tick; 412 my $avail = cf::till_tick;
361 } 420 }
362 } 421 }
363 } 422 }
364 423
365 if (@SLOT_QUEUE) { 424 if (@SLOT_QUEUE) {
366 # 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
367 push @cf::WAIT_FOR_TICK, $signal; 426 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 427 $signal->wait;
369 } else { 428 } else {
370 Coro::schedule; 429 Coro::schedule;
371 } 430 }
372 } 431 }
373}; 432};
374 433
375sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
376 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
377 438
378 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
380 441
394 455
395BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
396 457
397=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
398 459
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
401partly 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
402acceptable. 463acceptable.
403 464
404If 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
405the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
410 471
411sub sync_job(&) { 472sub sync_job(&) {
412 my ($job) = @_; 473 my ($job) = @_;
413 474
414 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
415 my $time = Event::time; 476 my $time = EV::time;
416 477
417 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
419 480
420 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
421 # (but this is cancel-safe) 482
422 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
423 484
424 my $busy = 1; 485 my $busy = 1;
425 my @res; 486 my @res;
426 487
427 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 490 @res = eval { $job->() };
429 warn $@ if $@; 491 warn $@ if $@;
430 undef $busy; 492 undef $busy;
431 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
432 494
433 while ($busy) { 495 while ($busy) {
434 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
435 } 500 }
501 }
436 502
437 $time = Event::time - $time; 503 my $time = EV::time - $time;
438 504
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
443 506
444 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
445 } else { 508 } else {
446 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
447 510
472=item fork_call { }, $args 535=item fork_call { }, $args
473 536
474Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
478 541
479=cut 542=cut
480 543
481sub fork_call(&@) { 544sub fork_call(&@) {
482 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
483 546
484 # we seemingly have to make a local copy of the whole thing, 547 # we seemingly have to make a local copy of the whole thing,
485 # otherwise perl prematurely frees the stuff :/ 548 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 549 # TODO: investigate and fix (likely this will be rather laborious)
487 550
488 my @res = Coro::Util::fork_eval { 551 my @res = Coro::Util::fork_eval {
489 reset_signals; 552 reset_signals;
490 &$cb 553 &$cb
491 }, @args; 554 }, @args;
492 555
493 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
494} 557}
495 558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
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
584}
585
496=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
497 587
498Returns a single value from the environment database. 588Returns a single value from the environment database.
499 589
500=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
501 591
502Stores 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
503data 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).
504 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
505=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}
506 618
507our $DB; 619our $DB;
508 620
509sub db_init { 621sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 622 cf::sync_job {
514 eval { 623 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 624 };
524} 625}
525 626
526sub db_get($$) { 627sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
528 629
632attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
634 735
635In 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>
636C<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
637Crossfire TRT). 738Deliantra).
638 739
639=over 4 740=over 4
640 741
641=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
642 743
924 } 1025 }
925 1026
926 0 1027 0
927} 1028}
928 1029
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 1031
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 1033
933Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
934 1035
940 1041
941=cut 1042=cut
942 1043
943############################################################################# 1044#############################################################################
944# object support 1045# object support
945#
946 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#
947sub _can_merge { 1080sub _can_merge {
948 my ($ob1, $ob2) = @_; 1081 my ($ob1, $ob2) = @_;
949 1082
950 local $Storable::canonical = 1; 1083 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1084
954 $fob1 eq $fob2 1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
955} 1087}
956 1088
957sub reattach { 1089sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1091 my ($obj) = @_;
960 1092
1093 # no longer needed after getting rid of delete_package?
961 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
962 1095
963 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
964 1097
965 @$registry = (); 1098 @$registry = ();
966 1099
981cf::attachable->attach ( 1114cf::attachable->attach (
982 prio => -1000000, 1115 prio => -1000000,
983 on_instantiate => sub { 1116 on_instantiate => sub {
984 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
985 1118
986 $data = from_json $data; 1119 $data = decode_json $data;
987 1120
988 for (@$data) { 1121 for (@$data) {
989 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
990 1123
991 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
1007sub object_freezer_save { 1140sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
1009 1142
1010 sync_job { 1143 sync_job {
1011 if (length $$rdata) { 1144 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1014 1148
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1019 close $fh; 1153 aio_close $fh;
1020 1154
1021 if (@$objs) { 1155 if (@$objs) {
1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1023 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1026 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1027 close $fh; 1161 aio_close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1163 }
1030 } else { 1164 } else {
1031 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1032 } 1166 }
1037 } 1171 }
1038 } else { 1172 } else {
1039 aio_unlink $filename; 1173 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1174 aio_unlink "$filename.pst";
1041 } 1175 }
1042 } 1176 };
1043} 1177}
1044 1178
1045sub object_freezer_as_string { 1179sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1180 my ($rdata, $objs) = @_;
1047 1181
1059 or return; 1193 or return;
1060 1194
1061 unless (aio_stat "$filename.pst") { 1195 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1196 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1197 or return;
1198
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1199 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs};
1065 } 1201 }
1066 1202
1203 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1204 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1205 $decname, length $data, scalar @{$av || []};
1206
1069 return ($data, $av); 1207 ($data, $av)
1070} 1208}
1071 1209
1072=head2 COMMAND CALLBACKS 1210=head2 COMMAND CALLBACKS
1073 1211
1074=over 4 1212=over 4
1197 1335
1198 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1199 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1200 1338
1201 $ext{source} = 1339 $ext{source} =
1202 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1203 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1204 . $source 1342 . $source
1205 . "\n};\n1"; 1343 . "\n};\n1";
1206 1344
1207 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
1223 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1224 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1225 1363
1226 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1227 warn $msg; 1365 warn $msg;
1228 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1229 exit 1;
1230 } 1367 }
1231 1368
1232 warn $msg; 1369 warn $msg;
1233 } 1370 }
1234 1371
1259use Coro::AIO; 1396use Coro::AIO;
1260 1397
1261=head3 cf::player 1398=head3 cf::player
1262 1399
1263=over 4 1400=over 4
1401
1402=item cf::player::num_playing
1403
1404Returns the official number of playing players, as per the Crossfire metaserver rules.
1405
1406=cut
1407
1408sub num_playing {
1409 scalar grep
1410 $_->ob->map
1411 && !$_->hidden
1412 && !$_->ob->flag (cf::FLAG_WIZ),
1413 cf::player::list
1414}
1264 1415
1265=item cf::player::find $login 1416=item cf::player::find $login
1266 1417
1267Returns the given player object, loading it if necessary (might block). 1418Returns the given player object, loading it if necessary (might block).
1268 1419
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1455 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1456 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1457 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1458 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1459
1309 my $pl = load_pl path $login 1460 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1461 or return;
1462
1463 my $pl = cf::player::load_pl $f
1464 or return;
1465
1466 local $cf::PLAYER_LOADING{$login} = $pl;
1467 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1312 } 1469 }
1313 } 1470 }
1314} 1471}
1315 1472
1323 1480
1324 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1325 1482
1326 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1327 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1328 1487
1329 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1330 cf::cede_to_tick; 1489 cf::cede_to_tick;
1331} 1490}
1332 1491
1368 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1369 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we nuked the dir
1370 1529
1371 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1372 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1373 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1374 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1375 1536
1376 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1377 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
1413 or return []; 1574 or return [];
1414 1575
1415 my @logins; 1576 my @logins;
1416 1577
1417 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1579 my $path = path $login;
1580
1581 # a .pst is a dead give-away for a valid player
1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1587 }
1421 1588
1422 utf8::decode $login; 1589 utf8::decode $login;
1423 push @logins, $login; 1590 push @logins, $login;
1424 } 1591 }
1425 1592
1458 1625
1459Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1460 1627
1461=cut 1628=cut
1462 1629
1630use re 'eval';
1631
1632my $group;
1633my $interior; $interior = qr{
1634 # match a pod interior sequence sans C<< >>
1635 (?:
1636 \ (.*?)\ (?{ $group = $^N })
1637 | < (??{$interior}) >
1638 )
1639}x;
1640
1463sub expand_cfpod { 1641sub expand_cfpod {
1464 ((my $self), (local $_)) = @_; 1642 my ($self, $pod) = @_;
1465 1643
1466 # escape & and < 1644 my $xml;
1467 s/&/&amp;/g;
1468 s/(?<![BIUGH])</&lt;/g;
1469 1645
1470 # this is buggy, it needs to properly take care of nested <'s 1646 while () {
1647 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1648 $group = $1;
1471 1649
1472 1 while 1650 $group =~ s/&/&amp;/g;
1473 # replace B<>, I<>, U<> etc. 1651 $group =~ s/</&lt;/g;
1474 s/B<([^\>]*)>/<b>$1<\/b>/ 1652
1475 || s/I<([^\>]*)>/<i>$1<\/i>/ 1653 $xml .= $group;
1476 || s/U<([^\>]*)>/<u>$1<\/u>/ 1654 } elsif ($pod =~ m%\G
1477 # replace G<male|female> tags 1655 ([BCGHITU])
1478 || s{G<([^>|]*)\|([^>]*)>}{ 1656 <
1479 $self->gender ? $2 : $1 1657 (?:
1480 }ge 1658 ([^<>]*) (?{ $group = $^N })
1481 # replace H<hint text> 1659 | < $interior >
1482 || s{H<([^\>]*)>} 1660 )
1661 >
1662 %gcsx
1483 { 1663 ) {
1664 my ($code, $data) = ($1, $group);
1665
1666 if ($code eq "B") {
1667 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1668 } elsif ($code eq "I") {
1669 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1670 } elsif ($code eq "U") {
1671 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1672 } elsif ($code eq "C") {
1673 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1674 } elsif ($code eq "T") {
1675 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1676 } elsif ($code eq "G") {
1677 my ($male, $female) = split /\|/, $data;
1678 $data = $self->gender ? $female : $male;
1679 $xml .= expand_cfpod ($self, $data);
1680 } elsif ($code eq "H") {
1484 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1681 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1485 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1682 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1486 "") 1683 "")
1487 [$self->{hintmode}] 1684 [$self->{hintmode}];
1685 } else {
1686 $xml .= "error processing '$code($data)' directive";
1488 }ge; 1687 }
1688 } else {
1689 if ($pod =~ /\G(.+)/) {
1690 warn "parse error while expanding $pod (at $1)";
1691 }
1692 last;
1693 }
1694 }
1489 1695
1696 for ($xml) {
1490 # create single paragraphs (very hackish) 1697 # create single paragraphs (very hackish)
1491 s/(?<=\S)\n(?=\w)/ /g; 1698 s/(?<=\S)\n(?=\w)/ /g;
1492 1699
1493 # compress some whitespace 1700 # compress some whitespace
1494 s/\s+\n/\n/g; # ws line-ends 1701 s/\s+\n/\n/g; # ws line-ends
1495 s/\n\n+/\n/g; # double lines 1702 s/\n\n+/\n/g; # double lines
1496 s/^\n+//; # beginning lines 1703 s/^\n+//; # beginning lines
1497 s/\n+$//; # ending lines 1704 s/\n+$//; # ending lines
1705 }
1498 1706
1499 $_ 1707 $xml
1500} 1708}
1709
1710no re 'eval';
1501 1711
1502sub hintmode { 1712sub hintmode {
1503 $_[0]{hintmode} = $_[1] if @_ > 1; 1713 $_[0]{hintmode} = $_[1] if @_ > 1;
1504 $_[0]{hintmode} 1714 $_[0]{hintmode}
1505} 1715}
1577our $MAX_RESET = 3600; 1787our $MAX_RESET = 3600;
1578our $DEFAULT_RESET = 3000; 1788our $DEFAULT_RESET = 3000;
1579 1789
1580sub generate_random_map { 1790sub generate_random_map {
1581 my ($self, $rmp) = @_; 1791 my ($self, $rmp) = @_;
1792
1793 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1794
1582 # mit "rum" bekleckern, nicht 1795 # mit "rum" bekleckern, nicht
1583 $self->_create_random_map ( 1796 $self->_create_random_map (
1584 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1797 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1585 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1798 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1586 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1799 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1708 1921
1709# the temporary/swap location 1922# the temporary/swap location
1710sub save_path { 1923sub save_path {
1711 my ($self) = @_; 1924 my ($self) = @_;
1712 1925
1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1714 "$TMPDIR/$path.map" 1927 "$TMPDIR/$path.map"
1715} 1928}
1716 1929
1717# the unique path, undef == no special unique path 1930# the unique path, undef == no special unique path
1718sub uniq_path { 1931sub uniq_path {
1719 my ($self) = @_; 1932 my ($self) = @_;
1720 1933
1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1722 "$UNIQUEDIR/$path" 1935 "$UNIQUEDIR/$path"
1723} 1936}
1724 1937
1725# and all this just because we cannot iterate over 1938# and all this just because we cannot iterate over
1726# all maps in C++... 1939# all maps in C++...
1749 1962
1750sub load_header_from($) { 1963sub load_header_from($) {
1751 my ($self, $path) = @_; 1964 my ($self, $path) = @_;
1752 1965
1753 utf8::encode $path; 1966 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1967 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1968 or return;
1969
1970 $self->_load_header ($f)
1971 or return;
1972
1973 local $MAP_LOADING{$self->{path}} = $self;
1974 $f->resolve_delayed_derefs;
1759 1975
1760 $self->{load_path} = $path; 1976 $self->{load_path} = $path;
1761 1977
1762 1 1978 1
1763} 1979}
1817sub find { 2033sub find {
1818 my ($path, $origin) = @_; 2034 my ($path, $origin) = @_;
1819 2035
1820 $path = normalise $path, $origin && $origin->path; 2036 $path = normalise $path, $origin && $origin->path;
1821 2037
2038 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 2039 cf::lock_wait "map_find:$path";
1823 2040
1824 $cf::MAP{$path} || do { 2041 $cf::MAP{$path} || do {
2042 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1825 my $guard = cf::lock_acquire "map_find:$path"; 2043 my $guard2 = cf::lock_acquire "map_find:$path";
2044
1826 my $map = new_from_path cf::map $path 2045 my $map = new_from_path cf::map $path
1827 or return; 2046 or return;
1828 2047
1829 $map->{last_save} = $cf::RUNTIME; 2048 $map->{last_save} = $cf::RUNTIME;
1830 2049
1832 or return; 2051 or return;
1833 2052
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2053 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 2054 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 2055 #$cf::WAIT_FOR_TICK->wait;
2056 undef $guard2;
2057 undef $guard1;
1837 $map->reset; 2058 $map->reset;
1838 undef $guard;
1839 return find $path; 2059 return find $path;
1840 } 2060 }
1841 2061
1842 $cf::MAP{$path} = $map 2062 $cf::MAP{$path} = $map
1843 } 2063 }
1852 local $self->{deny_reset} = 1; # loading can take a long time 2072 local $self->{deny_reset} = 1; # loading can take a long time
1853 2073
1854 my $path = $self->{path}; 2074 my $path = $self->{path};
1855 2075
1856 { 2076 {
1857 my $guard1 = cf::lock_acquire "map_data:$path"; 2077 my $guard = cf::lock_acquire "map_data:$path";
1858 my $guard2 = cf::lock_acquire "map_load:$path";
1859 2078
2079 return unless $self->valid;
1860 return if $self->in_memory != cf::MAP_SWAPPED; 2080 return unless $self->in_memory == cf::MAP_SWAPPED;
1861 2081
1862 $self->in_memory (cf::MAP_LOADING); 2082 $self->in_memory (cf::MAP_LOADING);
1863 2083
1864 $self->alloc; 2084 $self->alloc;
1865 2085
1866 $self->pre_load; 2086 $self->pre_load;
1867 cf::cede_to_tick; 2087 cf::cede_to_tick;
1868 2088
2089 my $f = new_from_file cf::object::thawer $self->{load_path};
2090 $f->skip_block;
1869 $self->_load_objects ($self->{load_path}, 1) 2091 $self->_load_objects ($f)
1870 or return; 2092 or return;
1871 2093
1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2094 $self->post_load_original
1873 if delete $self->{load_original}; 2095 if delete $self->{load_original};
1874 2096
1875 if (my $uniq = $self->uniq_path) { 2097 if (my $uniq = $self->uniq_path) {
1876 utf8::encode $uniq; 2098 utf8::encode $uniq;
1877 if (aio_open $uniq, O_RDONLY, 0) { 2099 unless (aio_stat $uniq) {
2100 if (my $f = new_from_file cf::object::thawer $uniq) {
1878 $self->clear_unique_items; 2101 $self->clear_unique_items;
1879 $self->_load_objects ($uniq, 0); 2102 $self->_load_objects ($f);
2103 $f->resolve_delayed_derefs;
2104 }
1880 } 2105 }
1881 } 2106 }
2107
2108 $f->resolve_delayed_derefs;
1882 2109
1883 cf::cede_to_tick; 2110 cf::cede_to_tick;
1884 # now do the right thing for maps 2111 # now do the right thing for maps
1885 $self->link_multipart_objects; 2112 $self->link_multipart_objects;
1886 $self->difficulty ($self->estimate_difficulty) 2113 $self->difficulty ($self->estimate_difficulty)
1898 } 2125 }
1899 2126
1900 $self->{last_save} = $cf::RUNTIME; 2127 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME); 2128 $self->last_access ($cf::RUNTIME);
1902 2129
1903 $self->in_memory (cf::MAP_IN_MEMORY); 2130 $self->in_memory (cf::MAP_ACTIVE);
1904 } 2131 }
1905 2132
1906 $self->post_load; 2133 $self->post_load;
1907} 2134}
1908 2135
1966 my ($path, $origin, $load) = @_; 2193 my ($path, $origin, $load) = @_;
1967 2194
1968 $path = normalise $path, $origin && $origin->{path}; 2195 $path = normalise $path, $origin && $origin->{path};
1969 2196
1970 if (my $map = $cf::MAP{$path}) { 2197 if (my $map = $cf::MAP{$path}) {
1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2198 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1972 } 2199 }
1973 2200
1974 $MAP_PREFETCH{$path} |= $load; 2201 $MAP_PREFETCH{$path} |= $load;
1975 2202
1976 $MAP_PREFETCHER ||= cf::async { 2203 $MAP_PREFETCHER ||= cf::async {
2204 $Coro::current->{desc} = "map prefetcher";
2205
1977 while (%MAP_PREFETCH) { 2206 while (%MAP_PREFETCH) {
1978 while (my ($k, $v) = each %MAP_PREFETCH) { 2207 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $k) { 2208 if (my $map = find $k) {
1980 $map->load if $v; 2209 $map->load if $v;
1981 } 2210 }
2007 return if $self->{deny_save}; 2236 return if $self->{deny_save};
2008 2237
2009 local $self->{last_access} = $self->last_access;#d# 2238 local $self->{last_access} = $self->last_access;#d#
2010 2239
2011 cf::async { 2240 cf::async {
2241 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2242 $_->contr->save for $self->players;
2013 }; 2243 };
2244
2245 cf::get_slot 0.02;
2014 2246
2015 if ($uniq) { 2247 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2017 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2249 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2018 } else { 2250 } else {
2027 $self->save; 2259 $self->save;
2028 2260
2029 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2262
2031 return if $self->players; 2263 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2264 return if $self->in_memory != cf::MAP_ACTIVE;
2033 return if $self->{deny_save}; 2265 return if $self->{deny_save};
2034 2266
2267 $self->in_memory (cf::MAP_SWAPPED);
2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2271 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2272}
2038 2273
2039sub reset_at { 2274sub reset_at {
2040 my ($self) = @_; 2275 my ($self) = @_;
2041 2276
2073 if $uniq; 2308 if $uniq;
2074 } 2309 }
2075 2310
2076 delete $cf::MAP{$self->path}; 2311 delete $cf::MAP{$self->path};
2077 2312
2313 $self->deactivate;
2314 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2315 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2316
2082 $self->unlink_save; 2317 $self->unlink_save;
2083 $self->destroy; 2318 $self->destroy;
2084} 2319}
2085 2320
2086my $nuke_counter = "aaaa"; 2321my $nuke_counter = "aaaa";
2087 2322
2088sub nuke { 2323sub nuke {
2089 my ($self) = @_; 2324 my ($self) = @_;
2090 2325
2326 {
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2091 delete $cf::MAP{$self->path}; 2329 delete $cf::MAP{$self->path};
2092 2330
2093 $self->unlink_save; 2331 $self->unlink_save;
2094 2332
2095 bless $self, "cf::map"; 2333 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2334 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2335 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2336 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2337 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2338
2101 $cf::MAP{$self->path} = $self; 2339 $cf::MAP{$self->path} = $self;
2340 }
2102 2341
2103 $self->reset; # polite request, might not happen 2342 $self->reset; # polite request, might not happen
2104} 2343}
2105 2344
2106=item $maps = cf::map::tmp_maps 2345=item $maps = cf::map::tmp_maps
2148 2387
2149sub unique_maps() { 2388sub unique_maps() {
2150 [ 2389 [
2151 map { 2390 map {
2152 utf8::decode $_; 2391 utf8::decode $_;
2153 /\.map$/ 2392 s/\.map$//; # TODO future compatibility hack
2393 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2394 ? ()
2154 ? normalise $_ 2395 : normalise $_
2155 : ()
2156 } @{ aio_readdir $UNIQUEDIR or [] } 2396 } @{ aio_readdir $UNIQUEDIR or [] }
2157 ] 2397 ]
2158} 2398}
2159 2399
2160package cf;
2161
2162=back 2400=back
2163 2401
2164=head3 cf::object 2402=head3 cf::object
2165 2403
2166=cut 2404=cut
2169 2407
2170=over 4 2408=over 4
2171 2409
2172=item $ob->inv_recursive 2410=item $ob->inv_recursive
2173 2411
2174Returns the inventory of the object _and_ their inventories, recursively. 2412Returns the inventory of the object I<and> their inventories, recursively,
2413but I<not> the object itself.
2175 2414
2176=cut 2415=cut
2177 2416
2178sub inv_recursive_; 2417sub inv_recursive_;
2179sub inv_recursive_ { 2418sub inv_recursive_ {
2182 2421
2183sub inv_recursive { 2422sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2423 inv_recursive_ inv $_[0]
2185} 2424}
2186 2425
2426=item $ref = $ob->ref
2427
2428Creates and returns a persistent reference to an object that can be stored as a string.
2429
2430=item $ob = cf::object::deref ($refstring)
2431
2432returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2433even if the object actually exists. May block.
2434
2435=cut
2436
2437sub deref {
2438 my ($ref) = @_;
2439
2440 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2441 my ($uuid, $name) = ($1, $2);
2442 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2443 or return;
2444 $pl->ob->uuid eq $uuid
2445 or return;
2446
2447 $pl->ob
2448 } else {
2449 warn "$ref: cannot resolve object reference\n";
2450 undef
2451 }
2452}
2453
2187package cf; 2454package cf;
2188 2455
2189=back 2456=back
2190 2457
2191=head3 cf::object::player 2458=head3 cf::object::player
2197Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2464Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2198can be C<undef>. Does the right thing when the player is currently in a 2465can be C<undef>. Does the right thing when the player is currently in a
2199dialogue with the given NPC character. 2466dialogue with the given NPC character.
2200 2467
2201=cut 2468=cut
2469
2470our $SAY_CHANNEL = {
2471 id => "say",
2472 title => "Map",
2473 reply => "say ",
2474 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2475};
2476
2477our $CHAT_CHANNEL = {
2478 id => "chat",
2479 title => "Chat",
2480 reply => "chat ",
2481 tooltip => "Player chat and shouts, global to the server.",
2482};
2202 2483
2203# rough implementation of a future "reply" method that works 2484# rough implementation of a future "reply" method that works
2204# with dialog boxes. 2485# with dialog boxes.
2205#TODO: the first argument must go, split into a $npc->reply_to ( method 2486#TODO: the first argument must go, split into a $npc->reply_to ( method
2206sub cf::object::player::reply($$$;$) { 2487sub cf::object::player::reply($$$;$) {
2218 my $dialog = $pl->{npc_dialog}; 2499 my $dialog = $pl->{npc_dialog};
2219 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2500 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 2501
2221 } else { 2502 } else {
2222 $msg = $npc->name . " says: $msg" if $npc; 2503 $msg = $npc->name . " says: $msg" if $npc;
2223 $self->message ($msg, $flags); 2504 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2224 } 2505 }
2225 } 2506 }
2226} 2507}
2227 2508
2228=item $object->send_msg ($channel, $msg, $color, [extra...]) 2509=item $object->send_msg ($channel, $msg, $color, [extra...])
2336her, loading and preparing them map, calling the provided $check callback 2617her, loading and preparing them map, calling the provided $check callback
2337that has to return the map if sucecssful, and then unfreezes the player on 2618that has to return the map if sucecssful, and then unfreezes the player on
2338the new (success) or old (failed) map position. In either case, $done will 2619the new (success) or old (failed) map position. In either case, $done will
2339be called at the end of this process. 2620be called at the end of this process.
2340 2621
2622Note that $check will be called with a potentially non-loaded map, so if
2623it needs a loaded map it has to call C<< ->load >>.
2624
2341=cut 2625=cut
2342 2626
2343our $GOTOGEN; 2627our $GOTOGEN;
2344 2628
2345sub cf::object::player::goto { 2629sub cf::object::player::goto {
2349 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2633 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2350 2634
2351 $self->enter_link; 2635 $self->enter_link;
2352 2636
2353 (async { 2637 (async {
2638 $Coro::current->{desc} = "player::goto $path $x $y";
2639
2640 # *tag paths override both path and x|y
2641 if ($path =~ /^\*(.*)$/) {
2642 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2643 my $ob = $obs[rand @obs];
2644
2645 # see if we actually can go there
2646 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2647 $ob = $obs[rand @obs];
2648 } else {
2649 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2650 }
2651 # else put us there anyways for now #d#
2652
2653 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2654 } else {
2655 ($path, $x, $y) = (undef, undef, undef);
2656 }
2657 }
2658
2354 my $map = eval { 2659 my $map = eval {
2355 my $map = cf::map::find $path; 2660 my $map = defined $path ? cf::map::find $path : undef;
2356 2661
2357 if ($map) { 2662 if ($map) {
2358 $map = $map->customise_for ($self); 2663 $map = $map->customise_for ($self);
2359 $map = $check->($map) if $check && $map; 2664 $map = $check->($map) if $check && $map;
2360 } else { 2665 } else {
2361 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2666 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2362 } 2667 }
2363 2668
2364 $map 2669 $map
2365 }; 2670 };
2366 2671
2402} 2707}
2403 2708
2404sub prepare_random_map { 2709sub prepare_random_map {
2405 my ($exit) = @_; 2710 my ($exit) = @_;
2406 2711
2407 my $guard = cf::lock_acquire "exit_prepare:$exit";
2408
2409 # all this does is basically replace the /! path by 2712 # all this does is basically replace the /! path by
2410 # a new random map path (?random/...) with a seed 2713 # a new random map path (?random/...) with a seed
2411 # that depends on the exit object 2714 # that depends on the exit object
2412 2715
2413 my $rmp = parse_random_map_params $exit->msg; 2716 my $rmp = parse_random_map_params $exit->msg;
2415 if ($exit->map) { 2718 if ($exit->map) {
2416 $rmp->{region} = $exit->region->name; 2719 $rmp->{region} = $exit->region->name;
2417 $rmp->{origin_map} = $exit->map->path; 2720 $rmp->{origin_map} = $exit->map->path;
2418 $rmp->{origin_x} = $exit->x; 2721 $rmp->{origin_x} = $exit->x;
2419 $rmp->{origin_y} = $exit->y; 2722 $rmp->{origin_y} = $exit->y;
2723
2724 $exit->map->touch;
2420 } 2725 }
2421 2726
2422 $rmp->{random_seed} ||= $exit->random_seed; 2727 $rmp->{random_seed} ||= $exit->random_seed;
2423 2728
2424 my $data = cf::to_json $rmp; 2729 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2425 my $md5 = Digest::MD5::md5_hex $data; 2730 my $md5 = Digest::MD5::md5_hex $data;
2426 my $meta = "$RANDOMDIR/$md5.meta"; 2731 my $meta = "$RANDOMDIR/$md5.meta";
2427 2732
2428 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2733 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2429 aio_write $fh, 0, (length $data), $data, 0; 2734 aio_write $fh, 0, (length $data), $data, 0;
2430 undef $fh; 2735 undef $fh;
2431 aio_rename "$meta~", $meta; 2736 aio_rename "$meta~", $meta;
2432 2737
2738 my $slaying = "?random/$md5";
2739
2740 if ($exit->valid) {
2433 $exit->slaying ("?random/$md5"); 2741 $exit->slaying ("?random/$md5");
2434 $exit->msg (undef); 2742 $exit->msg (undef);
2743 }
2435 } 2744 }
2436} 2745}
2437 2746
2438sub cf::object::player::enter_exit { 2747sub cf::object::player::enter_exit {
2439 my ($self, $exit) = @_; 2748 my ($self, $exit) = @_;
2440 2749
2441 return unless $self->type == cf::PLAYER; 2750 return unless $self->type == cf::PLAYER;
2442 2751
2443 if ($exit->slaying eq "/!") {
2444 #TODO: this should de-fi-ni-te-ly not be a sync-job
2445 # the problem is that $exit might not survive long enough
2446 # so it needs to be done right now, right here
2447 cf::sync_job { prepare_random_map $exit };
2448 }
2449
2450 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2451 my $hp = $exit->stats->hp;
2452 my $sp = $exit->stats->sp;
2453
2454 $self->enter_link; 2752 $self->enter_link;
2455 2753
2456 # if exit is damned, update players death & WoR home-position
2457 $self->contr->savebed ($slaying, $hp, $sp)
2458 if $exit->flag (FLAG_DAMNED);
2459
2460 (async { 2754 (async {
2461 $self->deactivate_recursive; # just to be sure 2755 $Coro::current->{desc} = "enter_exit";
2756
2462 unless (eval { 2757 unless (eval {
2758 $self->deactivate_recursive; # just to be sure
2759
2760 # random map handling
2761 {
2762 my $guard = cf::lock_acquire "exit_prepare:$exit";
2763
2764 prepare_random_map $exit
2765 if $exit->slaying eq "/!";
2766 }
2767
2768 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2769 my $x = $exit->stats->hp;
2770 my $y = $exit->stats->sp;
2771
2463 $self->goto ($slaying, $hp, $sp); 2772 $self->goto ($map, $x, $y);
2464 2773
2774 # if exit is damned, update players death & WoR home-position
2775 $self->contr->savebed ($map, $x, $y)
2776 if $exit->flag (cf::FLAG_DAMNED);
2777
2465 1; 2778 1
2466 }) { 2779 }) {
2467 $self->message ("Something went wrong deep within the crossfire server. " 2780 $self->message ("Something went wrong deep within the crossfire server. "
2468 . "I'll try to bring you back to the map you were before. " 2781 . "I'll try to bring you back to the map you were before. "
2469 . "Please report this to the dungeon master!", 2782 . "Please report this to the dungeon master!",
2470 cf::NDI_UNIQUE | cf::NDI_RED); 2783 cf::NDI_UNIQUE | cf::NDI_RED);
2500the message, with C<log> being the default. If C<$color> is negative, suppress 2813the message, with C<log> being the default. If C<$color> is negative, suppress
2501the message unless the client supports the msg packet. 2814the message unless the client supports the msg packet.
2502 2815
2503=cut 2816=cut
2504 2817
2818# non-persistent channels (usually the info channel)
2819our %CHANNEL = (
2820 "c/identify" => {
2821 id => "infobox",
2822 title => "Identify",
2823 reply => undef,
2824 tooltip => "Items recently identified",
2825 },
2826 "c/examine" => {
2827 id => "infobox",
2828 title => "Examine",
2829 reply => undef,
2830 tooltip => "Signs and other items you examined",
2831 },
2832 "c/book" => {
2833 id => "infobox",
2834 title => "Book",
2835 reply => undef,
2836 tooltip => "The contents of a note or book",
2837 },
2838 "c/lookat" => {
2839 id => "infobox",
2840 title => "Look",
2841 reply => undef,
2842 tooltip => "What you saw there",
2843 },
2844 "c/who" => {
2845 id => "infobox",
2846 title => "Players",
2847 reply => undef,
2848 tooltip => "Shows players who are currently online",
2849 },
2850 "c/body" => {
2851 id => "infobox",
2852 title => "Body Parts",
2853 reply => undef,
2854 tooltip => "Shows which body parts you posess and are available",
2855 },
2856 "c/uptime" => {
2857 id => "infobox",
2858 title => "Uptime",
2859 reply => undef,
2860 tooltip => "How long the server has been running since last restart",
2861 },
2862 "c/mapinfo" => {
2863 id => "infobox",
2864 title => "Map Info",
2865 reply => undef,
2866 tooltip => "Information related to the maps",
2867 },
2868 "c/party" => {
2869 id => "party",
2870 title => "Party",
2871 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party",
2873 },
2874);
2875
2505sub cf::client::send_msg { 2876sub cf::client::send_msg {
2506 my ($self, $channel, $msg, $color, @extra) = @_; 2877 my ($self, $channel, $msg, $color, @extra) = @_;
2507 2878
2508 $msg = $self->pl->expand_cfpod ($msg); 2879 $msg = $self->pl->expand_cfpod ($msg);
2509 2880
2510 $color &= cf::NDI_CLIENT_MASK; # just in case... 2881 $color &= cf::NDI_CLIENT_MASK; # just in case...
2511 2882
2883 # check predefined channels, for the benefit of C
2884 if ($CHANNEL{$channel}) {
2885 $channel = $CHANNEL{$channel};
2886
2887 $self->ext_msg (channel_info => $channel)
2888 if $self->can_msg;
2889
2890 $channel = $channel->{id};
2891
2512 if (ref $channel) { 2892 } elsif (ref $channel) {
2513 # send meta info to client, if not yet sent 2893 # send meta info to client, if not yet sent
2514 unless (exists $self->{channel}{$channel->{id}}) { 2894 unless (exists $self->{channel}{$channel->{id}}) {
2515 $self->{channel}{$channel->{id}} = $channel; 2895 $self->{channel}{$channel->{id}} = $channel;
2516 $self->ext_msg (channel_info => $channel); 2896 $self->ext_msg (channel_info => $channel)
2897 if $self->can_msg;
2517 } 2898 }
2518 2899
2519 $channel = $channel->{id}; 2900 $channel = $channel->{id};
2520 } 2901 }
2521 2902
2733=pod 3114=pod
2734 3115
2735The following functions and methods are available within a safe environment: 3116The following functions and methods are available within a safe environment:
2736 3117
2737 cf::object 3118 cf::object
2738 contr pay_amount pay_player map x y force_find force_add 3119 contr pay_amount pay_player map x y force_find force_add destroy
2739 insert remove name archname title slaying race decrease_ob_nr 3120 insert remove name archname title slaying race decrease split
2740 3121
2741 cf::object::player 3122 cf::object::player
2742 player 3123 player
2743 3124
2744 cf::player 3125 cf::player
2749 3130
2750=cut 3131=cut
2751 3132
2752for ( 3133for (
2753 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3134 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2754 insert remove inv name archname title slaying race 3135 insert remove inv nrof name archname title slaying race
2755 decrease_ob_nr)], 3136 decrease split destroy change_exp)],
2756 ["cf::object::player" => qw(player)], 3137 ["cf::object::player" => qw(player)],
2757 ["cf::player" => qw(peaceful)], 3138 ["cf::player" => qw(peaceful)],
2758 ["cf::map" => qw(trigger)], 3139 ["cf::map" => qw(trigger)],
2759) { 3140) {
2760 no strict 'refs'; 3141 no strict 'refs';
2865 { 3246 {
2866 my $faces = $facedata->{faceinfo}; 3247 my $faces = $facedata->{faceinfo};
2867 3248
2868 while (my ($face, $info) = each %$faces) { 3249 while (my ($face, $info) = each %$faces) {
2869 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3250 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3251
2870 cf::face::set_visibility $idx, $info->{visibility}; 3252 cf::face::set_visibility $idx, $info->{visibility};
2871 cf::face::set_magicmap $idx, $info->{magicmap}; 3253 cf::face::set_magicmap $idx, $info->{magicmap};
2872 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3254 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2873 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3255 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2874 3256
2875 cf::cede_to_tick; 3257 cf::cede_to_tick;
2876 } 3258 }
2877 3259
2878 while (my ($face, $info) = each %$faces) { 3260 while (my ($face, $info) = each %$faces) {
2879 next unless $info->{smooth}; 3261 next unless $info->{smooth};
3262
2880 my $idx = cf::face::find $face 3263 my $idx = cf::face::find $face
2881 or next; 3264 or next;
3265
2882 if (my $smooth = cf::face::find $info->{smooth}) { 3266 if (my $smooth = cf::face::find $info->{smooth}) {
2883 cf::face::set_smooth $idx, $smooth; 3267 cf::face::set_smooth $idx, $smooth;
2884 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3268 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2885 } else { 3269 } else {
2886 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3270 warn "smooth face '$info->{smooth}' not found for face '$face'";
2904 { 3288 {
2905 # TODO: for gcfclient pleasure, we should give resources 3289 # TODO: for gcfclient pleasure, we should give resources
2906 # that gcfclient doesn't grok a >10000 face index. 3290 # that gcfclient doesn't grok a >10000 face index.
2907 my $res = $facedata->{resource}; 3291 my $res = $facedata->{resource};
2908 3292
2909 my $soundconf = delete $res->{"res/sound.conf"};
2910
2911 while (my ($name, $info) = each %$res) { 3293 while (my ($name, $info) = each %$res) {
3294 if (defined $info->{type}) {
2912 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3295 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2913 my $data; 3296 my $data;
2914 3297
2915 if ($info->{type} & 1) { 3298 if ($info->{type} & 1) {
2916 # prepend meta info 3299 # prepend meta info
2917 3300
2918 my $meta = $enc->encode ({ 3301 my $meta = $enc->encode ({
2919 name => $name, 3302 name => $name,
2920 %{ $info->{meta} || {} }, 3303 %{ $info->{meta} || {} },
2921 }); 3304 });
2922 3305
2923 $data = pack "(w/a*)*", $meta, $info->{data}; 3306 $data = pack "(w/a*)*", $meta, $info->{data};
3307 } else {
3308 $data = $info->{data};
3309 }
3310
3311 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3312 cf::face::set_type $idx, $info->{type};
2924 } else { 3313 } else {
2925 $data = $info->{data}; 3314 $RESOURCE{$name} = $info;
2926 } 3315 }
2927 3316
2928 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2929 cf::face::set_type $idx, $info->{type};
2930
2931 cf::cede_to_tick; 3317 cf::cede_to_tick;
2932 } 3318 }
2933
2934 if ($soundconf) {
2935 $soundconf = $enc->decode (delete $soundconf->{data});
2936
2937 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2938 my $sound = $soundconf->{compat}[$_]
2939 or next;
2940
2941 my $face = cf::face::find "sound/$sound->[1]";
2942 cf::sound::set $sound->[0] => $face;
2943 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2944 }
2945
2946 while (my ($k, $v) = each %{$soundconf->{event}}) {
2947 my $face = cf::face::find "sound/$v";
2948 cf::sound::set $k => $face;
2949 }
2950 }
2951 } 3319 }
3320
3321 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2952 3322
2953 1 3323 1
2954} 3324}
3325
3326cf::global->attach (on_resource_update => sub {
3327 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3328 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3329
3330 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3331 my $sound = $soundconf->{compat}[$_]
3332 or next;
3333
3334 my $face = cf::face::find "sound/$sound->[1]";
3335 cf::sound::set $sound->[0] => $face;
3336 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3337 }
3338
3339 while (my ($k, $v) = each %{$soundconf->{event}}) {
3340 my $face = cf::face::find "sound/$v";
3341 cf::sound::set $k => $face;
3342 }
3343 }
3344});
2955 3345
2956register_exticmd fx_want => sub { 3346register_exticmd fx_want => sub {
2957 my ($ns, $want) = @_; 3347 my ($ns, $want) = @_;
2958 3348
2959 while (my ($k, $v) = each %$want) { 3349 while (my ($k, $v) = each %$want) {
2960 $ns->fx_want ($k, $v); 3350 $ns->fx_want ($k, $v);
2961 } 3351 }
2962}; 3352};
3353
3354sub load_resource_file($) {
3355 my $guard = lock_acquire "load_resource_file";
3356
3357 my $status = load_resource_file_ $_[0];
3358 get_slot 0.1, 100;
3359 cf::arch::commit_load;
3360
3361 $status
3362}
2963 3363
2964sub reload_regions { 3364sub reload_regions {
2965 # HACK to clear player env face cache, we need some signal framework 3365 # HACK to clear player env face cache, we need some signal framework
2966 # for this (global event?) 3366 # for this (global event?)
2967 %ext::player_env::MUSIC_FACE_CACHE = (); 3367 %ext::player_env::MUSIC_FACE_CACHE = ();
2981} 3381}
2982 3382
2983sub reload_archetypes { 3383sub reload_archetypes {
2984 load_resource_file "$DATADIR/archetypes" 3384 load_resource_file "$DATADIR/archetypes"
2985 or die "unable to load archetypes\n"; 3385 or die "unable to load archetypes\n";
2986 #d# NEED to laod twice to resolve forward references
2987 # this really needs to be done in an extra post-pass
2988 # (which needs to be synchronous, so solve it differently)
2989 load_resource_file "$DATADIR/archetypes"
2990 or die "unable to load archetypes\n";
2991} 3386}
2992 3387
2993sub reload_treasures { 3388sub reload_treasures {
2994 load_resource_file "$DATADIR/treasures" 3389 load_resource_file "$DATADIR/treasures"
2995 or die "unable to load treasurelists\n"; 3390 or die "unable to load treasurelists\n";
2996} 3391}
2997 3392
2998sub reload_resources { 3393sub reload_resources {
2999 warn "reloading resource files...\n"; 3394 warn "reloading resource files...\n";
3000 3395
3396 reload_facedata;
3397 reload_archetypes;
3001 reload_regions; 3398 reload_regions;
3002 reload_facedata;
3003 #reload_archetypes;#d#
3004 reload_archetypes;
3005 reload_treasures; 3399 reload_treasures;
3006 3400
3007 warn "finished reloading resource files\n"; 3401 warn "finished reloading resource files\n";
3008} 3402}
3009 3403
3010sub init { 3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
3011 reload_resources; 3409 reload_resources;
3012} 3410}
3013 3411
3014sub reload_config { 3412sub reload_config {
3015 open my $fh, "<:utf8", "$CONFDIR/config" 3413 open my $fh, "<:utf8", "$CONFDIR/config"
3016 or return; 3414 or return;
3017 3415
3018 local $/; 3416 local $/;
3019 *CFG = YAML::Syck::Load <$fh>; 3417 *CFG = YAML::Load <$fh>;
3020 3418
3021 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3419 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3022 3420
3023 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3421 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3024 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3422 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3035sub main { 3433sub main {
3036 # we must not ever block the main coroutine 3434 # we must not ever block the main coroutine
3037 local $Coro::idle = sub { 3435 local $Coro::idle = sub {
3038 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3436 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3039 (async { 3437 (async {
3040 Event::one_event; 3438 $Coro::current->{desc} = "IDLE BUG HANDLER";
3439 EV::loop EV::LOOP_ONESHOT;
3041 })->prio (Coro::PRIO_MAX); 3440 })->prio (Coro::PRIO_MAX);
3042 }; 3441 };
3043 3442
3443 {
3444 my $guard = freeze_mainloop;
3044 reload_config; 3445 reload_config;
3045 db_init; 3446 db_init;
3046 load_extensions; 3447 load_extensions;
3047 3448
3048 $TICK_WATCHER->start; 3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3450 }
3451
3049 Event::loop; 3452 EV::loop;
3050} 3453}
3051 3454
3052############################################################################# 3455#############################################################################
3053# initialisation and cleanup 3456# initialisation and cleanup
3054 3457
3055# install some emergency cleanup handlers 3458# install some emergency cleanup handlers
3056BEGIN { 3459BEGIN {
3460 our %SIGWATCHER = ();
3057 for my $signal (qw(INT HUP TERM)) { 3461 for my $signal (qw(INT HUP TERM)) {
3058 Event->signal ( 3462 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3059 reentrant => 0,
3060 data => WF_AUTOCANCEL,
3061 signal => $signal,
3062 prio => 0,
3063 cb => sub {
3064 cf::cleanup "SIG$signal"; 3463 cf::cleanup "SIG$signal";
3065 },
3066 ); 3464 };
3067 } 3465 }
3068} 3466}
3069 3467
3070sub write_runtime { 3468sub write_runtime_sync {
3071 my $runtime = "$LOCALDIR/runtime"; 3469 my $runtime = "$LOCALDIR/runtime";
3072 3470
3073 # first touch the runtime file to show we are still running: 3471 # first touch the runtime file to show we are still running:
3074 # the fsync below can take a very very long time. 3472 # the fsync below can take a very very long time.
3075 3473
3101 and return; 3499 and return;
3102 3500
3103 warn "runtime file written.\n"; 3501 warn "runtime file written.\n";
3104 3502
3105 1 3503 1
3504}
3505
3506our $uuid_lock;
3507our $uuid_skip;
3508
3509sub write_uuid_sync($) {
3510 $uuid_skip ||= $_[0];
3511
3512 return if $uuid_lock;
3513 local $uuid_lock = 1;
3514
3515 my $uuid = "$LOCALDIR/uuid";
3516
3517 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3518 or return;
3519
3520 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3521 $uuid_skip = 0;
3522
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return;
3525
3526 # always fsync - this file is important
3527 aio_fsync $fh
3528 and return;
3529
3530 close $fh
3531 or return;
3532
3533 aio_rename "$uuid~", $uuid
3534 and return;
3535
3536 warn "uuid file written ($value).\n";
3537
3538 1
3539
3540}
3541
3542sub write_uuid($$) {
3543 my ($skip, $sync) = @_;
3544
3545 $sync ? write_uuid_sync $skip
3546 : async { write_uuid_sync $skip };
3106} 3547}
3107 3548
3108sub emergency_save() { 3549sub emergency_save() {
3109 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
3110 3551
3116 # and maps saved/destroyed asynchronously. 3557 # and maps saved/destroyed asynchronously.
3117 warn "begin emergency player save\n"; 3558 warn "begin emergency player save\n";
3118 for my $login (keys %cf::PLAYER) { 3559 for my $login (keys %cf::PLAYER) {
3119 my $pl = $cf::PLAYER{$login} or next; 3560 my $pl = $cf::PLAYER{$login} or next;
3120 $pl->valid or next; 3561 $pl->valid or next;
3562 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3121 $pl->save; 3563 $pl->save;
3122 } 3564 }
3123 warn "end emergency player save\n"; 3565 warn "end emergency player save\n";
3124 3566
3125 warn "begin emergency map save\n"; 3567 warn "begin emergency map save\n";
3131 warn "end emergency map save\n"; 3573 warn "end emergency map save\n";
3132 3574
3133 warn "begin emergency database checkpoint\n"; 3575 warn "begin emergency database checkpoint\n";
3134 BDB::db_env_txn_checkpoint $DB_ENV; 3576 BDB::db_env_txn_checkpoint $DB_ENV;
3135 warn "end emergency database checkpoint\n"; 3577 warn "end emergency database checkpoint\n";
3578
3579 warn "begin write uuid\n";
3580 write_uuid_sync 1;
3581 warn "end write uuid\n";
3136 }; 3582 };
3137 3583
3138 warn "leave emergency perl save\n"; 3584 warn "leave emergency perl save\n";
3139} 3585}
3140 3586
3142 my ($make_core) = @_; 3588 my ($make_core) = @_;
3143 3589
3144 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3145 if $make_core; 3591 if $make_core;
3146} 3592}
3593
3594# a safer delete_package, copied from Symbol
3595sub clear_package($) {
3596 my $pkg = shift;
3597
3598 # expand to full symbol table name if needed
3599 unless ($pkg =~ /^main::.*::$/) {
3600 $pkg = "main$pkg" if $pkg =~ /^::/;
3601 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3602 $pkg .= '::' unless $pkg =~ /::$/;
3603 }
3604
3605 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3606 my $stem_symtab = *{$stem}{HASH};
3607
3608 defined $stem_symtab and exists $stem_symtab->{$leaf}
3609 or return;
3610
3611 # clear all symbols
3612 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3613 for my $name (keys %$leaf_symtab) {
3614 _gv_clear *{"$pkg$name"};
3615# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3616 }
3617 warn "cleared package #$pkg\n";#d#
3618}
3619
3620our $RELOAD; # how many times to reload
3147 3621
3148sub do_reload_perl() { 3622sub do_reload_perl() {
3149 # can/must only be called in main 3623 # can/must only be called in main
3150 if ($Coro::current != $Coro::main) { 3624 if ($Coro::current != $Coro::main) {
3151 warn "can only reload from main coroutine"; 3625 warn "can only reload from main coroutine";
3152 return; 3626 return;
3153 } 3627 }
3154 3628
3629 return if $RELOAD++;
3630
3631 while ($RELOAD) {
3155 warn "reloading..."; 3632 warn "reloading...";
3156 3633
3157 warn "entering sync_job"; 3634 warn "entering sync_job";
3158 3635
3159 cf::sync_job { 3636 cf::sync_job {
3160 cf::write_runtime; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3161 cf::emergency_save; 3638 cf::emergency_save;
3162 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3163 3640
3164 warn "syncing database to disk"; 3641 warn "syncing database to disk";
3165 BDB::db_env_txn_checkpoint $DB_ENV; 3642 BDB::db_env_txn_checkpoint $DB_ENV;
3166 3643
3167 # if anything goes wrong in here, we should simply crash as we already saved 3644 # if anything goes wrong in here, we should simply crash as we already saved
3168 3645
3169 warn "cancelling all WF_AUTOCANCEL watchers";
3170 for (Event::all_watchers) {
3171 $_->cancel if $_->data & WF_AUTOCANCEL;
3172 }
3173
3174 warn "flushing outstanding aio requests"; 3646 warn "flushing outstanding aio requests";
3175 for (;;) {
3176 BDB::flush;
3177 IO::AIO::flush;
3178 Coro::cede;
3179 last unless IO::AIO::nreqs || BDB::nreqs; 3647 while (IO::AIO::nreqs || BDB::nreqs) {
3180 warn "iterate..."; 3648 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3181 }
3182
3183 ++$RELOAD;
3184
3185 warn "cancelling all extension coros";
3186 $_->cancel for values %EXT_CORO;
3187 %EXT_CORO = ();
3188
3189 warn "removing commands";
3190 %COMMAND = ();
3191
3192 warn "removing ext/exti commands";
3193 %EXTCMD = ();
3194 %EXTICMD = ();
3195
3196 warn "unloading/nuking all extensions";
3197 for my $pkg (@EXTS) {
3198 warn "... unloading $pkg";
3199
3200 if (my $cb = $pkg->can ("unload")) {
3201 eval {
3202 $cb->($pkg);
3203 1
3204 } or warn "$pkg unloaded, but with errors: $@";
3205 } 3649 }
3206 3650
3207 warn "... nuking $pkg"; 3651 warn "cancelling all extension coros";
3208 Symbol::delete_package $pkg; 3652 $_->cancel for values %EXT_CORO;
3209 } 3653 %EXT_CORO = ();
3210 3654
3211 warn "unloading all perl modules loaded from $LIBDIR"; 3655 warn "removing commands";
3212 while (my ($k, $v) = each %INC) { 3656 %COMMAND = ();
3213 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3214 3657
3658 warn "removing ext/exti commands";
3659 %EXTCMD = ();
3660 %EXTICMD = ();
3661
3662 warn "unloading/nuking all extensions";
3663 for my $pkg (@EXTS) {
3215 warn "... unloading $k"; 3664 warn "... unloading $pkg";
3216 delete $INC{$k};
3217 3665
3218 $k =~ s/\.pm$//;
3219 $k =~ s/\//::/g;
3220
3221 if (my $cb = $k->can ("unload_module")) { 3666 if (my $cb = $pkg->can ("unload")) {
3667 eval {
3222 $cb->(); 3668 $cb->($pkg);
3669 1
3670 } or warn "$pkg unloaded, but with errors: $@";
3671 }
3672
3673 warn "... clearing $pkg";
3674 clear_package $pkg;
3223 } 3675 }
3224 3676
3225 Symbol::delete_package $k; 3677 warn "unloading all perl modules loaded from $LIBDIR";
3678 while (my ($k, $v) = each %INC) {
3679 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3680
3681 warn "... unloading $k";
3682 delete $INC{$k};
3683
3684 $k =~ s/\.pm$//;
3685 $k =~ s/\//::/g;
3686
3687 if (my $cb = $k->can ("unload_module")) {
3688 $cb->();
3689 }
3690
3691 clear_package $k;
3226 } 3692 }
3227 3693
3228 warn "getting rid of safe::, as good as possible"; 3694 warn "getting rid of safe::, as good as possible";
3229 Symbol::delete_package "safe::$_" 3695 clear_package "safe::$_"
3230 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3696 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3231 3697
3232 warn "unloading cf.pm \"a bit\""; 3698 warn "unloading cf.pm \"a bit\"";
3233 delete $INC{"cf.pm"}; 3699 delete $INC{"cf.pm"};
3234 delete $INC{"cf/pod.pm"}; 3700 delete $INC{"cf/pod.pm"};
3235 3701
3236 # don't, removes xs symbols, too, 3702 # don't, removes xs symbols, too,
3237 # and global variables created in xs 3703 # and global variables created in xs
3238 #Symbol::delete_package __PACKAGE__; 3704 #clear_package __PACKAGE__;
3239 3705
3240 warn "unload completed, starting to reload now"; 3706 warn "unload completed, starting to reload now";
3241 3707
3242 warn "reloading cf.pm"; 3708 warn "reloading cf.pm";
3243 require cf; 3709 require cf;
3244 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3245 3711
3246 warn "loading config and database again"; 3712 warn "loading config and database again";
3247 cf::reload_config; 3713 cf::reload_config;
3248 3714
3249 warn "loading extensions"; 3715 warn "loading extensions";
3250 cf::load_extensions; 3716 cf::load_extensions;
3251 3717
3252 warn "reattaching attachments to objects/players"; 3718 warn "reattaching attachments to objects/players";
3253 _global_reattach; # objects, sockets 3719 _global_reattach; # objects, sockets
3254 warn "reattaching attachments to maps"; 3720 warn "reattaching attachments to maps";
3255 reattach $_ for values %MAP; 3721 reattach $_ for values %MAP;
3256 warn "reattaching attachments to players"; 3722 warn "reattaching attachments to players";
3257 reattach $_ for values %PLAYER; 3723 reattach $_ for values %PLAYER;
3258 3724
3259 warn "leaving sync_job"; 3725 warn "leaving sync_job";
3260 3726
3261 1 3727 1
3262 } or do { 3728 } or do {
3263 warn $@; 3729 warn $@;
3264 warn "error while reloading, exiting."; 3730 cf::cleanup "error while reloading, exiting.";
3265 exit 1;
3266 }; 3731 };
3267 3732
3268 warn "reloaded"; 3733 warn "reloaded";
3734 --$RELOAD;
3735 }
3269}; 3736};
3270 3737
3271our $RELOAD_WATCHER; # used only during reload 3738our $RELOAD_WATCHER; # used only during reload
3272 3739
3273sub reload_perl() { 3740sub reload_perl() {
3274 # doing reload synchronously and two reloads happen back-to-back, 3741 # doing reload synchronously and two reloads happen back-to-back,
3275 # coro crashes during coro_state_free->destroy here. 3742 # coro crashes during coro_state_free->destroy here.
3276 3743
3277 $RELOAD_WATCHER ||= Event->timer ( 3744 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3278 reentrant => 0,
3279 after => 0,
3280 data => WF_AUTOCANCEL,
3281 cb => sub {
3282 do_reload_perl; 3745 do_reload_perl;
3283 undef $RELOAD_WATCHER; 3746 undef $RELOAD_WATCHER;
3284 },
3285 ); 3747 };
3286} 3748}
3287 3749
3288register_command "reload" => sub { 3750register_command "reload" => sub {
3289 my ($who, $arg) = @_; 3751 my ($who, $arg) = @_;
3290 3752
3291 if ($who->flag (FLAG_WIZ)) { 3753 if ($who->flag (FLAG_WIZ)) {
3292 $who->message ("reloading server."); 3754 $who->message ("reloading server.");
3755 async {
3756 $Coro::current->{desc} = "perl_reload";
3293 async { reload_perl }; 3757 reload_perl;
3758 };
3294 } 3759 }
3295}; 3760};
3296 3761
3297unshift @INC, $LIBDIR; 3762unshift @INC, $LIBDIR;
3298 3763
3300 3765
3301our @WAIT_FOR_TICK; 3766our @WAIT_FOR_TICK;
3302our @WAIT_FOR_TICK_BEGIN; 3767our @WAIT_FOR_TICK_BEGIN;
3303 3768
3304sub wait_for_tick { 3769sub wait_for_tick {
3305 return unless $TICK_WATCHER->is_active;
3306 return if $Coro::current == $Coro::main; 3770 return if tick_inhibit || $Coro::current == $Coro::main;
3307 3771
3308 my $signal = new Coro::Signal; 3772 my $signal = new Coro::Signal;
3309 push @WAIT_FOR_TICK, $signal; 3773 push @WAIT_FOR_TICK, $signal;
3310 $signal->wait; 3774 $signal->wait;
3311} 3775}
3312 3776
3313sub wait_for_tick_begin { 3777sub wait_for_tick_begin {
3314 return unless $TICK_WATCHER->is_active;
3315 return if $Coro::current == $Coro::main; 3778 return if tick_inhibit || $Coro::current == $Coro::main;
3316 3779
3317 my $signal = new Coro::Signal; 3780 my $signal = new Coro::Signal;
3318 push @WAIT_FOR_TICK_BEGIN, $signal; 3781 push @WAIT_FOR_TICK_BEGIN, $signal;
3319 $signal->wait; 3782 $signal->wait;
3320} 3783}
3321 3784
3322 my $min = 1e6;#d# 3785sub tick {
3323 my $avg = 10;
3324$TICK_WATCHER = Event->timer (
3325 reentrant => 0,
3326 parked => 1,
3327 prio => 0,
3328 at => $NEXT_TICK || $TICK,
3329 data => WF_AUTOCANCEL,
3330 cb => sub {
3331 if ($Coro::current != $Coro::main) { 3786 if ($Coro::current != $Coro::main) {
3332 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3787 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3333 unless ++$bug_warning > 10; 3788 unless ++$bug_warning > 10;
3334 return; 3789 return;
3335 } 3790 }
3336 3791
3337 $NOW = $tick_start = Event::time;
3338
3339 cf::server_tick; # one server iteration 3792 cf::server_tick; # one server iteration
3340 3793
3341 0 && sync_job {#d# 3794 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3342 for(1..10) { 3795 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3343 my $t = Event::time; 3796 Coro::async_pool {
3344 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3797 $Coro::current->{desc} = "runtime saver";
3345 or die; 3798 write_runtime_sync
3346 3799 or warn "ERROR: unable to write runtime file: $!";
3347 $map->width (50);
3348 $map->height (50);
3349 $map->alloc;
3350 $map->_load_objects ("/tmp/x.map", 1);
3351 my $t = Event::time - $t;
3352
3353 #next unless $t < 0.0013;#d#
3354 if ($t < $min) {
3355 $min = $t;
3356 }
3357 $avg = $avg * 0.99 + $t * 0.01;
3358 }
3359 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3360 exit 0;
3361 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3362 }; 3800 };
3801 }
3363 3802
3364 $RUNTIME += $TICK;
3365 $NEXT_TICK += $TICK;
3366
3367 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3368 $NEXT_RUNTIME_WRITE = $NOW + 10;
3369 Coro::async_pool {
3370 write_runtime
3371 or warn "ERROR: unable to write runtime file: $!";
3372 };
3373 }
3374
3375# my $AFTER = Event::time;
3376# warn $AFTER - $NOW;#d#
3377
3378 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3803 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3379 $sig->send; 3804 $sig->send;
3380 } 3805 }
3381 while (my $sig = shift @WAIT_FOR_TICK) { 3806 while (my $sig = shift @WAIT_FOR_TICK) {
3382 $sig->send; 3807 $sig->send;
3383 } 3808 }
3384 3809
3385 $NOW = Event::time; 3810 $LOAD = ($NOW - $TICK_START) / $TICK;
3386
3387 # if we are delayed by four ticks or more, skip them all
3388 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3389
3390 $TICK_WATCHER->at ($NEXT_TICK);
3391 $TICK_WATCHER->start;
3392
3393 $LOAD = ($NOW - $tick_start) / $TICK;
3394 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3811 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3395 3812
3396 _post_tick; 3813 if (0) {
3397 3814 if ($NEXT_TICK) {
3398 3815 my $jitter = $TICK_START - $NEXT_TICK;
3816 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3817 warn "jitter $JITTER\n";#d#
3818 }
3399 }, 3819 }
3400); 3820}
3401 3821
3402{ 3822{
3403 BDB::max_poll_time $TICK * 0.1; 3823 # configure BDB
3404 $BDB_POLL_WATCHER = Event->io ( 3824
3405 reentrant => 0,
3406 fd => BDB::poll_fileno,
3407 poll => 'r',
3408 prio => 0,
3409 data => WF_AUTOCANCEL,
3410 cb => \&BDB::poll_cb,
3411 );
3412 BDB::min_parallel 8; 3825 BDB::min_parallel 8;
3413 3826 BDB::max_poll_reqs $TICK * 0.1;
3414 BDB::set_sync_prepare { 3827 $AnyEvent::BDB::WATCHER->priority (1);
3415 my $status;
3416 my $current = $Coro::current;
3417 (
3418 sub {
3419 $status = $!;
3420 $current->ready; undef $current;
3421 },
3422 sub {
3423 Coro::schedule while defined $current;
3424 $! = $status;
3425 },
3426 )
3427 };
3428 3828
3429 unless ($DB_ENV) { 3829 unless ($DB_ENV) {
3430 $DB_ENV = BDB::db_env_create; 3830 $DB_ENV = BDB::db_env_create;
3831 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3832 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3833 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3834 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3835 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3431 3836
3432 cf::sync_job { 3837 cf::sync_job {
3433 eval { 3838 eval {
3434 BDB::db_env_open 3839 BDB::db_env_open
3435 $DB_ENV, 3840 $DB_ENV,
3437 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3842 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3438 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3843 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3439 0666; 3844 0666;
3440 3845
3441 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3846 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3442
3443 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3444 $DB_ENV->set_lk_detect;
3445 }; 3847 };
3446 3848
3447 cf::cleanup "db_env_open(db): $@" if $@; 3849 cf::cleanup "db_env_open(db): $@" if $@;
3448 }; 3850 };
3449 } 3851 }
3852
3853 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3854 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3855 };
3856 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3857 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3858 };
3859 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3860 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3861 };
3450} 3862}
3451 3863
3452{ 3864{
3865 # configure IO::AIO
3866
3453 IO::AIO::min_parallel 8; 3867 IO::AIO::min_parallel 8;
3454
3455 undef $Coro::AIO::WATCHER;
3456 IO::AIO::max_poll_time $TICK * 0.1; 3868 IO::AIO::max_poll_time $TICK * 0.1;
3457 $AIO_POLL_WATCHER = Event->io ( 3869 undef $AnyEvent::AIO::WATCHER;
3458 reentrant => 0,
3459 data => WF_AUTOCANCEL,
3460 fd => IO::AIO::poll_fileno,
3461 poll => 'r',
3462 prio => 6,
3463 cb => \&IO::AIO::poll_cb,
3464 );
3465} 3870}
3466 3871
3467my $_log_backtrace; 3872my $_log_backtrace;
3468 3873
3469sub _log_backtrace { 3874sub _log_backtrace {
3473 3878
3474 # limit the # of concurrent backtraces 3879 # limit the # of concurrent backtraces
3475 if ($_log_backtrace < 2) { 3880 if ($_log_backtrace < 2) {
3476 ++$_log_backtrace; 3881 ++$_log_backtrace;
3477 async { 3882 async {
3883 $Coro::current->{desc} = "abt $msg";
3884
3478 my @bt = fork_call { 3885 my @bt = fork_call {
3479 @addr = map { sprintf "%x", $_ } @addr; 3886 @addr = map { sprintf "%x", $_ } @addr;
3480 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3887 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3481 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3888 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3482 or die "addr2line: $!"; 3889 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines