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.339 by root, Fri Aug 24 00:26:10 2007 UTC vs.
Revision 1.410 by root, Tue Jan 15 12:02:24 2008 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV 1.86;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.64 (); 15use Coro 4.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
23use Coro::Storable; 24use Coro::Storable;
24use Coro::Util (); 25use Coro::Util ();
25 26
26use JSON::XS 1.4 (); 27use JSON::XS 2.01 ();
27use BDB (); 28use BDB ();
28use Data::Dumper; 29use Data::Dumper;
29use Digest::MD5; 30use Digest::MD5;
30use Fcntl; 31use Fcntl;
31use YAML::Syck (); 32use YAML ();
32use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
33use Time::HiRes; 34use Time::HiRes;
34use Compress::LZF; 35use Compress::LZF;
35use Digest::MD5 (); 36use Digest::MD5 ();
36 37
37# configure various modules to our taste 38# configure various modules to our taste
38# 39#
39$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::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 42Compress::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 43
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 45
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 47
… …
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 66our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 69our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 70our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE;
75 72
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 74our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 77our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
83 79
84our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 84our $DB_ENV;
86 85
87our %CFG; 86our %CFG;
88 87
89our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 89our $RUNTIME;
90our $NOW;
91 91
92our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
95 95
96# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 98
… …
159 159
160The raw value load value from the last tick. 160The raw value load value from the last tick.
161 161
162=item %cf::CFG 162=item %cf::CFG
163 163
164Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 165from wherever your confdir points to.
166 166
167=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
168 168
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
187 $msg .= "\n" 187 $msg .= "\n"
188 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
189 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 191
192 utf8::encode $msg;
193 LOG llevError, $msg; 192 LOG llevError, $msg;
194 }; 193 };
195} 194}
195
196$Coro::State::DIEHOOK = sub {
197 return unless $^S eq 0; # "eq", not "=="
198
199 if ($Coro::current == $Coro::main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d#
202 }#d#
203
204 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate
207};
208
209$SIG{__DIE__} = sub { }; #d#?
196 210
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
213)) { 227)) {
214 no strict 'refs'; 228 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 230}
217 231
218$Event::DIED = sub { 232$EV::DIED = sub {
219 warn "error in event callback: @_"; 233 warn "error in event callback: @_";
220}; 234};
221 235
222############################################################################# 236#############################################################################
223 237
… …
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 260 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 261 $d
248 } || "[unable to dump $_[0]: '$@']"; 262 } || "[unable to dump $_[0]: '$@']";
249} 263}
250 264
251=item $ref = cf::from_json $json 265=item $ref = cf::decode_json $json
252 266
253Converts a JSON string into the corresponding perl data structure. 267Converts a JSON string into the corresponding perl data structure.
254 268
255=item $json = cf::to_json $ref 269=item $json = cf::encode_json $ref
256 270
257Converts a perl data structure into its JSON representation. 271Converts a perl data structure into its JSON representation.
258 272
259=cut 273=cut
260 274
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 276
263sub to_json ($) { $json_coder->encode ($_[0]) } 277sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 278sub decode_json($) { $json_coder->decode ($_[0]) }
265 279
266=item cf::lock_wait $string 280=item cf::lock_wait $string
267 281
268Wait until the given lock is available. See cf::lock_acquire. 282Wait until the given lock is available. See cf::lock_acquire.
269 283
… …
272Wait until the given lock is available and then acquires it and returns 286Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 287a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 288for example when the coroutine gets canceled), the lock is automatically
275returned. 289returned.
276 290
291Locks are *not* recursive, locking from the same coro twice results in a
292deadlocked coro.
293
277Lock names should begin with a unique identifier (for example, cf::map::find 294Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 295uses map_find and cf::map::load uses map_load).
279 296
280=item $locked = cf::lock_active $string 297=item $locked = cf::lock_active $string
281 298
282Return true if the lock is currently active, i.e. somebody has locked it. 299Return true if the lock is currently active, i.e. somebody has locked it.
283 300
284=cut 301=cut
285 302
286our %LOCK; 303our %LOCK;
304our %LOCKER;#d#
287 305
288sub lock_wait($) { 306sub lock_wait($) {
289 my ($key) = @_; 307 my ($key) = @_;
308
309 if ($LOCKER{$key} == $Coro::current) {#d#
310 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
311 return;#d#
312 }#d#
290 313
291 # wait for lock, if any 314 # wait for lock, if any
292 while ($LOCK{$key}) { 315 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 316 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 317 Coro::schedule;
… …
300 323
301 # wait, to be sure we are not locked 324 # wait, to be sure we are not locked
302 lock_wait $key; 325 lock_wait $key;
303 326
304 $LOCK{$key} = []; 327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
305 329
306 Coro::guard { 330 Coro::guard {
331 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 332 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 333 $_->ready for @{ delete $LOCK{$key} };
309 } 334 }
310} 335}
311 336
… …
323 }; 348 };
324 $TICK_WATCHER->stop; 349 $TICK_WATCHER->stop;
325 $guard 350 $guard
326} 351}
327 352
353=item cf::periodic $interval, $cb
354
355Like EV::periodic, but randomly selects a starting point so that the actions
356get spread over timer.
357
358=cut
359
360sub periodic($$) {
361 my ($interval, $cb) = @_;
362
363 my $start = rand List::Util::min 180, $interval;
364
365 EV::periodic $start, $interval, 0, $cb
366}
367
328=item cf::get_slot $time[, $priority[, $name]] 368=item cf::get_slot $time[, $priority[, $name]]
329 369
330Allocate $time seconds of blocking CPU time at priority C<$priority>: 370Allocate $time seconds of blocking CPU time at priority C<$priority>:
331This call blocks and returns only when you have at least C<$time> seconds 371This call blocks and returns only when you have at least C<$time> seconds
332of cpu time till the next tick. The slot is only valid till the next cede. 372of cpu time till the next tick. The slot is only valid till the next cede.
… …
341our @SLOT_QUEUE; 381our @SLOT_QUEUE;
342our $SLOT_QUEUE; 382our $SLOT_QUEUE;
343 383
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 384$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 385$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager");
387
346 my $signal = new Coro::Signal; 388 my $signal = new Coro::Signal;
347 389
348 while () { 390 while () {
349 next_job: 391 next_job:
350 my $avail = cf::till_tick; 392 my $avail = cf::till_tick;
… …
358 } 400 }
359 } 401 }
360 } 402 }
361 403
362 if (@SLOT_QUEUE) { 404 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive 405 # we do not use wait_for_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal; 406 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 407 $signal->wait;
366 } else { 408 } else {
367 Coro::schedule; 409 Coro::schedule;
368 } 410 }
… …
391 433
392BEGIN { *async = \&Coro::async_pool } 434BEGIN { *async = \&Coro::async_pool }
393 435
394=item cf::sync_job { BLOCK } 436=item cf::sync_job { BLOCK }
395 437
396The design of Crossfire TRT requires that the main coroutine ($Coro::main) 438The design of Deliantra requires that the main coroutine ($Coro::main)
397is always able to handle events or runnable, as Crossfire TRT is only 439is always able to handle events or runnable, as Deliantra is only
398partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 440partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable. 441acceptable.
400 442
401If it must be done, put the blocking parts into C<sync_job>. This will run 443If it must be done, put the blocking parts into C<sync_job>. This will run
402the given BLOCK in another coroutine while waiting for the result. The 444the given BLOCK in another coroutine while waiting for the result. The
… …
407 449
408sub sync_job(&) { 450sub sync_job(&) {
409 my ($job) = @_; 451 my ($job) = @_;
410 452
411 if ($Coro::current == $Coro::main) { 453 if ($Coro::current == $Coro::main) {
412 my $time = Event::time; 454 my $time = EV::time;
413 455
414 # this is the main coro, too bad, we have to block 456 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 457 # till the operation succeeds, freezing the server :/
416 458
459 LOG llevError, Carp::longmess "sync job";#d#
460
417 # TODO: use suspend/resume instead 461 # TODO: use suspend/resume instead
418 # (but this is cancel-safe) 462 # (but this is cancel-safe)
419 my $freeze_guard = freeze_mainloop; 463 my $freeze_guard = freeze_mainloop;
420 464
421 my $busy = 1; 465 my $busy = 1;
422 my @res; 466 my @res;
423 467
424 (async { 468 (async {
469 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 470 @res = eval { $job->() };
426 warn $@ if $@; 471 warn $@ if $@;
427 undef $busy; 472 undef $busy;
428 })->prio (Coro::PRIO_MAX); 473 })->prio (Coro::PRIO_MAX);
429 474
430 while ($busy) { 475 while ($busy) {
431 Coro::cede or Event::one_event; 476 if (Coro::nready) {
477 Coro::cede_notself;
478 } else {
479 EV::loop EV::LOOP_ONESHOT;
432 } 480 }
481 }
433 482
434 $time = Event::time - $time; 483 $time = EV::time - $time;
435 484
436 LOG llevError | logBacktrace, Carp::longmess "long sync job" 485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438 487
439 $tick_start += $time; # do not account sync jobs to server load 488 $tick_start += $time; # do not account sync jobs to server load
… …
469=item fork_call { }, $args 518=item fork_call { }, $args
470 519
471Executes the given code block with the given arguments in a seperate 520Executes the given code block with the given arguments in a seperate
472process, returning the results. Everything must be serialisable with 521process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may 522Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling. 523never block itself or use any form of event handling.
475 524
476=cut 525=cut
477 526
478sub fork_call(&@) { 527sub fork_call(&@) {
479 my ($cb, @args) = @_; 528 my ($cb, @args) = @_;
480 529
481 # we seemingly have to make a local copy of the whole thing, 530 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 531 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 532 # TODO: investigate and fix (likely this will be rather laborious)
484 533
485 my @res = Coro::Util::fork_eval { 534 my @res = Coro::Util::fork_eval {
486 reset_signals; 535 reset_signals;
487 &$cb 536 &$cb
488 }, @args; 537 }, @args;
… …
497=item cf::db_put $family => $key => $value 546=item cf::db_put $family => $key => $value
498 547
499Stores the given C<$value> in the family. It can currently store binary 548Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 549data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 550
551=item $db = cf::db_table "name"
552
553Create and/or open a new database table. The string must not be "db" and must be unique
554within each server.
555
502=cut 556=cut
557
558sub db_table($) {
559 my ($name) = @_;
560 my $db = BDB::db_create $DB_ENV;
561
562 eval {
563 $db->set_flags (BDB::CHKSUM);
564
565 utf8::encode $name;
566 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
567 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
568 cf::cleanup "db_open(db): $!" if $!;
569 };
570 cf::cleanup "db_open(db): $@" if $@;
571
572 $db
573}
503 574
504our $DB; 575our $DB;
505 576
506sub db_init { 577sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 578 cf::sync_job {
511 eval { 579 $DB ||= db_table "db";
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 } 580 };
521} 581}
522 582
523sub db_get($$) { 583sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 584 my $key = "$_[0]/$_[1]";
525 585
… …
575 if (1) { 635 if (1) {
576 $md5 = 636 $md5 =
577 join "\x00", 637 join "\x00",
578 $processversion, 638 $processversion,
579 map { 639 map {
580 Coro::cede; 640 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 641 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 642 } 0.. $#$src;
583 643
584 644
585 my $dbmd5 = db_get cache => "$id/md5"; 645 my $dbmd5 = db_get cache => "$id/md5";
… …
629attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
630to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
631 691
632In the following description, CLASS can be any of C<global>, C<object> 692In the following description, CLASS can be any of C<global>, C<object>
633C<player>, C<client> or C<map> (i.e. the attachable objects in 693C<player>, C<client> or C<map> (i.e. the attachable objects in
634Crossfire TRT). 694Deliantra).
635 695
636=over 4 696=over 4
637 697
638=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
639 699
… …
921 } 981 }
922 982
923 0 983 0
924} 984}
925 985
926=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
927 987
928=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
929 989
930Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
931 991
… …
937 997
938=cut 998=cut
939 999
940############################################################################# 1000#############################################################################
941# object support 1001# object support
942#
943 1002
1003sub _object_equal($$);
1004sub _object_equal($$) {
1005 my ($a, $b) = @_;
1006
1007 return 0 unless (ref $a) eq (ref $b);
1008
1009 if ("HASH" eq ref $a) {
1010 my @ka = keys %$a;
1011 my @kb = keys %$b;
1012
1013 return 0 if @ka != @kb;
1014
1015 for (0 .. $#ka) {
1016 return 0 unless $ka[$_] eq $kb[$_];
1017 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1018 }
1019
1020 } elsif ("ARRAY" eq ref $a) {
1021
1022 return 0 if @$a != @$b;
1023
1024 for (0 .. $#$a) {
1025 return 0 unless _object_equal $a->[$_], $b->[$_];
1026 }
1027
1028 } elsif ($a ne $b) {
1029 return 0;
1030 }
1031
1032 1
1033}
1034
1035our $SLOW_MERGES;#d#
944sub _can_merge { 1036sub _can_merge {
945 my ($ob1, $ob2) = @_; 1037 my ($ob1, $ob2) = @_;
946 1038
947 local $Storable::canonical = 1; 1039 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1040
951 $fob1 eq $fob2 1041 # we do the slow way here
1042 return _object_equal $ob1, $ob2
952} 1043}
953 1044
954sub reattach { 1045sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1046 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1047 my ($obj) = @_;
… …
978cf::attachable->attach ( 1069cf::attachable->attach (
979 prio => -1000000, 1070 prio => -1000000,
980 on_instantiate => sub { 1071 on_instantiate => sub {
981 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
982 1073
983 $data = from_json $data; 1074 $data = decode_json $data;
984 1075
985 for (@$data) { 1076 for (@$data) {
986 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
987 1078
988 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
… …
1004sub object_freezer_save { 1095sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1096 my ($filename, $rdata, $objs) = @_;
1006 1097
1007 sync_job { 1098 sync_job {
1008 if (length $$rdata) { 1099 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1101 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1102 $decname, length $$rdata, scalar @$objs;
1011 1103
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1107 aio_fsync $fh if $cf::USE_FSYNC;
1016 close $fh; 1108 close $fh;
1017 1109
1018 if (@$objs) { 1110 if (@$objs) {
1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020 chmod SAVE_MODE, $fh; 1112 chmod SAVE_MODE, $fh;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1114 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1115 aio_fsync $fh if $cf::USE_FSYNC;
1024 close $fh; 1116 close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1117 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1118 }
… …
1034 } 1126 }
1035 } else { 1127 } else {
1036 aio_unlink $filename; 1128 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1129 aio_unlink "$filename.pst";
1038 } 1130 }
1039 } 1131 };
1040} 1132}
1041 1133
1042sub object_freezer_as_string { 1134sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1135 my ($rdata, $objs) = @_;
1044 1136
… …
1056 or return; 1148 or return;
1057 1149
1058 unless (aio_stat "$filename.pst") { 1150 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1151 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1152 or return;
1153
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1154 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs};
1062 } 1156 }
1063 1157
1158 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1159 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1160 $decname, length $data, scalar @{$av || []};
1161
1066 return ($data, $av); 1162 ($data, $av)
1067} 1163}
1068 1164
1069=head2 COMMAND CALLBACKS 1165=head2 COMMAND CALLBACKS
1070 1166
1071=over 4 1167=over 4
… …
1257 1353
1258=head3 cf::player 1354=head3 cf::player
1259 1355
1260=over 4 1356=over 4
1261 1357
1358=item cf::player::num_playing
1359
1360Returns the official number of playing players, as per the Crossfire metaserver rules.
1361
1362=cut
1363
1364sub num_playing {
1365 scalar grep
1366 $_->ob->map
1367 && !$_->hidden
1368 && !$_->ob->flag (cf::FLAG_WIZ),
1369 cf::player::list
1370}
1371
1262=item cf::player::find $login 1372=item cf::player::find $login
1263 1373
1264Returns the given player object, loading it if necessary (might block). 1374Returns the given player object, loading it if necessary (might block).
1265 1375
1266=cut 1376=cut
… …
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1411 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1412 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1413 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1414 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1415
1306 my $pl = load_pl path $login 1416 my $f = new_from_file cf::object::thawer path $login
1307 or return; 1417 or return;
1418
1419 my $pl = cf::player::load_pl $f
1420 or return;
1421 local $cf::PLAYER_LOADING{$login} = $pl;
1422 $f->resolve_delayed_derefs;
1308 $cf::PLAYER{$login} = $pl 1423 $cf::PLAYER{$login} = $pl
1309 } 1424 }
1310 } 1425 }
1311} 1426}
1312 1427
… …
1322 1437
1323 aio_mkdir playerdir $pl, 0770; 1438 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1439 $pl->{last_save} = $cf::RUNTIME;
1325 1440
1326 $pl->save_pl ($path); 1441 $pl->save_pl ($path);
1327 Coro::cede; 1442 cf::cede_to_tick;
1328} 1443}
1329 1444
1330sub new($) { 1445sub new($) {
1331 my ($login) = @_; 1446 my ($login) = @_;
1332 1447
… …
1410 or return []; 1525 or return [];
1411 1526
1412 my @logins; 1527 my @logins;
1413 1528
1414 for my $login (@$dirs) { 1529 for my $login (@$dirs) {
1530 my $path = path $login;
1531
1532 # a .pst is a dead give-away for a valid player
1533 unless (-e "$path.pst") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1534 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1535 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1536 $buf !~ /^password -------------$/m or next; # official not-valid tag
1537 }
1418 1538
1419 utf8::decode $login; 1539 utf8::decode $login;
1420 push @logins, $login; 1540 push @logins, $login;
1421 } 1541 }
1422 1542
… …
1455 1575
1456Expand crossfire pod fragments into protocol xml. 1576Expand crossfire pod fragments into protocol xml.
1457 1577
1458=cut 1578=cut
1459 1579
1580use re 'eval';
1581
1582my $group;
1583my $interior; $interior = qr{
1584 # match a pod interior sequence sans C<< >>
1585 (?:
1586 \ (.*?)\ (?{ $group = $^N })
1587 | < (??{$interior}) >
1588 )
1589}x;
1590
1460sub expand_cfpod { 1591sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1592 my ($self, $pod) = @_;
1462 1593
1463 # escape & and < 1594 my $xml;
1464 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g;
1466 1595
1467 # this is buggy, it needs to properly take care of nested <'s 1596 while () {
1597 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1598 $group = $1;
1468 1599
1469 1 while 1600 $group =~ s/&/&amp;/g;
1470 # replace B<>, I<>, U<> etc. 1601 $group =~ s/</&lt;/g;
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1602
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1603 $xml .= $group;
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1604 } elsif ($pod =~ m%\G
1474 # replace G<male|female> tags 1605 ([BCGHITU])
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1606 <
1476 $self->gender ? $2 : $1 1607 (?:
1477 }ge 1608 ([^<>]*) (?{ $group = $^N })
1478 # replace H<hint text> 1609 | < $interior >
1479 || s{H<([^\>]*)>} 1610 )
1611 >
1612 %gcsx
1480 { 1613 ) {
1614 my ($code, $data) = ($1, $group);
1615
1616 if ($code eq "B") {
1617 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1618 } elsif ($code eq "I") {
1619 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1620 } elsif ($code eq "U") {
1621 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1622 } elsif ($code eq "C") {
1623 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1624 } elsif ($code eq "T") {
1625 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1626 } elsif ($code eq "G") {
1627 my ($male, $female) = split /\|/, $data;
1628 $data = $self->gender ? $female : $male;
1629 $xml .= expand_cfpod ($self, $data);
1630 } elsif ($code eq "H") {
1481 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1631 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1482 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1632 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1483 "") 1633 "")
1484 [$self->{hintmode}] 1634 [$self->{hintmode}];
1635 } else {
1636 $xml .= "error processing '$code($data)' directive";
1485 }ge; 1637 }
1638 } else {
1639 if ($pod =~ /\G(.+)/) {
1640 warn "parse error while expanding $pod (at $1)";
1641 }
1642 last;
1643 }
1644 }
1486 1645
1646 for ($xml) {
1487 # create single paragraphs (very hackish) 1647 # create single paragraphs (very hackish)
1488 s/(?<=\S)\n(?=\w)/ /g; 1648 s/(?<=\S)\n(?=\w)/ /g;
1489 1649
1490 # compress some whitespace 1650 # compress some whitespace
1491 s/\s+\n/\n/g; # ws line-ends 1651 s/\s+\n/\n/g; # ws line-ends
1492 s/\n\n+/\n/g; # double lines 1652 s/\n\n+/\n/g; # double lines
1493 s/^\n+//; # beginning lines 1653 s/^\n+//; # beginning lines
1494 s/\n+$//; # ending lines 1654 s/\n+$//; # ending lines
1655 }
1495 1656
1496 $_ 1657 $xml
1497} 1658}
1659
1660no re 'eval';
1498 1661
1499sub hintmode { 1662sub hintmode {
1500 $_[0]{hintmode} = $_[1] if @_ > 1; 1663 $_[0]{hintmode} = $_[1] if @_ > 1;
1501 $_[0]{hintmode} 1664 $_[0]{hintmode}
1502} 1665}
… …
1746 1909
1747sub load_header_from($) { 1910sub load_header_from($) {
1748 my ($self, $path) = @_; 1911 my ($self, $path) = @_;
1749 1912
1750 utf8::encode $path; 1913 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1914 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 or return; 1915 or return;
1916
1917 $self->_load_header ($f)
1918 or return;
1919
1920 local $MAP_LOADING{$self->{path}} = $self;
1921 $f->resolve_delayed_derefs;
1756 1922
1757 $self->{load_path} = $path; 1923 $self->{load_path} = $path;
1758 1924
1759 1 1925 1
1760} 1926}
… …
1814sub find { 1980sub find {
1815 my ($path, $origin) = @_; 1981 my ($path, $origin) = @_;
1816 1982
1817 $path = normalise $path, $origin && $origin->path; 1983 $path = normalise $path, $origin && $origin->path;
1818 1984
1985 cf::lock_wait "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 1986 cf::lock_wait "map_find:$path";
1820 1987
1821 $cf::MAP{$path} || do { 1988 $cf::MAP{$path} || do {
1822 my $guard = cf::lock_acquire "map_find:$path"; 1989 my $guard1 = cf::lock_acquire "map_find:$path";
1990 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1991
1823 my $map = new_from_path cf::map $path 1992 my $map = new_from_path cf::map $path
1824 or return; 1993 or return;
1825 1994
1826 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
1827 1996
… …
1829 or return; 1998 or return;
1830 1999
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 2001 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 2002 #$cf::WAIT_FOR_TICK->wait;
2003 undef $guard1;
2004 undef $guard2;
1834 $map->reset; 2005 $map->reset;
1835 undef $guard;
1836 return find $path; 2006 return find $path;
1837 } 2007 }
1838 2008
1839 $cf::MAP{$path} = $map 2009 $cf::MAP{$path} = $map
1840 } 2010 }
… …
1849 local $self->{deny_reset} = 1; # loading can take a long time 2019 local $self->{deny_reset} = 1; # loading can take a long time
1850 2020
1851 my $path = $self->{path}; 2021 my $path = $self->{path};
1852 2022
1853 { 2023 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 2024 my $guard = cf::lock_acquire "map_data:$path";
1855 2025
2026 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 2027 return unless $self->in_memory == cf::MAP_SWAPPED;
1857 2028
1858 $self->in_memory (cf::MAP_LOADING); 2029 $self->in_memory (cf::MAP_LOADING);
1859 2030
1860 $self->alloc; 2031 $self->alloc;
1861 2032
1862 $self->pre_load; 2033 $self->pre_load;
1863 Coro::cede; 2034 cf::cede_to_tick;
1864 2035
2036 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block;
1865 $self->_load_objects ($self->{load_path}, 1) 2038 $self->_load_objects ($f)
1866 or return; 2039 or return;
1867 2040
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2041 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1869 if delete $self->{load_original}; 2042 if delete $self->{load_original};
1870 2043
1871 if (my $uniq = $self->uniq_path) { 2044 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 2045 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 2046 unless (aio_stat $uniq) {
2047 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 2048 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 2049 $self->_load_objects ($f);
2050 $f->resolve_delayed_derefs;
2051 }
1876 } 2052 }
1877 } 2053 }
1878 2054
1879 Coro::cede; 2055 $f->resolve_delayed_derefs;
2056
2057 cf::cede_to_tick;
1880 # now do the right thing for maps 2058 # now do the right thing for maps
1881 $self->link_multipart_objects; 2059 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 2060 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 2061 unless $self->difficulty;
1884 Coro::cede; 2062 cf::cede_to_tick;
1885 2063
1886 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 2065 $self->decay_objects;
1888 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
1889 $self->update_buttons; 2067 $self->update_buttons;
1890 Coro::cede; 2068 cf::cede_to_tick;
1891 $self->set_darkness_map; 2069 $self->set_darkness_map;
1892 Coro::cede; 2070 cf::cede_to_tick;
1893 $self->activate; 2071 $self->activate;
1894 } 2072 }
1895 2073
1896 $self->{last_save} = $cf::RUNTIME; 2074 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 2075 $self->last_access ($cf::RUNTIME);
… …
1948 2126
1949sub do_load_sync { 2127sub do_load_sync {
1950 my ($map) = @_; 2128 my ($map) = @_;
1951 2129
1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1953 if $Coro::current != $Coro::main; 2131 if $Coro::current == $Coro::main;
1954 2132
1955 cf::sync_job { $map->load }; 2133 cf::sync_job { $map->load };
1956} 2134}
1957 2135
1958our %MAP_PREFETCH; 2136our %MAP_PREFETCH;
… …
1962 my ($path, $origin, $load) = @_; 2140 my ($path, $origin, $load) = @_;
1963 2141
1964 $path = normalise $path, $origin && $origin->{path}; 2142 $path = normalise $path, $origin && $origin->{path};
1965 2143
1966 if (my $map = $cf::MAP{$path}) { 2144 if (my $map = $cf::MAP{$path}) {
1967 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2145 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1968 } 2146 }
1969 2147
1970 $MAP_PREFETCH{$path} |= $load; 2148 $MAP_PREFETCH{$path} |= $load;
1971 2149
1972 $MAP_PREFETCHER ||= cf::async { 2150 $MAP_PREFETCHER ||= cf::async {
2151 $Coro::current->{desc} = "map prefetcher";
2152
1973 while (%MAP_PREFETCH) { 2153 while (%MAP_PREFETCH) {
1974 while (my ($k, $v) = each %MAP_PREFETCH) { 2154 while (my ($k, $v) = each %MAP_PREFETCH) {
1975 if (my $map = find $k) { 2155 if (my $map = find $k) {
1976 $map->load if $v; 2156 $map->load if $v;
1977 } 2157 }
… …
1987} 2167}
1988 2168
1989sub save { 2169sub save {
1990 my ($self) = @_; 2170 my ($self) = @_;
1991 2171
1992 my $lock = cf::lock_acquire "map_data:" . $self->path; 2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
1993 2173
1994 $self->{last_save} = $cf::RUNTIME; 2174 $self->{last_save} = $cf::RUNTIME;
1995 2175
1996 return unless $self->dirty; 2176 return unless $self->dirty;
1997 2177
… …
2003 return if $self->{deny_save}; 2183 return if $self->{deny_save};
2004 2184
2005 local $self->{last_access} = $self->last_access;#d# 2185 local $self->{last_access} = $self->last_access;#d#
2006 2186
2007 cf::async { 2187 cf::async {
2188 $Coro::current->{desc} = "map player save";
2008 $_->contr->save for $self->players; 2189 $_->contr->save for $self->players;
2009 }; 2190 };
2010 2191
2011 if ($uniq) { 2192 if ($uniq) {
2012 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2020 my ($self) = @_; 2201 my ($self) = @_;
2021 2202
2022 # save first because save cedes 2203 # save first because save cedes
2023 $self->save; 2204 $self->save;
2024 2205
2025 my $lock = cf::lock_acquire "map_data:" . $self->path; 2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2026 2207
2027 return if $self->players; 2208 return if $self->players;
2028 return if $self->in_memory != cf::MAP_IN_MEMORY; 2209 return if $self->in_memory != cf::MAP_IN_MEMORY;
2029 return if $self->{deny_save}; 2210 return if $self->{deny_save};
2030 2211
2212 $self->in_memory (cf::MAP_SWAPPED);
2213
2214 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP;
2031 $self->clear; 2216 $self->clear;
2032 $self->in_memory (cf::MAP_SWAPPED);
2033} 2217}
2034 2218
2035sub reset_at { 2219sub reset_at {
2036 my ($self) = @_; 2220 my ($self) = @_;
2037 2221
… …
2069 if $uniq; 2253 if $uniq;
2070 } 2254 }
2071 2255
2072 delete $cf::MAP{$self->path}; 2256 delete $cf::MAP{$self->path};
2073 2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2074 $self->clear; 2260 $self->clear;
2075
2076 $_->clear_links_to ($self) for values %cf::MAP;
2077 2261
2078 $self->unlink_save; 2262 $self->unlink_save;
2079 $self->destroy; 2263 $self->destroy;
2080} 2264}
2081 2265
2082my $nuke_counter = "aaaa"; 2266my $nuke_counter = "aaaa";
2083 2267
2084sub nuke { 2268sub nuke {
2085 my ($self) = @_; 2269 my ($self) = @_;
2086 2270
2271 {
2272 my $lock = cf::lock_acquire "map_data:$self->{path}";
2273
2087 delete $cf::MAP{$self->path}; 2274 delete $cf::MAP{$self->path};
2088 2275
2089 $self->unlink_save; 2276 $self->unlink_save;
2090 2277
2091 bless $self, "cf::map"; 2278 bless $self, "cf::map";
2092 delete $self->{deny_reset}; 2279 delete $self->{deny_reset};
2093 $self->{deny_save} = 1; 2280 $self->{deny_save} = 1;
2094 $self->reset_timeout (1); 2281 $self->reset_timeout (1);
2095 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2096 2283
2097 $cf::MAP{$self->path} = $self; 2284 $cf::MAP{$self->path} = $self;
2285 }
2098 2286
2099 $self->reset; # polite request, might not happen 2287 $self->reset; # polite request, might not happen
2100} 2288}
2101 2289
2102=item $maps = cf::map::tmp_maps 2290=item $maps = cf::map::tmp_maps
… …
2178 2366
2179sub inv_recursive { 2367sub inv_recursive {
2180 inv_recursive_ inv $_[0] 2368 inv_recursive_ inv $_[0]
2181} 2369}
2182 2370
2371=item $ref = $ob->ref
2372
2373creates and returns a persistent reference to an objetc that can be stored as a string.
2374
2375=item $ob = cf::object::deref ($refstring)
2376
2377returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2378even if the object actually exists. May block.
2379
2380=cut
2381
2382sub deref {
2383 my ($ref) = @_;
2384
2385 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2386 my ($uuid, $name) = ($1, $2);
2387 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2388 or return;
2389 $pl->ob->uuid eq $uuid
2390 or return;
2391
2392 $pl->ob
2393 } else {
2394 warn "$ref: cannot resolve object reference\n";
2395 undef
2396 }
2397}
2398
2183package cf; 2399package cf;
2184 2400
2185=back 2401=back
2186 2402
2187=head3 cf::object::player 2403=head3 cf::object::player
… …
2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2346 2562
2347 $self->enter_link; 2563 $self->enter_link;
2348 2564
2349 (async { 2565 (async {
2566 $Coro::current->{desc} = "player::goto $path $x $y";
2567
2568 # *tag paths override both path and x|y
2569 if ($path =~ /^\*(.*)$/) {
2570 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2571 my $ob = $obs[rand @obs];
2572
2573 # see if we actually can go there
2574 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2575 $ob = $obs[rand @obs];
2576 } else {
2577 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2578 }
2579 # else put us there anyways for now #d#
2580
2581 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2582 } else {
2583 ($path, $x, $y) = (undef, undef, undef);
2584 }
2585 }
2586
2350 my $map = eval { 2587 my $map = eval {
2351 my $map = cf::map::find $path; 2588 my $map = defined $path ? cf::map::find $path : undef;
2352 2589
2353 if ($map) { 2590 if ($map) {
2354 $map = $map->customise_for ($self); 2591 $map = $map->customise_for ($self);
2355 $map = $check->($map) if $check && $map; 2592 $map = $check->($map) if $check && $map;
2356 } else { 2593 } else {
2357 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2594 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2358 } 2595 }
2359 2596
2360 $map 2597 $map
2361 }; 2598 };
2362 2599
… …
2415 $rmp->{origin_y} = $exit->y; 2652 $rmp->{origin_y} = $exit->y;
2416 } 2653 }
2417 2654
2418 $rmp->{random_seed} ||= $exit->random_seed; 2655 $rmp->{random_seed} ||= $exit->random_seed;
2419 2656
2420 my $data = cf::to_json $rmp; 2657 my $data = cf::encode_json $rmp;
2421 my $md5 = Digest::MD5::md5_hex $data; 2658 my $md5 = Digest::MD5::md5_hex $data;
2422 my $meta = "$RANDOMDIR/$md5.meta"; 2659 my $meta = "$RANDOMDIR/$md5.meta";
2423 2660
2424 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2425 aio_write $fh, 0, (length $data), $data, 0; 2662 aio_write $fh, 0, (length $data), $data, 0;
… …
2452 # if exit is damned, update players death & WoR home-position 2689 # if exit is damned, update players death & WoR home-position
2453 $self->contr->savebed ($slaying, $hp, $sp) 2690 $self->contr->savebed ($slaying, $hp, $sp)
2454 if $exit->flag (FLAG_DAMNED); 2691 if $exit->flag (FLAG_DAMNED);
2455 2692
2456 (async { 2693 (async {
2694 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2695
2457 $self->deactivate_recursive; # just to be sure 2696 $self->deactivate_recursive; # just to be sure
2458 unless (eval { 2697 unless (eval {
2459 $self->goto ($slaying, $hp, $sp); 2698 $self->goto ($slaying, $hp, $sp);
2460 2699
2461 1; 2700 1;
… …
2496the message, with C<log> being the default. If C<$color> is negative, suppress 2735the message, with C<log> being the default. If C<$color> is negative, suppress
2497the message unless the client supports the msg packet. 2736the message unless the client supports the msg packet.
2498 2737
2499=cut 2738=cut
2500 2739
2740# non-persistent channels (usually the info channel)
2741our %CHANNEL = (
2742 "c/identify" => {
2743 id => "infobox",
2744 title => "Identify",
2745 reply => undef,
2746 tooltip => "Items recently identified",
2747 },
2748 "c/examine" => {
2749 id => "infobox",
2750 title => "Examine",
2751 reply => undef,
2752 tooltip => "Signs and other items you examined",
2753 },
2754 "c/book" => {
2755 id => "infobox",
2756 title => "Book",
2757 reply => undef,
2758 tooltip => "The contents of a note or book",
2759 },
2760 "c/lookat" => {
2761 id => "infobox",
2762 title => "Look",
2763 reply => undef,
2764 tooltip => "What you saw there",
2765 },
2766 "c/who" => {
2767 id => "infobox",
2768 title => "Players",
2769 reply => undef,
2770 tooltip => "Shows players who are currently online",
2771 },
2772 "c/body" => {
2773 id => "infobox",
2774 title => "Body Parts",
2775 reply => undef,
2776 tooltip => "Shows which body parts you posess and are available",
2777 },
2778 "c/uptime" => {
2779 id => "infobox",
2780 title => "Uptime",
2781 reply => undef,
2782 tooltip => "How long the server has been running since last restart",
2783 },
2784 "c/mapinfo" => {
2785 id => "infobox",
2786 title => "Map Info",
2787 reply => undef,
2788 tooltip => "Information related to the maps",
2789 },
2790);
2791
2501sub cf::client::send_msg { 2792sub cf::client::send_msg {
2502 my ($self, $channel, $msg, $color, @extra) = @_; 2793 my ($self, $channel, $msg, $color, @extra) = @_;
2503 2794
2504 $msg = $self->pl->expand_cfpod ($msg); 2795 $msg = $self->pl->expand_cfpod ($msg);
2505 2796
2506 $color &= cf::NDI_CLIENT_MASK; # just in case... 2797 $color &= cf::NDI_CLIENT_MASK; # just in case...
2507 2798
2799 # check predefined channels, for the benefit of C
2800 if ($CHANNEL{$channel}) {
2801 $channel = $CHANNEL{$channel};
2802
2803 $self->ext_msg (channel_info => $channel)
2804 if $self->can_msg;
2805
2806 $channel = $channel->{id};
2807
2508 if (ref $channel) { 2808 } elsif (ref $channel) {
2509 # send meta info to client, if not yet sent 2809 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) { 2810 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel; 2811 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel); 2812 $self->ext_msg (channel_info => $channel)
2813 if $self->can_msg;
2513 } 2814 }
2514 2815
2515 $channel = $channel->{id}; 2816 $channel = $channel->{id};
2516 } 2817 }
2517 2818
… …
2558=cut 2859=cut
2559 2860
2560sub cf::client::ext_msg($$@) { 2861sub cf::client::ext_msg($$@) {
2561 my ($self, $type, @msg) = @_; 2862 my ($self, $type, @msg) = @_;
2562 2863
2563 my $extcmd = $self->extcmd;
2564
2565 if ($extcmd == 2) { 2864 if ($self->extcmd == 2) {
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2865 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2567 } elsif ($extcmd == 1) { # TODO: remove 2866 } elsif ($self->extcmd == 1) { # TODO: remove
2568 push @msg, msgtype => "event_$type"; 2867 push @msg, msgtype => "event_$type";
2569 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2868 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2570 } 2869 }
2571} 2870}
2572 2871
… …
2579sub cf::client::ext_reply($$@) { 2878sub cf::client::ext_reply($$@) {
2580 my ($self, $id, @msg) = @_; 2879 my ($self, $id, @msg) = @_;
2581 2880
2582 if ($self->extcmd == 2) { 2881 if ($self->extcmd == 2) {
2583 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2882 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2584 } elsif ($self->ns->extcmd == 1) { 2883 } elsif ($self->extcmd == 1) {
2585 #TODO: version 1, remove 2884 #TODO: version 1, remove
2586 unshift @msg, msgtype => "reply", msgid => $id; 2885 unshift @msg, msgtype => "reply", msgid => $id;
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2886 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 } 2887 }
2589} 2888}
… …
2731=pod 3030=pod
2732 3031
2733The following functions and methods are available within a safe environment: 3032The following functions and methods are available within a safe environment:
2734 3033
2735 cf::object 3034 cf::object
2736 contr pay_amount pay_player map x y force_find force_add 3035 contr pay_amount pay_player map x y force_find force_add destroy
2737 insert remove name archname title slaying race 3036 insert remove name archname title slaying race decrease_ob_nr
2738 3037
2739 cf::object::player 3038 cf::object::player
2740 player 3039 player
2741 3040
2742 cf::player 3041 cf::player
… …
2747 3046
2748=cut 3047=cut
2749 3048
2750for ( 3049for (
2751 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3050 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2752 insert remove inv name archname title slaying race)], 3051 insert remove inv name archname title slaying race
3052 decrease_ob_nr destroy)],
2753 ["cf::object::player" => qw(player)], 3053 ["cf::object::player" => qw(player)],
2754 ["cf::player" => qw(peaceful)], 3054 ["cf::player" => qw(peaceful)],
2755 ["cf::map" => qw(trigger)], 3055 ["cf::map" => qw(trigger)],
2756) { 3056) {
2757 no strict 'refs'; 3057 no strict 'refs';
… …
2833# the server's init and main functions 3133# the server's init and main functions
2834 3134
2835sub load_facedata($) { 3135sub load_facedata($) {
2836 my ($path) = @_; 3136 my ($path) = @_;
2837 3137
3138 # HACK to clear player env face cache, we need some signal framework
3139 # for this (global event?)
3140 %ext::player_env::MUSIC_FACE_CACHE = ();
3141
2838 my $enc = JSON::XS->new->utf8->canonical; 3142 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839 3143
2840 warn "loading facedata from $path\n"; 3144 warn "loading facedata from $path\n";
2841 3145
2842 my $facedata; 3146 my $facedata;
2843 0 < aio_load $path, $facedata 3147 0 < aio_load $path, $facedata
… …
2858 { 3162 {
2859 my $faces = $facedata->{faceinfo}; 3163 my $faces = $facedata->{faceinfo};
2860 3164
2861 while (my ($face, $info) = each %$faces) { 3165 while (my ($face, $info) = each %$faces) {
2862 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3166 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3167
2863 cf::face::set_visibility $idx, $info->{visibility}; 3168 cf::face::set_visibility $idx, $info->{visibility};
2864 cf::face::set_magicmap $idx, $info->{magicmap}; 3169 cf::face::set_magicmap $idx, $info->{magicmap};
2865 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3170 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2866 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3171 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2867 3172
2868 cf::cede_to_tick; 3173 cf::cede_to_tick;
2869 } 3174 }
2870 3175
2871 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2872 next unless $info->{smooth}; 3177 next unless $info->{smooth};
3178
2873 my $idx = cf::face::find $face 3179 my $idx = cf::face::find $face
2874 or next; 3180 or next;
3181
2875 if (my $smooth = cf::face::find $info->{smooth}) { 3182 if (my $smooth = cf::face::find $info->{smooth}) {
2876 cf::face::set_smooth $idx, $smooth; 3183 cf::face::set_smooth $idx, $smooth;
2877 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3184 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2878 } else { 3185 } else {
2879 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3186 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2897 { 3204 {
2898 # TODO: for gcfclient pleasure, we should give resources 3205 # TODO: for gcfclient pleasure, we should give resources
2899 # that gcfclient doesn't grok a >10000 face index. 3206 # that gcfclient doesn't grok a >10000 face index.
2900 my $res = $facedata->{resource}; 3207 my $res = $facedata->{resource};
2901 3208
2902 my $soundconf = delete $res->{"res/sound.conf"};
2903
2904 while (my ($name, $info) = each %$res) { 3209 while (my ($name, $info) = each %$res) {
3210 if (defined $info->{type}) {
2905 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3211 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2906 my $data; 3212 my $data;
2907 3213
2908 if ($info->{type} & 1) { 3214 if ($info->{type} & 1) {
2909 # prepend meta info 3215 # prepend meta info
2910 3216
2911 my $meta = $enc->encode ({ 3217 my $meta = $enc->encode ({
2912 name => $name, 3218 name => $name,
2913 %{ $info->{meta} || {} }, 3219 %{ $info->{meta} || {} },
2914 }); 3220 });
2915 3221
2916 $data = pack "(w/a*)*", $meta, $info->{data}; 3222 $data = pack "(w/a*)*", $meta, $info->{data};
3223 } else {
3224 $data = $info->{data};
3225 }
3226
3227 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3228 cf::face::set_type $idx, $info->{type};
2917 } else { 3229 } else {
2918 $data = $info->{data}; 3230 $RESOURCE{$name} = $info;
2919 } 3231 }
2920 3232
2921 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2922 cf::face::set_type $idx, $info->{type};
2923
2924 cf::cede_to_tick; 3233 cf::cede_to_tick;
2925 } 3234 }
2926
2927 if ($soundconf) {
2928 $soundconf = $enc->decode (delete $soundconf->{data});
2929
2930 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2931 my $sound = $soundconf->{compat}[$_]
2932 or next;
2933
2934 my $face = cf::face::find "sound/$sound->[1]";
2935 cf::sound::set $sound->[0] => $face;
2936 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2937 }
2938
2939 while (my ($k, $v) = each %{$soundconf->{event}}) {
2940 my $face = cf::face::find "sound/$v";
2941 cf::sound::set $k => $face;
2942 }
2943 }
2944 } 3235 }
3236
3237 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2945 3238
2946 1 3239 1
2947} 3240}
3241
3242cf::global->attach (on_resource_update => sub {
3243 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3244 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3245
3246 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3247 my $sound = $soundconf->{compat}[$_]
3248 or next;
3249
3250 my $face = cf::face::find "sound/$sound->[1]";
3251 cf::sound::set $sound->[0] => $face;
3252 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3253 }
3254
3255 while (my ($k, $v) = each %{$soundconf->{event}}) {
3256 my $face = cf::face::find "sound/$v";
3257 cf::sound::set $k => $face;
3258 }
3259 }
3260});
2948 3261
2949register_exticmd fx_want => sub { 3262register_exticmd fx_want => sub {
2950 my ($ns, $want) = @_; 3263 my ($ns, $want) = @_;
2951 3264
2952 while (my ($k, $v) = each %$want) { 3265 while (my ($k, $v) = each %$want) {
2953 $ns->fx_want ($k, $v); 3266 $ns->fx_want ($k, $v);
2954 } 3267 }
2955}; 3268};
2956 3269
2957sub reload_regions { 3270sub reload_regions {
3271 # HACK to clear player env face cache, we need some signal framework
3272 # for this (global event?)
3273 %ext::player_env::MUSIC_FACE_CACHE = ();
3274
2958 load_resource_file "$MAPDIR/regions" 3275 load_resource_file "$MAPDIR/regions"
2959 or die "unable to load regions file\n"; 3276 or die "unable to load regions file\n";
2960 3277
2961 for (cf::region::list) { 3278 for (cf::region::list) {
2962 $_->{match} = qr/$_->{match}/ 3279 $_->{match} = qr/$_->{match}/
… …
2998 3315
2999sub init { 3316sub init {
3000 reload_resources; 3317 reload_resources;
3001} 3318}
3002 3319
3003sub cfg_load { 3320sub reload_config {
3004 open my $fh, "<:utf8", "$CONFDIR/config" 3321 open my $fh, "<:utf8", "$CONFDIR/config"
3005 or return; 3322 or return;
3006 3323
3007 local $/; 3324 local $/;
3008 *CFG = YAML::Syck::Load <$fh>; 3325 *CFG = YAML::Load <$fh>;
3009 3326
3010 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3327 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3011 3328
3012 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3329 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3013 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3330 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3024sub main { 3341sub main {
3025 # we must not ever block the main coroutine 3342 # we must not ever block the main coroutine
3026 local $Coro::idle = sub { 3343 local $Coro::idle = sub {
3027 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3344 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3028 (async { 3345 (async {
3029 Event::one_event; 3346 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT;
3030 })->prio (Coro::PRIO_MAX); 3348 })->prio (Coro::PRIO_MAX);
3031 }; 3349 };
3032 3350
3033 cfg_load; 3351 reload_config;
3034 db_init; 3352 db_init;
3035 load_extensions; 3353 load_extensions;
3036 3354
3037 $TICK_WATCHER->start; 3355 $TICK_WATCHER->start;
3356 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3038 Event::loop; 3357 EV::loop;
3039} 3358}
3040 3359
3041############################################################################# 3360#############################################################################
3042# initialisation and cleanup 3361# initialisation and cleanup
3043 3362
3044# install some emergency cleanup handlers 3363# install some emergency cleanup handlers
3045BEGIN { 3364BEGIN {
3365 our %SIGWATCHER = ();
3046 for my $signal (qw(INT HUP TERM)) { 3366 for my $signal (qw(INT HUP TERM)) {
3047 Event->signal ( 3367 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3048 reentrant => 0,
3049 data => WF_AUTOCANCEL,
3050 signal => $signal,
3051 prio => 0,
3052 cb => sub {
3053 cf::cleanup "SIG$signal"; 3368 cf::cleanup "SIG$signal";
3054 },
3055 ); 3369 };
3056 } 3370 }
3057} 3371}
3058 3372
3059sub write_runtime { 3373sub write_runtime {
3060 my $runtime = "$LOCALDIR/runtime"; 3374 my $runtime = "$LOCALDIR/runtime";
… …
3105 # and maps saved/destroyed asynchronously. 3419 # and maps saved/destroyed asynchronously.
3106 warn "begin emergency player save\n"; 3420 warn "begin emergency player save\n";
3107 for my $login (keys %cf::PLAYER) { 3421 for my $login (keys %cf::PLAYER) {
3108 my $pl = $cf::PLAYER{$login} or next; 3422 my $pl = $cf::PLAYER{$login} or next;
3109 $pl->valid or next; 3423 $pl->valid or next;
3424 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3110 $pl->save; 3425 $pl->save;
3111 } 3426 }
3112 warn "end emergency player save\n"; 3427 warn "end emergency player save\n";
3113 3428
3114 warn "begin emergency map save\n"; 3429 warn "begin emergency map save\n";
… …
3153 warn "syncing database to disk"; 3468 warn "syncing database to disk";
3154 BDB::db_env_txn_checkpoint $DB_ENV; 3469 BDB::db_env_txn_checkpoint $DB_ENV;
3155 3470
3156 # if anything goes wrong in here, we should simply crash as we already saved 3471 # if anything goes wrong in here, we should simply crash as we already saved
3157 3472
3158 warn "cancelling all WF_AUTOCANCEL watchers";
3159 for (Event::all_watchers) {
3160 $_->cancel if $_->data & WF_AUTOCANCEL;
3161 }
3162
3163 warn "flushing outstanding aio requests"; 3473 warn "flushing outstanding aio requests";
3164 for (;;) { 3474 for (;;) {
3165 BDB::flush; 3475 BDB::flush;
3166 IO::AIO::flush; 3476 IO::AIO::flush;
3167 Coro::cede; 3477 Coro::cede_notself;
3168 last unless IO::AIO::nreqs || BDB::nreqs; 3478 last unless IO::AIO::nreqs || BDB::nreqs;
3169 warn "iterate..."; 3479 warn "iterate...";
3170 } 3480 }
3171 3481
3172 ++$RELOAD; 3482 ++$RELOAD;
… …
3231 warn "reloading cf.pm"; 3541 warn "reloading cf.pm";
3232 require cf; 3542 require cf;
3233 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3543 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3234 3544
3235 warn "loading config and database again"; 3545 warn "loading config and database again";
3236 cf::cfg_load; 3546 cf::reload_config;
3237 3547
3238 warn "loading extensions"; 3548 warn "loading extensions";
3239 cf::load_extensions; 3549 cf::load_extensions;
3240 3550
3241 warn "reattaching attachments to objects/players"; 3551 warn "reattaching attachments to objects/players";
… …
3261 3571
3262sub reload_perl() { 3572sub reload_perl() {
3263 # doing reload synchronously and two reloads happen back-to-back, 3573 # doing reload synchronously and two reloads happen back-to-back,
3264 # coro crashes during coro_state_free->destroy here. 3574 # coro crashes during coro_state_free->destroy here.
3265 3575
3266 $RELOAD_WATCHER ||= Event->timer ( 3576 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3267 reentrant => 0,
3268 after => 0,
3269 data => WF_AUTOCANCEL,
3270 cb => sub {
3271 do_reload_perl; 3577 do_reload_perl;
3272 undef $RELOAD_WATCHER; 3578 undef $RELOAD_WATCHER;
3273 },
3274 ); 3579 };
3275} 3580}
3276 3581
3277register_command "reload" => sub { 3582register_command "reload" => sub {
3278 my ($who, $arg) = @_; 3583 my ($who, $arg) = @_;
3279 3584
3280 if ($who->flag (FLAG_WIZ)) { 3585 if ($who->flag (FLAG_WIZ)) {
3281 $who->message ("reloading server."); 3586 $who->message ("reloading server.");
3587 async {
3588 $Coro::current->{desc} = "perl_reload";
3282 async { reload_perl }; 3589 reload_perl;
3590 };
3283 } 3591 }
3284}; 3592};
3285 3593
3286unshift @INC, $LIBDIR; 3594unshift @INC, $LIBDIR;
3287 3595
… …
3306 my $signal = new Coro::Signal; 3614 my $signal = new Coro::Signal;
3307 push @WAIT_FOR_TICK_BEGIN, $signal; 3615 push @WAIT_FOR_TICK_BEGIN, $signal;
3308 $signal->wait; 3616 $signal->wait;
3309} 3617}
3310 3618
3311 my $min = 1e6;#d# 3619$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3312 my $avg = 10;
3313$TICK_WATCHER = Event->timer (
3314 reentrant => 0,
3315 parked => 1,
3316 prio => 0,
3317 at => $NEXT_TICK || $TICK,
3318 data => WF_AUTOCANCEL,
3319 cb => sub {
3320 if ($Coro::current != $Coro::main) { 3620 if ($Coro::current != $Coro::main) {
3321 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3621 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3322 unless ++$bug_warning > 10; 3622 unless ++$bug_warning > 10;
3323 return; 3623 return;
3324 } 3624 }
3325 3625
3326 $NOW = $tick_start = Event::time; 3626 $NOW = $tick_start = EV::now;
3327 3627
3328 cf::server_tick; # one server iteration 3628 cf::server_tick; # one server iteration
3329 3629
3330 0 && sync_job {#d# 3630 $RUNTIME += $TICK;
3331 for(1..10) { 3631 $NEXT_TICK = $_[0]->at;
3332 my $t = Event::time;
3333 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3334 or die;
3335 3632
3336 $map->width (50); 3633 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3337 $map->height (50); 3634 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3338 $map->alloc; 3635 Coro::async_pool {
3339 $map->_load_objects ("/tmp/x.map", 1); 3636 $Coro::current->{desc} = "runtime saver";
3340 my $t = Event::time - $t; 3637 write_runtime
3341 3638 or warn "ERROR: unable to write runtime file: $!";
3342 #next unless $t < 0.0013;#d#
3343 if ($t < $min) {
3344 $min = $t;
3345 }
3346 $avg = $avg * 0.99 + $t * 0.01;
3347 }
3348 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3349 exit 0;
3350 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3351 }; 3639 };
3640 }
3352 3641
3353 $RUNTIME += $TICK;
3354 $NEXT_TICK += $TICK;
3355
3356 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3357 $NEXT_RUNTIME_WRITE = $NOW + 10;
3358 Coro::async_pool {
3359 write_runtime
3360 or warn "ERROR: unable to write runtime file: $!";
3361 };
3362 }
3363
3364# my $AFTER = Event::time;
3365# warn $AFTER - $NOW;#d#
3366
3367 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3368 $sig->send; 3643 $sig->send;
3369 } 3644 }
3370 while (my $sig = shift @WAIT_FOR_TICK) { 3645 while (my $sig = shift @WAIT_FOR_TICK) {
3371 $sig->send; 3646 $sig->send;
3372 } 3647 }
3373 3648
3374 $NOW = Event::time;
3375
3376 # if we are delayed by four ticks or more, skip them all
3377 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3378
3379 $TICK_WATCHER->at ($NEXT_TICK);
3380 $TICK_WATCHER->start;
3381
3382 $LOAD = ($NOW - $tick_start) / $TICK; 3649 $LOAD = ($NOW - $tick_start) / $TICK;
3383 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3384 3651
3385 _post_tick; 3652 _post_tick;
3386 3653};
3387 3654$TICK_WATCHER->priority (EV::MAXPRI);
3388 },
3389);
3390 3655
3391{ 3656{
3392 BDB::max_poll_time $TICK * 0.1; 3657 # configure BDB
3393 $BDB_POLL_WATCHER = Event->io ( 3658
3394 reentrant => 0,
3395 fd => BDB::poll_fileno,
3396 poll => 'r',
3397 prio => 0,
3398 data => WF_AUTOCANCEL,
3399 cb => \&BDB::poll_cb,
3400 );
3401 BDB::min_parallel 8; 3659 BDB::min_parallel 8;
3402 3660 BDB::max_poll_reqs $TICK * 0.1;
3403 BDB::set_sync_prepare { 3661 $Coro::BDB::WATCHER->priority (1);
3404 my $status;
3405 my $current = $Coro::current;
3406 (
3407 sub {
3408 $status = $!;
3409 $current->ready; undef $current;
3410 },
3411 sub {
3412 Coro::schedule while defined $current;
3413 $! = $status;
3414 },
3415 )
3416 };
3417 3662
3418 unless ($DB_ENV) { 3663 unless ($DB_ENV) {
3419 $DB_ENV = BDB::db_env_create; 3664 $DB_ENV = BDB::db_env_create;
3665 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3666 | BDB::LOG_AUTOREMOVE, 1);
3667 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3668 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3420 3669
3421 cf::sync_job { 3670 cf::sync_job {
3422 eval { 3671 eval {
3423 BDB::db_env_open 3672 BDB::db_env_open
3424 $DB_ENV, 3673 $DB_ENV,
… …
3426 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3675 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3427 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3676 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3428 0666; 3677 0666;
3429 3678
3430 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3679 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3431
3432 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3433 $DB_ENV->set_lk_detect;
3434 }; 3680 };
3435 3681
3436 cf::cleanup "db_env_open(db): $@" if $@; 3682 cf::cleanup "db_env_open(db): $@" if $@;
3437 }; 3683 };
3438 } 3684 }
3685
3686 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3687 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3688 };
3689 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3690 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3691 };
3692 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3693 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3694 };
3439} 3695}
3440 3696
3441{ 3697{
3698 # configure IO::AIO
3699
3442 IO::AIO::min_parallel 8; 3700 IO::AIO::min_parallel 8;
3443
3444 undef $Coro::AIO::WATCHER;
3445 IO::AIO::max_poll_time $TICK * 0.1; 3701 IO::AIO::max_poll_time $TICK * 0.1;
3446 $AIO_POLL_WATCHER = Event->io ( 3702 $Coro::AIO::WATCHER->priority (1);
3447 reentrant => 0,
3448 data => WF_AUTOCANCEL,
3449 fd => IO::AIO::poll_fileno,
3450 poll => 'r',
3451 prio => 6,
3452 cb => \&IO::AIO::poll_cb,
3453 );
3454} 3703}
3455 3704
3456my $_log_backtrace; 3705my $_log_backtrace;
3457 3706
3458sub _log_backtrace { 3707sub _log_backtrace {
… …
3462 3711
3463 # limit the # of concurrent backtraces 3712 # limit the # of concurrent backtraces
3464 if ($_log_backtrace < 2) { 3713 if ($_log_backtrace < 2) {
3465 ++$_log_backtrace; 3714 ++$_log_backtrace;
3466 async { 3715 async {
3716 $Coro::current->{desc} = "abt $msg";
3717
3467 my @bt = fork_call { 3718 my @bt = fork_call {
3468 @addr = map { sprintf "%x", $_ } @addr; 3719 @addr = map { sprintf "%x", $_ } @addr;
3469 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3720 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3470 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3721 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3471 or die "addr2line: $!"; 3722 or die "addr2line: $!";

Diff Legend

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