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.349 by root, Fri Aug 31 04:10:43 2007 UTC vs.
Revision 1.443 by root, Sun Aug 31 10:05:26 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
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
1364 my ($pl) = @_; 1523 my ($pl) = @_;
1365 1524
1366 my $name = $pl->ob->name; 1525 my $name = $pl->ob->name;
1367 1526
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 have 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
1459Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1460 1627
1461=cut 1628=cut
1462 1629
1463sub expand_cfpod { 1630sub expand_cfpod {
1464 ((my $self), (local $_)) = @_; 1631 my ($self, $pod) = @_;
1465 1632
1466 # escape & and < 1633 my @nest = [qr<\G$>, undef, ""];
1467 s/&/&amp;/g; 1634 my $xml;
1468 s/(?<![BIUGH])</&lt;/g;
1469 1635
1470 # this is buggy, it needs to properly take care of nested <'s 1636 for ($pod) {
1637 while () {
1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1639 $xml .= $1;
1640 } elsif (/\G\n(?=\S)/xgcs) {
1641 $xml .= " ";
1642 } elsif (/\G\n/xgcs) {
1643 $xml .= "\n";
1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1645 my ($code, $delim) = ($1, scalar reverse $2);
1646 $delim =~ y/</>/; # delim now contains the stop sequence
1647 $delim = qr{\G\Q$delim};
1471 1648
1472 1 while 1649 my $cb;
1473 # replace B<>, I<>, U<> etc. 1650
1474 s/B<([^\>]*)>/<b>$1<\/b>/ 1651 if ($code eq "B") {
1475 || s/I<([^\>]*)>/<i>$1<\/i>/ 1652 $cb = sub { "<b>$_[0]</b>" };
1476 || s/U<([^\>]*)>/<u>$1<\/u>/ 1653 } elsif ($code eq "C") {
1477 # replace G<male|female> tags 1654 $cb = sub { "<tt>$_[0]</tt>" };
1478 || s{G<([^>|]*)\|([^>]*)>}{ 1655 } elsif ($code eq "E") {
1479 $self->gender ? $2 : $1 1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1480 }ge 1657 } elsif ($code eq "G") {
1481 # replace H<hint text> 1658 $cb = sub {
1482 || s{H<([^\>]*)>} 1659 my ($male, $female) = split /\|/, $_[0];
1483 { 1660 $self->gender ? $female : $male
1661 };
1662 } elsif ($code eq "H") {
1663 $cb = sub {
1664 (
1484 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1485 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1486 "") 1667 "",
1487 [$self->{hintmode}] 1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1699 } else {
1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1488 }ge; 1707 }
1708 }
1709 }
1489 1710
1490 # create single paragraphs (very hackish) 1711 $xml
1491 s/(?<=\S)\n(?=\w)/ /g;
1492
1493 # compress some whitespace
1494 s/\s+\n/\n/g; # ws line-ends
1495 s/\n\n+/\n/g; # double lines
1496 s/^\n+//; # beginning lines
1497 s/\n+$//; # ending lines
1498
1499 $_
1500} 1712}
1501 1713
1502sub hintmode { 1714sub hintmode {
1503 $_[0]{hintmode} = $_[1] if @_ > 1; 1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1504 $_[0]{hintmode} 1716 $_[0]{hintmode}
1577our $MAX_RESET = 3600; 1789our $MAX_RESET = 3600;
1578our $DEFAULT_RESET = 3000; 1790our $DEFAULT_RESET = 3000;
1579 1791
1580sub generate_random_map { 1792sub generate_random_map {
1581 my ($self, $rmp) = @_; 1793 my ($self, $rmp) = @_;
1794
1795 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1796
1582 # mit "rum" bekleckern, nicht 1797 # mit "rum" bekleckern, nicht
1583 $self->_create_random_map ( 1798 $self->_create_random_map (
1584 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1585 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1586 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1708 1923
1709# the temporary/swap location 1924# the temporary/swap location
1710sub save_path { 1925sub save_path {
1711 my ($self) = @_; 1926 my ($self) = @_;
1712 1927
1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1714 "$TMPDIR/$path.map" 1929 "$TMPDIR/$path.map"
1715} 1930}
1716 1931
1717# the unique path, undef == no special unique path 1932# the unique path, undef == no special unique path
1718sub uniq_path { 1933sub uniq_path {
1719 my ($self) = @_; 1934 my ($self) = @_;
1720 1935
1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1722 "$UNIQUEDIR/$path" 1937 "$UNIQUEDIR/$path"
1723} 1938}
1724 1939
1725# and all this just because we cannot iterate over 1940# and all this just because we cannot iterate over
1726# all maps in C++... 1941# all maps in C++...
1749 1964
1750sub load_header_from($) { 1965sub load_header_from($) {
1751 my ($self, $path) = @_; 1966 my ($self, $path) = @_;
1752 1967
1753 utf8::encode $path; 1968 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1969 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1970 or return;
1971
1972 $self->_load_header ($f)
1973 or return;
1974
1975 local $MAP_LOADING{$self->{path}} = $self;
1976 $f->resolve_delayed_derefs;
1759 1977
1760 $self->{load_path} = $path; 1978 $self->{load_path} = $path;
1761 1979
1762 1 1980 1
1763} 1981}
1817sub find { 2035sub find {
1818 my ($path, $origin) = @_; 2036 my ($path, $origin) = @_;
1819 2037
1820 $path = normalise $path, $origin && $origin->path; 2038 $path = normalise $path, $origin && $origin->path;
1821 2039
2040 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 2041 cf::lock_wait "map_find:$path";
1823 2042
1824 $cf::MAP{$path} || do { 2043 $cf::MAP{$path} || do {
2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1825 my $guard = cf::lock_acquire "map_find:$path"; 2045 my $guard2 = cf::lock_acquire "map_find:$path";
2046
1826 my $map = new_from_path cf::map $path 2047 my $map = new_from_path cf::map $path
1827 or return; 2048 or return;
1828 2049
1829 $map->{last_save} = $cf::RUNTIME; 2050 $map->{last_save} = $cf::RUNTIME;
1830 2051
1832 or return; 2053 or return;
1833 2054
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2055 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 2056 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 2057 #$cf::WAIT_FOR_TICK->wait;
2058 undef $guard2;
2059 undef $guard1;
1837 $map->reset; 2060 $map->reset;
1838 undef $guard;
1839 return find $path; 2061 return find $path;
1840 } 2062 }
1841 2063
1842 $cf::MAP{$path} = $map 2064 $cf::MAP{$path} = $map
1843 } 2065 }
1852 local $self->{deny_reset} = 1; # loading can take a long time 2074 local $self->{deny_reset} = 1; # loading can take a long time
1853 2075
1854 my $path = $self->{path}; 2076 my $path = $self->{path};
1855 2077
1856 { 2078 {
1857 my $guard1 = cf::lock_acquire "map_data:$path"; 2079 my $guard = cf::lock_acquire "map_data:$path";
1858 my $guard2 = cf::lock_acquire "map_load:$path";
1859 2080
2081 return unless $self->valid;
1860 return if $self->in_memory != cf::MAP_SWAPPED; 2082 return unless $self->in_memory == cf::MAP_SWAPPED;
1861 2083
1862 $self->in_memory (cf::MAP_LOADING); 2084 $self->in_memory (cf::MAP_LOADING);
1863 2085
1864 $self->alloc; 2086 $self->alloc;
1865 2087
1866 $self->pre_load; 2088 $self->pre_load;
1867 cf::cede_to_tick; 2089 cf::cede_to_tick;
1868 2090
2091 my $f = new_from_file cf::object::thawer $self->{load_path};
2092 $f->skip_block;
1869 $self->_load_objects ($self->{load_path}, 1) 2093 $self->_load_objects ($f)
1870 or return; 2094 or return;
1871 2095
1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2096 $self->post_load_original
1873 if delete $self->{load_original}; 2097 if delete $self->{load_original};
1874 2098
1875 if (my $uniq = $self->uniq_path) { 2099 if (my $uniq = $self->uniq_path) {
1876 utf8::encode $uniq; 2100 utf8::encode $uniq;
1877 if (aio_open $uniq, O_RDONLY, 0) { 2101 unless (aio_stat $uniq) {
2102 if (my $f = new_from_file cf::object::thawer $uniq) {
1878 $self->clear_unique_items; 2103 $self->clear_unique_items;
1879 $self->_load_objects ($uniq, 0); 2104 $self->_load_objects ($f);
2105 $f->resolve_delayed_derefs;
2106 }
1880 } 2107 }
1881 } 2108 }
2109
2110 $f->resolve_delayed_derefs;
1882 2111
1883 cf::cede_to_tick; 2112 cf::cede_to_tick;
1884 # now do the right thing for maps 2113 # now do the right thing for maps
1885 $self->link_multipart_objects; 2114 $self->link_multipart_objects;
1886 $self->difficulty ($self->estimate_difficulty) 2115 $self->difficulty ($self->estimate_difficulty)
1898 } 2127 }
1899 2128
1900 $self->{last_save} = $cf::RUNTIME; 2129 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME); 2130 $self->last_access ($cf::RUNTIME);
1902 2131
1903 $self->in_memory (cf::MAP_IN_MEMORY); 2132 $self->in_memory (cf::MAP_ACTIVE);
1904 } 2133 }
1905 2134
1906 $self->post_load; 2135 $self->post_load;
1907} 2136}
1908 2137
1966 my ($path, $origin, $load) = @_; 2195 my ($path, $origin, $load) = @_;
1967 2196
1968 $path = normalise $path, $origin && $origin->{path}; 2197 $path = normalise $path, $origin && $origin->{path};
1969 2198
1970 if (my $map = $cf::MAP{$path}) { 2199 if (my $map = $cf::MAP{$path}) {
1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1972 } 2201 }
1973 2202
1974 $MAP_PREFETCH{$path} |= $load; 2203 $MAP_PREFETCH{$path} |= $load;
1975 2204
1976 $MAP_PREFETCHER ||= cf::async { 2205 $MAP_PREFETCHER ||= cf::async {
2206 $Coro::current->{desc} = "map prefetcher";
2207
1977 while (%MAP_PREFETCH) { 2208 while (%MAP_PREFETCH) {
1978 while (my ($k, $v) = each %MAP_PREFETCH) { 2209 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $k) { 2210 if (my $map = find $k) {
1980 $map->load if $v; 2211 $map->load if $v;
1981 } 2212 }
2007 return if $self->{deny_save}; 2238 return if $self->{deny_save};
2008 2239
2009 local $self->{last_access} = $self->last_access;#d# 2240 local $self->{last_access} = $self->last_access;#d#
2010 2241
2011 cf::async { 2242 cf::async {
2243 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2244 $_->contr->save for $self->players;
2013 }; 2245 };
2246
2247 cf::get_slot 0.02;
2014 2248
2015 if ($uniq) { 2249 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2017 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2251 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2018 } else { 2252 } else {
2027 $self->save; 2261 $self->save;
2028 2262
2029 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2264
2031 return if $self->players; 2265 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2266 return if $self->in_memory != cf::MAP_ACTIVE;
2033 return if $self->{deny_save}; 2267 return if $self->{deny_save};
2034 2268
2269 $self->in_memory (cf::MAP_SWAPPED);
2270
2271 $self->deactivate;
2272 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2273 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2274}
2038 2275
2039sub reset_at { 2276sub reset_at {
2040 my ($self) = @_; 2277 my ($self) = @_;
2041 2278
2073 if $uniq; 2310 if $uniq;
2074 } 2311 }
2075 2312
2076 delete $cf::MAP{$self->path}; 2313 delete $cf::MAP{$self->path};
2077 2314
2315 $self->deactivate;
2316 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2317 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2318
2082 $self->unlink_save; 2319 $self->unlink_save;
2083 $self->destroy; 2320 $self->destroy;
2084} 2321}
2085 2322
2090 2327
2091 { 2328 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2329 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093 2330
2094 delete $cf::MAP{$self->path}; 2331 delete $cf::MAP{$self->path};
2332
2333 $self->unlink_save;
2095 2334
2096 bless $self, "cf::map"; 2335 bless $self, "cf::map";
2097 delete $self->{deny_reset}; 2336 delete $self->{deny_reset};
2098 $self->{deny_save} = 1; 2337 $self->{deny_save} = 1;
2099 $self->reset_timeout (1); 2338 $self->reset_timeout (1);
2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2339 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2101
2102 $self->unlink_save;
2103 2340
2104 $cf::MAP{$self->path} = $self; 2341 $cf::MAP{$self->path} = $self;
2105 } 2342 }
2106 2343
2107 $self->reset; # polite request, might not happen 2344 $self->reset; # polite request, might not happen
2152 2389
2153sub unique_maps() { 2390sub unique_maps() {
2154 [ 2391 [
2155 map { 2392 map {
2156 utf8::decode $_; 2393 utf8::decode $_;
2157 /\.map$/ 2394 s/\.map$//; # TODO future compatibility hack
2395 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2396 ? ()
2158 ? normalise $_ 2397 : normalise $_
2159 : ()
2160 } @{ aio_readdir $UNIQUEDIR or [] } 2398 } @{ aio_readdir $UNIQUEDIR or [] }
2161 ] 2399 ]
2162} 2400}
2163 2401
2164package cf;
2165
2166=back 2402=back
2167 2403
2168=head3 cf::object 2404=head3 cf::object
2169 2405
2170=cut 2406=cut
2173 2409
2174=over 4 2410=over 4
2175 2411
2176=item $ob->inv_recursive 2412=item $ob->inv_recursive
2177 2413
2178Returns the inventory of the object _and_ their inventories, recursively. 2414Returns the inventory of the object I<and> their inventories, recursively,
2415but I<not> the object itself.
2179 2416
2180=cut 2417=cut
2181 2418
2182sub inv_recursive_; 2419sub inv_recursive_;
2183sub inv_recursive_ { 2420sub inv_recursive_ {
2186 2423
2187sub inv_recursive { 2424sub inv_recursive {
2188 inv_recursive_ inv $_[0] 2425 inv_recursive_ inv $_[0]
2189} 2426}
2190 2427
2428=item $ref = $ob->ref
2429
2430Creates and returns a persistent reference to an object that can be stored as a string.
2431
2432=item $ob = cf::object::deref ($refstring)
2433
2434returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2435even if the object actually exists. May block.
2436
2437=cut
2438
2439sub deref {
2440 my ($ref) = @_;
2441
2442 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2443 my ($uuid, $name) = ($1, $2);
2444 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2445 or return;
2446 $pl->ob->uuid eq $uuid
2447 or return;
2448
2449 $pl->ob
2450 } else {
2451 warn "$ref: cannot resolve object reference\n";
2452 undef
2453 }
2454}
2455
2191package cf; 2456package cf;
2192 2457
2193=back 2458=back
2194 2459
2195=head3 cf::object::player 2460=head3 cf::object::player
2201Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2466Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2202can be C<undef>. Does the right thing when the player is currently in a 2467can be C<undef>. Does the right thing when the player is currently in a
2203dialogue with the given NPC character. 2468dialogue with the given NPC character.
2204 2469
2205=cut 2470=cut
2471
2472our $SAY_CHANNEL = {
2473 id => "say",
2474 title => "Map",
2475 reply => "say ",
2476 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2477};
2478
2479our $CHAT_CHANNEL = {
2480 id => "chat",
2481 title => "Chat",
2482 reply => "chat ",
2483 tooltip => "Player chat and shouts, global to the server.",
2484};
2206 2485
2207# rough implementation of a future "reply" method that works 2486# rough implementation of a future "reply" method that works
2208# with dialog boxes. 2487# with dialog boxes.
2209#TODO: the first argument must go, split into a $npc->reply_to ( method 2488#TODO: the first argument must go, split into a $npc->reply_to ( method
2210sub cf::object::player::reply($$$;$) { 2489sub cf::object::player::reply($$$;$) {
2222 my $dialog = $pl->{npc_dialog}; 2501 my $dialog = $pl->{npc_dialog};
2223 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2502 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2224 2503
2225 } else { 2504 } else {
2226 $msg = $npc->name . " says: $msg" if $npc; 2505 $msg = $npc->name . " says: $msg" if $npc;
2227 $self->message ($msg, $flags); 2506 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2228 } 2507 }
2229 } 2508 }
2230} 2509}
2231 2510
2232=item $object->send_msg ($channel, $msg, $color, [extra...]) 2511=item $object->send_msg ($channel, $msg, $color, [extra...])
2340her, loading and preparing them map, calling the provided $check callback 2619her, loading and preparing them map, calling the provided $check callback
2341that has to return the map if sucecssful, and then unfreezes the player on 2620that has to return the map if sucecssful, and then unfreezes the player on
2342the new (success) or old (failed) map position. In either case, $done will 2621the new (success) or old (failed) map position. In either case, $done will
2343be called at the end of this process. 2622be called at the end of this process.
2344 2623
2624Note that $check will be called with a potentially non-loaded map, so if
2625it needs a loaded map it has to call C<< ->load >>.
2626
2345=cut 2627=cut
2346 2628
2347our $GOTOGEN; 2629our $GOTOGEN;
2348 2630
2349sub cf::object::player::goto { 2631sub cf::object::player::goto {
2353 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2635 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2354 2636
2355 $self->enter_link; 2637 $self->enter_link;
2356 2638
2357 (async { 2639 (async {
2640 $Coro::current->{desc} = "player::goto $path $x $y";
2641
2642 # *tag paths override both path and x|y
2643 if ($path =~ /^\*(.*)$/) {
2644 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2645 my $ob = $obs[rand @obs];
2646
2647 # see if we actually can go there
2648 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2649 $ob = $obs[rand @obs];
2650 } else {
2651 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2652 }
2653 # else put us there anyways for now #d#
2654
2655 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2656 } else {
2657 ($path, $x, $y) = (undef, undef, undef);
2658 }
2659 }
2660
2358 my $map = eval { 2661 my $map = eval {
2359 my $map = cf::map::find $path; 2662 my $map = defined $path ? cf::map::find $path : undef;
2360 2663
2361 if ($map) { 2664 if ($map) {
2362 $map = $map->customise_for ($self); 2665 $map = $map->customise_for ($self);
2363 $map = $check->($map) if $check && $map; 2666 $map = $check->($map) if $check && $map;
2364 } else { 2667 } else {
2365 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2668 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2366 } 2669 }
2367 2670
2368 $map 2671 $map
2369 }; 2672 };
2370 2673
2406} 2709}
2407 2710
2408sub prepare_random_map { 2711sub prepare_random_map {
2409 my ($exit) = @_; 2712 my ($exit) = @_;
2410 2713
2411 my $guard = cf::lock_acquire "exit_prepare:$exit";
2412
2413 # all this does is basically replace the /! path by 2714 # all this does is basically replace the /! path by
2414 # a new random map path (?random/...) with a seed 2715 # a new random map path (?random/...) with a seed
2415 # that depends on the exit object 2716 # that depends on the exit object
2416 2717
2417 my $rmp = parse_random_map_params $exit->msg; 2718 my $rmp = parse_random_map_params $exit->msg;
2419 if ($exit->map) { 2720 if ($exit->map) {
2420 $rmp->{region} = $exit->region->name; 2721 $rmp->{region} = $exit->region->name;
2421 $rmp->{origin_map} = $exit->map->path; 2722 $rmp->{origin_map} = $exit->map->path;
2422 $rmp->{origin_x} = $exit->x; 2723 $rmp->{origin_x} = $exit->x;
2423 $rmp->{origin_y} = $exit->y; 2724 $rmp->{origin_y} = $exit->y;
2725
2726 $exit->map->touch;
2424 } 2727 }
2425 2728
2426 $rmp->{random_seed} ||= $exit->random_seed; 2729 $rmp->{random_seed} ||= $exit->random_seed;
2427 2730
2428 my $data = cf::to_json $rmp; 2731 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2429 my $md5 = Digest::MD5::md5_hex $data; 2732 my $md5 = Digest::MD5::md5_hex $data;
2430 my $meta = "$RANDOMDIR/$md5.meta"; 2733 my $meta = "$RANDOMDIR/$md5.meta";
2431 2734
2432 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2735 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2433 aio_write $fh, 0, (length $data), $data, 0; 2736 aio_write $fh, 0, (length $data), $data, 0;
2434 undef $fh; 2737 undef $fh;
2435 aio_rename "$meta~", $meta; 2738 aio_rename "$meta~", $meta;
2436 2739
2740 my $slaying = "?random/$md5";
2741
2742 if ($exit->valid) {
2437 $exit->slaying ("?random/$md5"); 2743 $exit->slaying ("?random/$md5");
2438 $exit->msg (undef); 2744 $exit->msg (undef);
2745 }
2439 } 2746 }
2440} 2747}
2441 2748
2442sub cf::object::player::enter_exit { 2749sub cf::object::player::enter_exit {
2443 my ($self, $exit) = @_; 2750 my ($self, $exit) = @_;
2444 2751
2445 return unless $self->type == cf::PLAYER; 2752 return unless $self->type == cf::PLAYER;
2446 2753
2447 if ($exit->slaying eq "/!") {
2448 #TODO: this should de-fi-ni-te-ly not be a sync-job
2449 # the problem is that $exit might not survive long enough
2450 # so it needs to be done right now, right here
2451 cf::sync_job { prepare_random_map $exit };
2452 }
2453
2454 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2455 my $hp = $exit->stats->hp;
2456 my $sp = $exit->stats->sp;
2457
2458 $self->enter_link; 2754 $self->enter_link;
2459 2755
2460 # if exit is damned, update players death & WoR home-position
2461 $self->contr->savebed ($slaying, $hp, $sp)
2462 if $exit->flag (FLAG_DAMNED);
2463
2464 (async { 2756 (async {
2465 $self->deactivate_recursive; # just to be sure 2757 $Coro::current->{desc} = "enter_exit";
2758
2466 unless (eval { 2759 unless (eval {
2760 $self->deactivate_recursive; # just to be sure
2761
2762 # random map handling
2763 {
2764 my $guard = cf::lock_acquire "exit_prepare:$exit";
2765
2766 prepare_random_map $exit
2767 if $exit->slaying eq "/!";
2768 }
2769
2770 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2771 my $x = $exit->stats->hp;
2772 my $y = $exit->stats->sp;
2773
2467 $self->goto ($slaying, $hp, $sp); 2774 $self->goto ($map, $x, $y);
2468 2775
2776 # if exit is damned, update players death & WoR home-position
2777 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED);
2779
2469 1; 2780 1
2470 }) { 2781 }) {
2471 $self->message ("Something went wrong deep within the crossfire server. " 2782 $self->message ("Something went wrong deep within the crossfire server. "
2472 . "I'll try to bring you back to the map you were before. " 2783 . "I'll try to bring you back to the map you were before. "
2473 . "Please report this to the dungeon master!", 2784 . "Please report this to the dungeon master!",
2474 cf::NDI_UNIQUE | cf::NDI_RED); 2785 cf::NDI_UNIQUE | cf::NDI_RED);
2504the message, with C<log> being the default. If C<$color> is negative, suppress 2815the message, with C<log> being the default. If C<$color> is negative, suppress
2505the message unless the client supports the msg packet. 2816the message unless the client supports the msg packet.
2506 2817
2507=cut 2818=cut
2508 2819
2820# non-persistent channels (usually the info channel)
2821our %CHANNEL = (
2822 "c/identify" => {
2823 id => "infobox",
2824 title => "Identify",
2825 reply => undef,
2826 tooltip => "Items recently identified",
2827 },
2828 "c/examine" => {
2829 id => "infobox",
2830 title => "Examine",
2831 reply => undef,
2832 tooltip => "Signs and other items you examined",
2833 },
2834 "c/book" => {
2835 id => "infobox",
2836 title => "Book",
2837 reply => undef,
2838 tooltip => "The contents of a note or book",
2839 },
2840 "c/lookat" => {
2841 id => "infobox",
2842 title => "Look",
2843 reply => undef,
2844 tooltip => "What you saw there",
2845 },
2846 "c/who" => {
2847 id => "infobox",
2848 title => "Players",
2849 reply => undef,
2850 tooltip => "Shows players who are currently online",
2851 },
2852 "c/body" => {
2853 id => "infobox",
2854 title => "Body Parts",
2855 reply => undef,
2856 tooltip => "Shows which body parts you posess and are available",
2857 },
2858 "c/uptime" => {
2859 id => "infobox",
2860 title => "Uptime",
2861 reply => undef,
2862 tooltip => "How long the server has been running since last restart",
2863 },
2864 "c/mapinfo" => {
2865 id => "infobox",
2866 title => "Map Info",
2867 reply => undef,
2868 tooltip => "Information related to the maps",
2869 },
2870 "c/party" => {
2871 id => "party",
2872 title => "Party",
2873 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party",
2875 },
2876);
2877
2509sub cf::client::send_msg { 2878sub cf::client::send_msg {
2510 my ($self, $channel, $msg, $color, @extra) = @_; 2879 my ($self, $channel, $msg, $color, @extra) = @_;
2511 2880
2512 $msg = $self->pl->expand_cfpod ($msg); 2881 $msg = $self->pl->expand_cfpod ($msg);
2513 2882
2514 $color &= cf::NDI_CLIENT_MASK; # just in case... 2883 $color &= cf::NDI_CLIENT_MASK; # just in case...
2515 2884
2885 # check predefined channels, for the benefit of C
2886 if ($CHANNEL{$channel}) {
2887 $channel = $CHANNEL{$channel};
2888
2889 $self->ext_msg (channel_info => $channel)
2890 if $self->can_msg;
2891
2892 $channel = $channel->{id};
2893
2516 if (ref $channel) { 2894 } elsif (ref $channel) {
2517 # send meta info to client, if not yet sent 2895 # send meta info to client, if not yet sent
2518 unless (exists $self->{channel}{$channel->{id}}) { 2896 unless (exists $self->{channel}{$channel->{id}}) {
2519 $self->{channel}{$channel->{id}} = $channel; 2897 $self->{channel}{$channel->{id}} = $channel;
2520 $self->ext_msg (channel_info => $channel); 2898 $self->ext_msg (channel_info => $channel)
2899 if $self->can_msg;
2521 } 2900 }
2522 2901
2523 $channel = $channel->{id}; 2902 $channel = $channel->{id};
2524 } 2903 }
2525 2904
2528 if ($self->can_msg) { 2907 if ($self->can_msg) {
2529 # default colour, mask it out 2908 # default colour, mask it out
2530 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2531 if $color & cf::NDI_DEF; 2910 if $color & cf::NDI_DEF;
2532 2911
2533 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2912 my $pkt = "msg "
2913 . $self->{json_coder}->encode (
2534 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2914 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2915 );
2916
2917 # try lzf for large packets
2918 $pkt = "lzf " . Compress::LZF::compress $pkt
2919 if 1024 <= length $pkt and $self->{can_lzf};
2920
2921 # split very large packets
2922 if (8192 < length $pkt and $self->{can_lzf}) {
2923 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2924 $pkt = "frag";
2925 }
2926
2927 $self->send_packet ($pkt);
2535 } else { 2928 } else {
2536 if ($color >= 0) { 2929 if ($color >= 0) {
2537 # replace some tags by gcfclient-compatible ones 2930 # replace some tags by gcfclient-compatible ones
2538 for ($msg) { 2931 for ($msg) {
2539 1 while 2932 1 while
2737=pod 3130=pod
2738 3131
2739The following functions and methods are available within a safe environment: 3132The following functions and methods are available within a safe environment:
2740 3133
2741 cf::object 3134 cf::object
2742 contr pay_amount pay_player map x y force_find force_add 3135 contr pay_amount pay_player map x y force_find force_add destroy
2743 insert remove name archname title slaying race decrease_ob_nr 3136 insert remove name archname title slaying race decrease split
2744 3137
2745 cf::object::player 3138 cf::object::player
2746 player 3139 player
2747 3140
2748 cf::player 3141 cf::player
2753 3146
2754=cut 3147=cut
2755 3148
2756for ( 3149for (
2757 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3150 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2758 insert remove inv name archname title slaying race 3151 insert remove inv nrof name archname title slaying race
2759 decrease_ob_nr)], 3152 decrease split destroy change_exp)],
2760 ["cf::object::player" => qw(player)], 3153 ["cf::object::player" => qw(player)],
2761 ["cf::player" => qw(peaceful)], 3154 ["cf::player" => qw(peaceful)],
2762 ["cf::map" => qw(trigger)], 3155 ["cf::map" => qw(trigger)],
2763) { 3156) {
2764 no strict 'refs'; 3157 no strict 'refs';
2869 { 3262 {
2870 my $faces = $facedata->{faceinfo}; 3263 my $faces = $facedata->{faceinfo};
2871 3264
2872 while (my ($face, $info) = each %$faces) { 3265 while (my ($face, $info) = each %$faces) {
2873 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3266 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3267
2874 cf::face::set_visibility $idx, $info->{visibility}; 3268 cf::face::set_visibility $idx, $info->{visibility};
2875 cf::face::set_magicmap $idx, $info->{magicmap}; 3269 cf::face::set_magicmap $idx, $info->{magicmap};
2876 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3270 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2877 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3271 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2878 3272
2879 cf::cede_to_tick; 3273 cf::cede_to_tick;
2880 } 3274 }
2881 3275
2882 while (my ($face, $info) = each %$faces) { 3276 while (my ($face, $info) = each %$faces) {
2883 next unless $info->{smooth}; 3277 next unless $info->{smooth};
3278
2884 my $idx = cf::face::find $face 3279 my $idx = cf::face::find $face
2885 or next; 3280 or next;
3281
2886 if (my $smooth = cf::face::find $info->{smooth}) { 3282 if (my $smooth = cf::face::find $info->{smooth}) {
2887 cf::face::set_smooth $idx, $smooth; 3283 cf::face::set_smooth $idx, $smooth;
2888 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3284 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2889 } else { 3285 } else {
2890 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3286 warn "smooth face '$info->{smooth}' not found for face '$face'";
2908 { 3304 {
2909 # TODO: for gcfclient pleasure, we should give resources 3305 # TODO: for gcfclient pleasure, we should give resources
2910 # that gcfclient doesn't grok a >10000 face index. 3306 # that gcfclient doesn't grok a >10000 face index.
2911 my $res = $facedata->{resource}; 3307 my $res = $facedata->{resource};
2912 3308
2913 my $soundconf = delete $res->{"res/sound.conf"};
2914
2915 while (my ($name, $info) = each %$res) { 3309 while (my ($name, $info) = each %$res) {
3310 if (defined $info->{type}) {
2916 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3311 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2917 my $data; 3312 my $data;
2918 3313
2919 if ($info->{type} & 1) { 3314 if ($info->{type} & 1) {
2920 # prepend meta info 3315 # prepend meta info
2921 3316
2922 my $meta = $enc->encode ({ 3317 my $meta = $enc->encode ({
2923 name => $name, 3318 name => $name,
2924 %{ $info->{meta} || {} }, 3319 %{ $info->{meta} || {} },
2925 }); 3320 });
2926 3321
2927 $data = pack "(w/a*)*", $meta, $info->{data}; 3322 $data = pack "(w/a*)*", $meta, $info->{data};
3323 } else {
3324 $data = $info->{data};
3325 }
3326
3327 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3328 cf::face::set_type $idx, $info->{type};
2928 } else { 3329 } else {
2929 $data = $info->{data}; 3330 $RESOURCE{$name} = $info;
2930 } 3331 }
2931 3332
2932 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2933 cf::face::set_type $idx, $info->{type};
2934
2935 cf::cede_to_tick; 3333 cf::cede_to_tick;
2936 } 3334 }
2937
2938 if ($soundconf) {
2939 $soundconf = $enc->decode (delete $soundconf->{data});
2940
2941 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2942 my $sound = $soundconf->{compat}[$_]
2943 or next;
2944
2945 my $face = cf::face::find "sound/$sound->[1]";
2946 cf::sound::set $sound->[0] => $face;
2947 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2948 }
2949
2950 while (my ($k, $v) = each %{$soundconf->{event}}) {
2951 my $face = cf::face::find "sound/$v";
2952 cf::sound::set $k => $face;
2953 }
2954 }
2955 } 3335 }
3336
3337 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2956 3338
2957 1 3339 1
2958} 3340}
3341
3342cf::global->attach (on_resource_update => sub {
3343 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3344 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3345
3346 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3347 my $sound = $soundconf->{compat}[$_]
3348 or next;
3349
3350 my $face = cf::face::find "sound/$sound->[1]";
3351 cf::sound::set $sound->[0] => $face;
3352 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3353 }
3354
3355 while (my ($k, $v) = each %{$soundconf->{event}}) {
3356 my $face = cf::face::find "sound/$v";
3357 cf::sound::set $k => $face;
3358 }
3359 }
3360});
2959 3361
2960register_exticmd fx_want => sub { 3362register_exticmd fx_want => sub {
2961 my ($ns, $want) = @_; 3363 my ($ns, $want) = @_;
2962 3364
2963 while (my ($k, $v) = each %$want) { 3365 while (my ($k, $v) = each %$want) {
2964 $ns->fx_want ($k, $v); 3366 $ns->fx_want ($k, $v);
2965 } 3367 }
2966}; 3368};
3369
3370sub load_resource_file($) {
3371 my $guard = lock_acquire "load_resource_file";
3372
3373 my $status = load_resource_file_ $_[0];
3374 get_slot 0.1, 100;
3375 cf::arch::commit_load;
3376
3377 $status
3378}
2967 3379
2968sub reload_regions { 3380sub reload_regions {
2969 # HACK to clear player env face cache, we need some signal framework 3381 # HACK to clear player env face cache, we need some signal framework
2970 # for this (global event?) 3382 # for this (global event?)
2971 %ext::player_env::MUSIC_FACE_CACHE = (); 3383 %ext::player_env::MUSIC_FACE_CACHE = ();
2985} 3397}
2986 3398
2987sub reload_archetypes { 3399sub reload_archetypes {
2988 load_resource_file "$DATADIR/archetypes" 3400 load_resource_file "$DATADIR/archetypes"
2989 or die "unable to load archetypes\n"; 3401 or die "unable to load archetypes\n";
2990 #d# NEED to laod twice to resolve forward references
2991 # this really needs to be done in an extra post-pass
2992 # (which needs to be synchronous, so solve it differently)
2993 load_resource_file "$DATADIR/archetypes"
2994 or die "unable to load archetypes\n";
2995} 3402}
2996 3403
2997sub reload_treasures { 3404sub reload_treasures {
2998 load_resource_file "$DATADIR/treasures" 3405 load_resource_file "$DATADIR/treasures"
2999 or die "unable to load treasurelists\n"; 3406 or die "unable to load treasurelists\n";
3000} 3407}
3001 3408
3002sub reload_resources { 3409sub reload_resources {
3003 warn "reloading resource files...\n"; 3410 warn "reloading resource files...\n";
3004 3411
3412 reload_facedata;
3413 reload_archetypes;
3005 reload_regions; 3414 reload_regions;
3006 reload_facedata;
3007 #reload_archetypes;#d#
3008 reload_archetypes;
3009 reload_treasures; 3415 reload_treasures;
3010 3416
3011 warn "finished reloading resource files\n"; 3417 warn "finished reloading resource files\n";
3012} 3418}
3013 3419
3014sub init { 3420sub init {
3421 my $guard = freeze_mainloop;
3422
3423 evthread_start IO::AIO::poll_fileno;
3424
3015 reload_resources; 3425 reload_resources;
3016} 3426}
3017 3427
3018sub reload_config { 3428sub reload_config {
3019 open my $fh, "<:utf8", "$CONFDIR/config" 3429 open my $fh, "<:utf8", "$CONFDIR/config"
3020 or return; 3430 or return;
3021 3431
3022 local $/; 3432 local $/;
3023 *CFG = YAML::Syck::Load <$fh>; 3433 *CFG = YAML::Load <$fh>;
3024 3434
3025 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3435 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3026 3436
3027 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3437 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3028 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3438 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3039sub main { 3449sub main {
3040 # we must not ever block the main coroutine 3450 # we must not ever block the main coroutine
3041 local $Coro::idle = sub { 3451 local $Coro::idle = sub {
3042 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3452 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3043 (async { 3453 (async {
3044 Event::one_event; 3454 $Coro::current->{desc} = "IDLE BUG HANDLER";
3455 EV::loop EV::LOOP_ONESHOT;
3045 })->prio (Coro::PRIO_MAX); 3456 })->prio (Coro::PRIO_MAX);
3046 }; 3457 };
3047 3458
3459 {
3460 my $guard = freeze_mainloop;
3048 reload_config; 3461 reload_config;
3049 db_init; 3462 db_init;
3050 load_extensions; 3463 load_extensions;
3051 3464
3052 $TICK_WATCHER->start; 3465 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3466 }
3467
3053 Event::loop; 3468 EV::loop;
3054} 3469}
3055 3470
3056############################################################################# 3471#############################################################################
3057# initialisation and cleanup 3472# initialisation and cleanup
3058 3473
3059# install some emergency cleanup handlers 3474# install some emergency cleanup handlers
3060BEGIN { 3475BEGIN {
3476 our %SIGWATCHER = ();
3061 for my $signal (qw(INT HUP TERM)) { 3477 for my $signal (qw(INT HUP TERM)) {
3062 Event->signal ( 3478 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3063 reentrant => 0,
3064 data => WF_AUTOCANCEL,
3065 signal => $signal,
3066 prio => 0,
3067 cb => sub {
3068 cf::cleanup "SIG$signal"; 3479 cf::cleanup "SIG$signal";
3069 },
3070 ); 3480 };
3071 } 3481 }
3072} 3482}
3073 3483
3074sub write_runtime { 3484sub write_runtime_sync {
3075 my $runtime = "$LOCALDIR/runtime"; 3485 my $runtime = "$LOCALDIR/runtime";
3076 3486
3077 # first touch the runtime file to show we are still running: 3487 # first touch the runtime file to show we are still running:
3078 # the fsync below can take a very very long time. 3488 # the fsync below can take a very very long time.
3079 3489
3105 and return; 3515 and return;
3106 3516
3107 warn "runtime file written.\n"; 3517 warn "runtime file written.\n";
3108 3518
3109 1 3519 1
3520}
3521
3522our $uuid_lock;
3523our $uuid_skip;
3524
3525sub write_uuid_sync($) {
3526 $uuid_skip ||= $_[0];
3527
3528 return if $uuid_lock;
3529 local $uuid_lock = 1;
3530
3531 my $uuid = "$LOCALDIR/uuid";
3532
3533 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3534 or return;
3535
3536 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3537 $uuid_skip = 0;
3538
3539 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3540 and return;
3541
3542 # always fsync - this file is important
3543 aio_fsync $fh
3544 and return;
3545
3546 close $fh
3547 or return;
3548
3549 aio_rename "$uuid~", $uuid
3550 and return;
3551
3552 warn "uuid file written ($value).\n";
3553
3554 1
3555
3556}
3557
3558sub write_uuid($$) {
3559 my ($skip, $sync) = @_;
3560
3561 $sync ? write_uuid_sync $skip
3562 : async { write_uuid_sync $skip };
3110} 3563}
3111 3564
3112sub emergency_save() { 3565sub emergency_save() {
3113 my $freeze_guard = cf::freeze_mainloop; 3566 my $freeze_guard = cf::freeze_mainloop;
3114 3567
3120 # and maps saved/destroyed asynchronously. 3573 # and maps saved/destroyed asynchronously.
3121 warn "begin emergency player save\n"; 3574 warn "begin emergency player save\n";
3122 for my $login (keys %cf::PLAYER) { 3575 for my $login (keys %cf::PLAYER) {
3123 my $pl = $cf::PLAYER{$login} or next; 3576 my $pl = $cf::PLAYER{$login} or next;
3124 $pl->valid or next; 3577 $pl->valid or next;
3578 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3125 $pl->save; 3579 $pl->save;
3126 } 3580 }
3127 warn "end emergency player save\n"; 3581 warn "end emergency player save\n";
3128 3582
3129 warn "begin emergency map save\n"; 3583 warn "begin emergency map save\n";
3135 warn "end emergency map save\n"; 3589 warn "end emergency map save\n";
3136 3590
3137 warn "begin emergency database checkpoint\n"; 3591 warn "begin emergency database checkpoint\n";
3138 BDB::db_env_txn_checkpoint $DB_ENV; 3592 BDB::db_env_txn_checkpoint $DB_ENV;
3139 warn "end emergency database checkpoint\n"; 3593 warn "end emergency database checkpoint\n";
3594
3595 warn "begin write uuid\n";
3596 write_uuid_sync 1;
3597 warn "end write uuid\n";
3140 }; 3598 };
3141 3599
3142 warn "leave emergency perl save\n"; 3600 warn "leave emergency perl save\n";
3143} 3601}
3144 3602
3146 my ($make_core) = @_; 3604 my ($make_core) = @_;
3147 3605
3148 warn Carp::longmess "post_cleanup backtrace" 3606 warn Carp::longmess "post_cleanup backtrace"
3149 if $make_core; 3607 if $make_core;
3150} 3608}
3609
3610# a safer delete_package, copied from Symbol
3611sub clear_package($) {
3612 my $pkg = shift;
3613
3614 # expand to full symbol table name if needed
3615 unless ($pkg =~ /^main::.*::$/) {
3616 $pkg = "main$pkg" if $pkg =~ /^::/;
3617 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3618 $pkg .= '::' unless $pkg =~ /::$/;
3619 }
3620
3621 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3622 my $stem_symtab = *{$stem}{HASH};
3623
3624 defined $stem_symtab and exists $stem_symtab->{$leaf}
3625 or return;
3626
3627 # clear all symbols
3628 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3629 for my $name (keys %$leaf_symtab) {
3630 _gv_clear *{"$pkg$name"};
3631# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3632 }
3633 warn "cleared package #$pkg\n";#d#
3634}
3635
3636our $RELOAD; # how many times to reload
3151 3637
3152sub do_reload_perl() { 3638sub do_reload_perl() {
3153 # can/must only be called in main 3639 # can/must only be called in main
3154 if ($Coro::current != $Coro::main) { 3640 if ($Coro::current != $Coro::main) {
3155 warn "can only reload from main coroutine"; 3641 warn "can only reload from main coroutine";
3156 return; 3642 return;
3157 } 3643 }
3158 3644
3645 return if $RELOAD++;
3646
3647 while ($RELOAD) {
3159 warn "reloading..."; 3648 warn "reloading...";
3160 3649
3161 warn "entering sync_job"; 3650 warn "entering sync_job";
3162 3651
3163 cf::sync_job { 3652 cf::sync_job {
3164 cf::write_runtime; # external watchdog should not bark 3653 cf::write_runtime_sync; # external watchdog should not bark
3165 cf::emergency_save; 3654 cf::emergency_save;
3166 cf::write_runtime; # external watchdog should not bark 3655 cf::write_runtime_sync; # external watchdog should not bark
3167 3656
3168 warn "syncing database to disk"; 3657 warn "syncing database to disk";
3169 BDB::db_env_txn_checkpoint $DB_ENV; 3658 BDB::db_env_txn_checkpoint $DB_ENV;
3170 3659
3171 # if anything goes wrong in here, we should simply crash as we already saved 3660 # if anything goes wrong in here, we should simply crash as we already saved
3172 3661
3173 warn "cancelling all WF_AUTOCANCEL watchers";
3174 for (Event::all_watchers) {
3175 $_->cancel if $_->data & WF_AUTOCANCEL;
3176 }
3177
3178 warn "flushing outstanding aio requests"; 3662 warn "flushing outstanding aio requests";
3179 for (;;) {
3180 BDB::flush;
3181 IO::AIO::flush;
3182 Coro::cede;
3183 last unless IO::AIO::nreqs || BDB::nreqs; 3663 while (IO::AIO::nreqs || BDB::nreqs) {
3184 warn "iterate..."; 3664 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3185 }
3186
3187 ++$RELOAD;
3188
3189 warn "cancelling all extension coros";
3190 $_->cancel for values %EXT_CORO;
3191 %EXT_CORO = ();
3192
3193 warn "removing commands";
3194 %COMMAND = ();
3195
3196 warn "removing ext/exti commands";
3197 %EXTCMD = ();
3198 %EXTICMD = ();
3199
3200 warn "unloading/nuking all extensions";
3201 for my $pkg (@EXTS) {
3202 warn "... unloading $pkg";
3203
3204 if (my $cb = $pkg->can ("unload")) {
3205 eval {
3206 $cb->($pkg);
3207 1
3208 } or warn "$pkg unloaded, but with errors: $@";
3209 } 3665 }
3210 3666
3211 warn "... nuking $pkg"; 3667 warn "cancelling all extension coros";
3212 Symbol::delete_package $pkg; 3668 $_->cancel for values %EXT_CORO;
3213 } 3669 %EXT_CORO = ();
3214 3670
3215 warn "unloading all perl modules loaded from $LIBDIR"; 3671 warn "removing commands";
3216 while (my ($k, $v) = each %INC) { 3672 %COMMAND = ();
3217 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3218 3673
3674 warn "removing ext/exti commands";
3675 %EXTCMD = ();
3676 %EXTICMD = ();
3677
3678 warn "unloading/nuking all extensions";
3679 for my $pkg (@EXTS) {
3219 warn "... unloading $k"; 3680 warn "... unloading $pkg";
3220 delete $INC{$k};
3221 3681
3222 $k =~ s/\.pm$//;
3223 $k =~ s/\//::/g;
3224
3225 if (my $cb = $k->can ("unload_module")) { 3682 if (my $cb = $pkg->can ("unload")) {
3683 eval {
3226 $cb->(); 3684 $cb->($pkg);
3685 1
3686 } or warn "$pkg unloaded, but with errors: $@";
3687 }
3688
3689 warn "... clearing $pkg";
3690 clear_package $pkg;
3227 } 3691 }
3228 3692
3229 Symbol::delete_package $k; 3693 warn "unloading all perl modules loaded from $LIBDIR";
3694 while (my ($k, $v) = each %INC) {
3695 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3696
3697 warn "... unloading $k";
3698 delete $INC{$k};
3699
3700 $k =~ s/\.pm$//;
3701 $k =~ s/\//::/g;
3702
3703 if (my $cb = $k->can ("unload_module")) {
3704 $cb->();
3705 }
3706
3707 clear_package $k;
3230 } 3708 }
3231 3709
3232 warn "getting rid of safe::, as good as possible"; 3710 warn "getting rid of safe::, as good as possible";
3233 Symbol::delete_package "safe::$_" 3711 clear_package "safe::$_"
3234 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3712 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3235 3713
3236 warn "unloading cf.pm \"a bit\""; 3714 warn "unloading cf.pm \"a bit\"";
3237 delete $INC{"cf.pm"}; 3715 delete $INC{"cf.pm"};
3238 delete $INC{"cf/pod.pm"}; 3716 delete $INC{"cf/pod.pm"};
3239 3717
3240 # don't, removes xs symbols, too, 3718 # don't, removes xs symbols, too,
3241 # and global variables created in xs 3719 # and global variables created in xs
3242 #Symbol::delete_package __PACKAGE__; 3720 #clear_package __PACKAGE__;
3243 3721
3244 warn "unload completed, starting to reload now"; 3722 warn "unload completed, starting to reload now";
3245 3723
3246 warn "reloading cf.pm"; 3724 warn "reloading cf.pm";
3247 require cf; 3725 require cf;
3248 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3726 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3249 3727
3250 warn "loading config and database again"; 3728 warn "loading config and database again";
3251 cf::reload_config; 3729 cf::reload_config;
3252 3730
3253 warn "loading extensions"; 3731 warn "loading extensions";
3254 cf::load_extensions; 3732 cf::load_extensions;
3255 3733
3256 warn "reattaching attachments to objects/players"; 3734 warn "reattaching attachments to objects/players";
3257 _global_reattach; # objects, sockets 3735 _global_reattach; # objects, sockets
3258 warn "reattaching attachments to maps"; 3736 warn "reattaching attachments to maps";
3259 reattach $_ for values %MAP; 3737 reattach $_ for values %MAP;
3260 warn "reattaching attachments to players"; 3738 warn "reattaching attachments to players";
3261 reattach $_ for values %PLAYER; 3739 reattach $_ for values %PLAYER;
3262 3740
3263 warn "leaving sync_job"; 3741 warn "leaving sync_job";
3264 3742
3265 1 3743 1
3266 } or do { 3744 } or do {
3267 warn $@; 3745 warn $@;
3268 warn "error while reloading, exiting."; 3746 cf::cleanup "error while reloading, exiting.";
3269 exit 1;
3270 }; 3747 };
3271 3748
3272 warn "reloaded"; 3749 warn "reloaded";
3750 --$RELOAD;
3751 }
3273}; 3752};
3274 3753
3275our $RELOAD_WATCHER; # used only during reload 3754our $RELOAD_WATCHER; # used only during reload
3276 3755
3277sub reload_perl() { 3756sub reload_perl() {
3278 # doing reload synchronously and two reloads happen back-to-back, 3757 # doing reload synchronously and two reloads happen back-to-back,
3279 # coro crashes during coro_state_free->destroy here. 3758 # coro crashes during coro_state_free->destroy here.
3280 3759
3281 $RELOAD_WATCHER ||= Event->timer ( 3760 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3282 reentrant => 0,
3283 after => 0,
3284 data => WF_AUTOCANCEL,
3285 cb => sub {
3286 do_reload_perl; 3761 do_reload_perl;
3287 undef $RELOAD_WATCHER; 3762 undef $RELOAD_WATCHER;
3288 },
3289 ); 3763 };
3290} 3764}
3291 3765
3292register_command "reload" => sub { 3766register_command "reload" => sub {
3293 my ($who, $arg) = @_; 3767 my ($who, $arg) = @_;
3294 3768
3295 if ($who->flag (FLAG_WIZ)) { 3769 if ($who->flag (FLAG_WIZ)) {
3296 $who->message ("reloading server."); 3770 $who->message ("reloading server.");
3771 async {
3772 $Coro::current->{desc} = "perl_reload";
3297 async { reload_perl }; 3773 reload_perl;
3774 };
3298 } 3775 }
3299}; 3776};
3300 3777
3301unshift @INC, $LIBDIR; 3778unshift @INC, $LIBDIR;
3302 3779
3304 3781
3305our @WAIT_FOR_TICK; 3782our @WAIT_FOR_TICK;
3306our @WAIT_FOR_TICK_BEGIN; 3783our @WAIT_FOR_TICK_BEGIN;
3307 3784
3308sub wait_for_tick { 3785sub wait_for_tick {
3309 return unless $TICK_WATCHER->is_active;
3310 return if $Coro::current == $Coro::main; 3786 return if tick_inhibit || $Coro::current == $Coro::main;
3311 3787
3312 my $signal = new Coro::Signal; 3788 my $signal = new Coro::Signal;
3313 push @WAIT_FOR_TICK, $signal; 3789 push @WAIT_FOR_TICK, $signal;
3314 $signal->wait; 3790 $signal->wait;
3315} 3791}
3316 3792
3317sub wait_for_tick_begin { 3793sub wait_for_tick_begin {
3318 return unless $TICK_WATCHER->is_active;
3319 return if $Coro::current == $Coro::main; 3794 return if tick_inhibit || $Coro::current == $Coro::main;
3320 3795
3321 my $signal = new Coro::Signal; 3796 my $signal = new Coro::Signal;
3322 push @WAIT_FOR_TICK_BEGIN, $signal; 3797 push @WAIT_FOR_TICK_BEGIN, $signal;
3323 $signal->wait; 3798 $signal->wait;
3324} 3799}
3325 3800
3326 my $min = 1e6;#d# 3801sub tick {
3327 my $avg = 10;
3328$TICK_WATCHER = Event->timer (
3329 reentrant => 0,
3330 parked => 1,
3331 prio => 0,
3332 at => $NEXT_TICK || $TICK,
3333 data => WF_AUTOCANCEL,
3334 cb => sub {
3335 if ($Coro::current != $Coro::main) { 3802 if ($Coro::current != $Coro::main) {
3336 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3803 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3337 unless ++$bug_warning > 10; 3804 unless ++$bug_warning > 10;
3338 return; 3805 return;
3339 } 3806 }
3340 3807
3341 $NOW = $tick_start = Event::time;
3342
3343 cf::server_tick; # one server iteration 3808 cf::server_tick; # one server iteration
3344 3809
3345 0 && sync_job {#d# 3810 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3346 for(1..10) { 3811 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3347 my $t = Event::time; 3812 Coro::async_pool {
3348 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3813 $Coro::current->{desc} = "runtime saver";
3349 or die; 3814 write_runtime_sync
3350 3815 or warn "ERROR: unable to write runtime file: $!";
3351 $map->width (50);
3352 $map->height (50);
3353 $map->alloc;
3354 $map->_load_objects ("/tmp/x.map", 1);
3355 my $t = Event::time - $t;
3356
3357 #next unless $t < 0.0013;#d#
3358 if ($t < $min) {
3359 $min = $t;
3360 }
3361 $avg = $avg * 0.99 + $t * 0.01;
3362 }
3363 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3364 exit 0;
3365 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3366 }; 3816 };
3817 }
3367 3818
3368 $RUNTIME += $TICK;
3369 $NEXT_TICK += $TICK;
3370
3371 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3372 $NEXT_RUNTIME_WRITE = $NOW + 10;
3373 Coro::async_pool {
3374 write_runtime
3375 or warn "ERROR: unable to write runtime file: $!";
3376 };
3377 }
3378
3379# my $AFTER = Event::time;
3380# warn $AFTER - $NOW;#d#
3381
3382 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3819 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3383 $sig->send; 3820 $sig->send;
3384 } 3821 }
3385 while (my $sig = shift @WAIT_FOR_TICK) { 3822 while (my $sig = shift @WAIT_FOR_TICK) {
3386 $sig->send; 3823 $sig->send;
3387 } 3824 }
3388 3825
3389 $NOW = Event::time; 3826 $LOAD = ($NOW - $TICK_START) / $TICK;
3390
3391 # if we are delayed by four ticks or more, skip them all
3392 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3393
3394 $TICK_WATCHER->at ($NEXT_TICK);
3395 $TICK_WATCHER->start;
3396
3397 $LOAD = ($NOW - $tick_start) / $TICK;
3398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3827 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3399 3828
3400 _post_tick; 3829 if (0) {
3401 3830 if ($NEXT_TICK) {
3402 3831 my $jitter = $TICK_START - $NEXT_TICK;
3832 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3833 warn "jitter $JITTER\n";#d#
3834 }
3403 }, 3835 }
3404); 3836}
3405 3837
3406{ 3838{
3407 BDB::max_poll_time $TICK * 0.1; 3839 # configure BDB
3408 $BDB_POLL_WATCHER = Event->io ( 3840
3409 reentrant => 0,
3410 fd => BDB::poll_fileno,
3411 poll => 'r',
3412 prio => 0,
3413 data => WF_AUTOCANCEL,
3414 cb => \&BDB::poll_cb,
3415 );
3416 BDB::min_parallel 8; 3841 BDB::min_parallel 8;
3417 3842 BDB::max_poll_reqs $TICK * 0.1;
3418 BDB::set_sync_prepare { 3843 $AnyEvent::BDB::WATCHER->priority (1);
3419 my $status;
3420 my $current = $Coro::current;
3421 (
3422 sub {
3423 $status = $!;
3424 $current->ready; undef $current;
3425 },
3426 sub {
3427 Coro::schedule while defined $current;
3428 $! = $status;
3429 },
3430 )
3431 };
3432 3844
3433 unless ($DB_ENV) { 3845 unless ($DB_ENV) {
3434 $DB_ENV = BDB::db_env_create; 3846 $DB_ENV = BDB::db_env_create;
3847 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3848 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3849 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3850 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3851 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3435 3852
3436 cf::sync_job { 3853 cf::sync_job {
3437 eval { 3854 eval {
3438 BDB::db_env_open 3855 BDB::db_env_open
3439 $DB_ENV, 3856 $DB_ENV,
3441 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3858 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3442 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3859 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3443 0666; 3860 0666;
3444 3861
3445 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3862 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3446
3447 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3448 $DB_ENV->set_lk_detect;
3449 }; 3863 };
3450 3864
3451 cf::cleanup "db_env_open(db): $@" if $@; 3865 cf::cleanup "db_env_open(db): $@" if $@;
3452 }; 3866 };
3453 } 3867 }
3868
3869 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3870 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3871 };
3872 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3873 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3874 };
3875 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3876 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3877 };
3454} 3878}
3455 3879
3456{ 3880{
3881 # configure IO::AIO
3882
3457 IO::AIO::min_parallel 8; 3883 IO::AIO::min_parallel 8;
3458
3459 undef $Coro::AIO::WATCHER;
3460 IO::AIO::max_poll_time $TICK * 0.1; 3884 IO::AIO::max_poll_time $TICK * 0.1;
3461 $AIO_POLL_WATCHER = Event->io ( 3885 undef $AnyEvent::AIO::WATCHER;
3462 reentrant => 0,
3463 data => WF_AUTOCANCEL,
3464 fd => IO::AIO::poll_fileno,
3465 poll => 'r',
3466 prio => 6,
3467 cb => \&IO::AIO::poll_cb,
3468 );
3469} 3886}
3470 3887
3471my $_log_backtrace; 3888my $_log_backtrace;
3472 3889
3473sub _log_backtrace { 3890sub _log_backtrace {
3477 3894
3478 # limit the # of concurrent backtraces 3895 # limit the # of concurrent backtraces
3479 if ($_log_backtrace < 2) { 3896 if ($_log_backtrace < 2) {
3480 ++$_log_backtrace; 3897 ++$_log_backtrace;
3481 async { 3898 async {
3899 $Coro::current->{desc} = "abt $msg";
3900
3482 my @bt = fork_call { 3901 my @bt = fork_call {
3483 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
3484 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3903 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3485 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3904 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3486 or die "addr2line: $!"; 3905 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines