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.341 by elmex, Sat Aug 25 16:51:38 2007 UTC vs.
Revision 1.394 by root, Thu Nov 8 19:43:25 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use 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.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
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::Storable; 23use Coro::Storable;
24use Coro::Util (); 24use Coro::Util ();
25 25
26use JSON::XS 1.4 (); 26use JSON::XS ();
27use BDB (); 27use BDB ();
28use Data::Dumper; 28use Data::Dumper;
29use Digest::MD5; 29use Digest::MD5;
30use Fcntl; 30use Fcntl;
31use YAML::Syck (); 31use YAML::Syck ();
32use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
33use Time::HiRes; 33use Time::HiRes;
34use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 (); 35use Digest::MD5 ();
36 36
37# configure various modules to our taste 37# configure various modules to our taste
… …
80our $NEXT_TICK; 80our $NEXT_TICK;
81our $NOW; 81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
83 83
84our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 88our $DB_ENV;
86 89
87our %CFG; 90our %CFG;
88 91
89our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 93our $RUNTIME;
91 94
92our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
95 98
96# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 101
… …
187 $msg .= "\n" 190 $msg .= "\n"
188 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
189 192
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 194
192 utf8::encode $msg;
193 LOG llevError, $msg; 195 LOG llevError, $msg;
194 }; 196 };
195} 197}
196 198
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
272Wait until the given lock is available and then acquires it and returns 274Wait 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, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
275returned. 277returned.
276 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
277Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
279 284
280=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
281 286
282Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
283 288
284=cut 289=cut
285 290
286our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
287 293
288sub lock_wait($) { 294sub lock_wait($) {
289 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
290 301
291 # wait for lock, if any 302 # wait for lock, if any
292 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 305 Coro::schedule;
… …
300 311
301 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
302 lock_wait $key; 313 lock_wait $key;
303 314
304 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
305 317
306 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
309 } 322 }
310} 323}
311 324
… …
341our @SLOT_QUEUE; 354our @SLOT_QUEUE;
342our $SLOT_QUEUE; 355our $SLOT_QUEUE;
343 356
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
346 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
347 362
348 while () { 363 while () {
349 next_job: 364 next_job:
350 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
358 } 373 }
359 } 374 }
360 } 375 }
361 376
362 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive 378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 380 $signal->wait;
366 } else { 381 } else {
367 Coro::schedule; 382 Coro::schedule;
368 } 383 }
… …
391 406
392BEGIN { *async = \&Coro::async_pool } 407BEGIN { *async = \&Coro::async_pool }
393 408
394=item cf::sync_job { BLOCK } 409=item cf::sync_job { BLOCK }
395 410
396The design of Crossfire TRT requires that the main coroutine ($Coro::main) 411The design of Deliantra requires that the main coroutine ($Coro::main)
397is always able to handle events or runnable, as Crossfire TRT is only 412is 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 413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable. 414acceptable.
400 415
401If it must be done, put the blocking parts into C<sync_job>. This will run 416If 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 417the given BLOCK in another coroutine while waiting for the result. The
… …
412 my $time = Event::time; 427 my $time = Event::time;
413 428
414 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
416 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
417 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
418 # (but this is cancel-safe) 435 # (but this is cancel-safe)
419 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
420 437
421 my $busy = 1; 438 my $busy = 1;
422 my @res; 439 my @res;
423 440
424 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 443 @res = eval { $job->() };
426 warn $@ if $@; 444 warn $@ if $@;
427 undef $busy; 445 undef $busy;
428 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
429 447
430 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
431 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
432 } 454 }
433 455
434 $time = Event::time - $time; 456 $time = Event::time - $time;
435 457
436 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
… …
478sub fork_call(&@) { 500sub fork_call(&@) {
479 my ($cb, @args) = @_; 501 my ($cb, @args) = @_;
480 502
481 # we seemingly have to make a local copy of the whole thing, 503 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 504 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 505 # TODO: investigate and fix (likely this will be rather laborious)
484 506
485 my @res = Coro::Util::fork_eval { 507 my @res = Coro::Util::fork_eval {
486 reset_signals; 508 reset_signals;
487 &$cb 509 &$cb
488 }, @args; 510 }, @args;
… …
497=item cf::db_put $family => $key => $value 519=item cf::db_put $family => $key => $value
498 520
499Stores the given C<$value> in the family. It can currently store binary 521Stores 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). 522data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 523
524=item $db = cf::db_table "name"
525
526Create and/or open a new database table. The string must not be "db" and must be unique
527within each server.
528
502=cut 529=cut
530
531sub db_table($) {
532 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV;
534
535 eval {
536 $db->set_flags (BDB::CHKSUM);
537
538 utf8::encode $name;
539 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
540 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
541 cf::cleanup "db_open(db): $!" if $!;
542 };
543 cf::cleanup "db_open(db): $@" if $@;
544
545 $db
546}
503 547
504our $DB; 548our $DB;
505 549
506sub db_init { 550sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 551 cf::sync_job {
511 eval { 552 $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 } 553 };
521} 554}
522 555
523sub db_get($$) { 556sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 557 my $key = "$_[0]/$_[1]";
525 558
… …
575 if (1) { 608 if (1) {
576 $md5 = 609 $md5 =
577 join "\x00", 610 join "\x00",
578 $processversion, 611 $processversion,
579 map { 612 map {
580 Coro::cede; 613 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 614 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 615 } 0.. $#$src;
583 616
584 617
585 my $dbmd5 = db_get cache => "$id/md5"; 618 my $dbmd5 = db_get cache => "$id/md5";
… …
629attach callbacks/event handlers (a collection of which is called an "attachment") 662attach callbacks/event handlers (a collection of which is called an "attachment")
630to it. All such attachable objects support the following methods. 663to it. All such attachable objects support the following methods.
631 664
632In the following description, CLASS can be any of C<global>, C<object> 665In 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 666C<player>, C<client> or C<map> (i.e. the attachable objects in
634Crossfire TRT). 667Deliantra).
635 668
636=over 4 669=over 4
637 670
638=item $attachable->attach ($attachment, key => $value...) 671=item $attachable->attach ($attachment, key => $value...)
639 672
… …
937 970
938=cut 971=cut
939 972
940############################################################################# 973#############################################################################
941# object support 974# object support
942#
943 975
976sub _object_equal($$);
977sub _object_equal($$) {
978 my ($a, $b) = @_;
979
980 return 0 unless (ref $a) eq (ref $b);
981
982 if ("HASH" eq ref $a) {
983 my @ka = keys %$a;
984 my @kb = keys %$b;
985
986 return 0 if @ka != @kb;
987
988 for (0 .. $#ka) {
989 return 0 unless $ka[$_] eq $kb[$_];
990 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
991 }
992
993 } elsif ("ARRAY" eq ref $a) {
994
995 return 0 if @$a != @$b;
996
997 for (0 .. $#$a) {
998 return 0 unless _object_equal $a->[$_], $b->[$_];
999 }
1000
1001 } elsif ($a ne $b) {
1002 return 0;
1003 }
1004
1005 1
1006}
1007
1008our $SLOW_MERGES;#d#
944sub _can_merge { 1009sub _can_merge {
945 my ($ob1, $ob2) = @_; 1010 my ($ob1, $ob2) = @_;
946 1011
947 local $Storable::canonical = 1; 1012 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1013
951 $fob1 eq $fob2 1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
952} 1016}
953 1017
954sub reattach { 1018sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1020 my ($obj) = @_;
… …
1004sub object_freezer_save { 1068sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
1006 1070
1007 sync_job { 1071 sync_job {
1008 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
1011 1076
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
1016 close $fh; 1081 close $fh;
1017 1082
1018 if (@$objs) { 1083 if (@$objs) {
1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1024 close $fh; 1089 close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1091 }
… …
1034 } 1099 }
1035 } else { 1100 } else {
1036 aio_unlink $filename; 1101 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1038 } 1103 }
1039 } 1104 };
1040} 1105}
1041 1106
1042sub object_freezer_as_string { 1107sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1044 1109
… …
1056 or return; 1121 or return;
1057 1122
1058 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1125 or return;
1126
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1062 } 1129 }
1063 1130
1131 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
1134
1066 return ($data, $av); 1135 ($data, $av)
1067} 1136}
1068 1137
1069=head2 COMMAND CALLBACKS 1138=head2 COMMAND CALLBACKS
1070 1139
1071=over 4 1140=over 4
… …
1257 1326
1258=head3 cf::player 1327=head3 cf::player
1259 1328
1260=over 4 1329=over 4
1261 1330
1331=item cf::player::num_playing
1332
1333Returns the official number of playing players, as per the Crossfire metaserver rules.
1334
1335=cut
1336
1337sub num_playing {
1338 scalar grep
1339 $_->ob->map
1340 && !$_->hidden
1341 && !$_->ob->flag (cf::FLAG_WIZ),
1342 cf::player::list
1343}
1344
1262=item cf::player::find $login 1345=item cf::player::find $login
1263 1346
1264Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1265 1348
1266=cut 1349=cut
… …
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1388
1306 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
1307 or return; 1390 or return;
1391
1392 my $pl = cf::player::load_pl $f
1393 or return;
1394 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs;
1308 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
1309 } 1397 }
1310 } 1398 }
1311} 1399}
1312 1400
… …
1322 1410
1323 aio_mkdir playerdir $pl, 0770; 1411 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1412 $pl->{last_save} = $cf::RUNTIME;
1325 1413
1326 $pl->save_pl ($path); 1414 $pl->save_pl ($path);
1327 Coro::cede; 1415 cf::cede_to_tick;
1328} 1416}
1329 1417
1330sub new($) { 1418sub new($) {
1331 my ($login) = @_; 1419 my ($login) = @_;
1332 1420
… …
1410 or return []; 1498 or return [];
1411 1499
1412 my @logins; 1500 my @logins;
1413 1501
1414 for my $login (@$dirs) { 1502 for my $login (@$dirs) {
1503 my $path = path $login;
1504
1505 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1418 1511
1419 utf8::decode $login; 1512 utf8::decode $login;
1420 push @logins, $login; 1513 push @logins, $login;
1421 } 1514 }
1422 1515
… …
1455 1548
1456Expand crossfire pod fragments into protocol xml. 1549Expand crossfire pod fragments into protocol xml.
1457 1550
1458=cut 1551=cut
1459 1552
1553use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 # match a pod interior sequence sans C<< >>
1558 (?:
1559 \ (.*?)\ (?{ $group = $^N })
1560 | < (??{$interior}) >
1561 )
1562}x;
1563
1460sub expand_cfpod { 1564sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1565 my ($self, $pod) = @_;
1462 1566
1463 # escape & and < 1567 my $xml;
1464 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g;
1466 1568
1467 # this is buggy, it needs to properly take care of nested <'s 1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1468 1572
1469 1 while 1573 $group =~ s/&/&amp;/g;
1470 # replace B<>, I<>, U<> etc. 1574 $group =~ s/</&lt;/g;
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1575
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1576 $xml .= $group;
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1577 } elsif ($pod =~ m%\G
1474 # replace G<male|female> tags 1578 ([BCGHITU])
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1579 <
1476 $self->gender ? $2 : $1 1580 (?:
1477 }ge 1581 ([^<>]*) (?{ $group = $^N })
1478 # replace H<hint text> 1582 | < $interior >
1479 || s{H<([^\>]*)>} 1583 )
1584 >
1585 %gcsx
1480 { 1586 ) {
1587 my ($code, $data) = ($1, $group);
1588
1589 if ($code eq "B") {
1590 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591 } elsif ($code eq "I") {
1592 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593 } elsif ($code eq "U") {
1594 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595 } elsif ($code eq "C") {
1596 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597 } elsif ($code eq "T") {
1598 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599 } elsif ($code eq "G") {
1600 my ($male, $female) = split /\|/, $data;
1601 $data = $self->gender ? $female : $male;
1602 $xml .= expand_cfpod ($self, $data);
1603 } elsif ($code eq "H") {
1481 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1604 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1482 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1483 "") 1606 "")
1484 [$self->{hintmode}] 1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1485 }ge; 1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1486 1618
1619 for ($xml) {
1487 # create single paragraphs (very hackish) 1620 # create single paragraphs (very hackish)
1488 s/(?<=\S)\n(?=\w)/ /g; 1621 s/(?<=\S)\n(?=\w)/ /g;
1489 1622
1490 # compress some whitespace 1623 # compress some whitespace
1491 s/\s+\n/\n/g; # ws line-ends 1624 s/\s+\n/\n/g; # ws line-ends
1492 s/\n\n+/\n/g; # double lines 1625 s/\n\n+/\n/g; # double lines
1493 s/^\n+//; # beginning lines 1626 s/^\n+//; # beginning lines
1494 s/\n+$//; # ending lines 1627 s/\n+$//; # ending lines
1628 }
1495 1629
1496 $_ 1630 $xml
1497} 1631}
1632
1633no re 'eval';
1498 1634
1499sub hintmode { 1635sub hintmode {
1500 $_[0]{hintmode} = $_[1] if @_ > 1; 1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1501 $_[0]{hintmode} 1637 $_[0]{hintmode}
1502} 1638}
… …
1746 1882
1747sub load_header_from($) { 1883sub load_header_from($) {
1748 my ($self, $path) = @_; 1884 my ($self, $path) = @_;
1749 1885
1750 utf8::encode $path; 1886 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1887 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 or return; 1888 or return;
1889
1890 $self->_load_header ($f)
1891 or return;
1892
1893 local $MAP_LOADING{$self->{path}} = $self;
1894 $f->resolve_delayed_derefs;
1756 1895
1757 $self->{load_path} = $path; 1896 $self->{load_path} = $path;
1758 1897
1759 1 1898 1
1760} 1899}
… …
1814sub find { 1953sub find {
1815 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1816 1955
1817 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1818 1957
1958 cf::lock_wait "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 1959 cf::lock_wait "map_find:$path";
1820 1960
1821 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1822 my $guard = cf::lock_acquire "map_find:$path"; 1962 my $guard1 = cf::lock_acquire "map_find:$path";
1963 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1964
1823 my $map = new_from_path cf::map $path 1965 my $map = new_from_path cf::map $path
1824 or return; 1966 or return;
1825 1967
1826 $map->{last_save} = $cf::RUNTIME; 1968 $map->{last_save} = $cf::RUNTIME;
1827 1969
… …
1829 or return; 1971 or return;
1830 1972
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 1974 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 1975 #$cf::WAIT_FOR_TICK->wait;
1976 undef $guard1;
1977 undef $guard2;
1834 $map->reset; 1978 $map->reset;
1835 undef $guard;
1836 return find $path; 1979 return find $path;
1837 } 1980 }
1838 1981
1839 $cf::MAP{$path} = $map 1982 $cf::MAP{$path} = $map
1840 } 1983 }
… …
1849 local $self->{deny_reset} = 1; # loading can take a long time 1992 local $self->{deny_reset} = 1; # loading can take a long time
1850 1993
1851 my $path = $self->{path}; 1994 my $path = $self->{path};
1852 1995
1853 { 1996 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 1997 my $guard = cf::lock_acquire "map_data:$path";
1855 1998
1999 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 2000 return unless $self->in_memory == cf::MAP_SWAPPED;
1857 2001
1858 $self->in_memory (cf::MAP_LOADING); 2002 $self->in_memory (cf::MAP_LOADING);
1859 2003
1860 $self->alloc; 2004 $self->alloc;
1861 2005
1862 $self->pre_load; 2006 $self->pre_load;
1863 Coro::cede; 2007 cf::cede_to_tick;
1864 2008
2009 my $f = new_from_file cf::object::thawer $self->{load_path};
2010 $f->skip_block;
1865 $self->_load_objects ($self->{load_path}, 1) 2011 $self->_load_objects ($f)
1866 or return; 2012 or return;
1867 2013
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2014 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1869 if delete $self->{load_original}; 2015 if delete $self->{load_original};
1870 2016
1871 if (my $uniq = $self->uniq_path) { 2017 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 2018 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 2019 unless (aio_stat $uniq) {
2020 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 2021 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 2022 $self->_load_objects ($f);
2023 $f->resolve_delayed_derefs;
2024 }
1876 } 2025 }
1877 } 2026 }
1878 2027
1879 Coro::cede; 2028 $f->resolve_delayed_derefs;
2029
2030 cf::cede_to_tick;
1880 # now do the right thing for maps 2031 # now do the right thing for maps
1881 $self->link_multipart_objects; 2032 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 2033 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 2034 unless $self->difficulty;
1884 Coro::cede; 2035 cf::cede_to_tick;
1885 2036
1886 unless ($self->{deny_activate}) { 2037 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 2038 $self->decay_objects;
1888 $self->fix_auto_apply; 2039 $self->fix_auto_apply;
1889 $self->update_buttons; 2040 $self->update_buttons;
1890 Coro::cede; 2041 cf::cede_to_tick;
1891 $self->set_darkness_map; 2042 $self->set_darkness_map;
1892 Coro::cede; 2043 cf::cede_to_tick;
1893 $self->activate; 2044 $self->activate;
1894 } 2045 }
1895 2046
1896 $self->{last_save} = $cf::RUNTIME; 2047 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 2048 $self->last_access ($cf::RUNTIME);
… …
1948 2099
1949sub do_load_sync { 2100sub do_load_sync {
1950 my ($map) = @_; 2101 my ($map) = @_;
1951 2102
1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2103 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1953 if $Coro::current != $Coro::main; 2104 if $Coro::current == $Coro::main;
1954 2105
1955 cf::sync_job { $map->load }; 2106 cf::sync_job { $map->load };
1956} 2107}
1957 2108
1958our %MAP_PREFETCH; 2109our %MAP_PREFETCH;
… …
1968 } 2119 }
1969 2120
1970 $MAP_PREFETCH{$path} |= $load; 2121 $MAP_PREFETCH{$path} |= $load;
1971 2122
1972 $MAP_PREFETCHER ||= cf::async { 2123 $MAP_PREFETCHER ||= cf::async {
2124 $Coro::current->{desc} = "map prefetcher";
2125
1973 while (%MAP_PREFETCH) { 2126 while (%MAP_PREFETCH) {
1974 while (my ($k, $v) = each %MAP_PREFETCH) { 2127 while (my ($k, $v) = each %MAP_PREFETCH) {
1975 if (my $map = find $k) { 2128 if (my $map = find $k) {
1976 $map->load if $v; 2129 $map->load if $v;
1977 } 2130 }
… …
1987} 2140}
1988 2141
1989sub save { 2142sub save {
1990 my ($self) = @_; 2143 my ($self) = @_;
1991 2144
1992 my $lock = cf::lock_acquire "map_data:" . $self->path; 2145 my $lock = cf::lock_acquire "map_data:$self->{path}";
1993 2146
1994 $self->{last_save} = $cf::RUNTIME; 2147 $self->{last_save} = $cf::RUNTIME;
1995 2148
1996 return unless $self->dirty; 2149 return unless $self->dirty;
1997 2150
… …
2003 return if $self->{deny_save}; 2156 return if $self->{deny_save};
2004 2157
2005 local $self->{last_access} = $self->last_access;#d# 2158 local $self->{last_access} = $self->last_access;#d#
2006 2159
2007 cf::async { 2160 cf::async {
2161 $Coro::current->{desc} = "map player save";
2008 $_->contr->save for $self->players; 2162 $_->contr->save for $self->players;
2009 }; 2163 };
2010 2164
2011 if ($uniq) { 2165 if ($uniq) {
2012 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2020 my ($self) = @_; 2174 my ($self) = @_;
2021 2175
2022 # save first because save cedes 2176 # save first because save cedes
2023 $self->save; 2177 $self->save;
2024 2178
2025 my $lock = cf::lock_acquire "map_data:" . $self->path; 2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
2026 2180
2027 return if $self->players; 2181 return if $self->players;
2028 return if $self->in_memory != cf::MAP_IN_MEMORY; 2182 return if $self->in_memory != cf::MAP_IN_MEMORY;
2029 return if $self->{deny_save}; 2183 return if $self->{deny_save};
2030 2184
2185 $self->in_memory (cf::MAP_SWAPPED);
2186
2187 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP;
2031 $self->clear; 2189 $self->clear;
2032 $self->in_memory (cf::MAP_SWAPPED);
2033} 2190}
2034 2191
2035sub reset_at { 2192sub reset_at {
2036 my ($self) = @_; 2193 my ($self) = @_;
2037 2194
… …
2069 if $uniq; 2226 if $uniq;
2070 } 2227 }
2071 2228
2072 delete $cf::MAP{$self->path}; 2229 delete $cf::MAP{$self->path};
2073 2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
2074 $self->clear; 2233 $self->clear;
2075
2076 $_->clear_links_to ($self) for values %cf::MAP;
2077 2234
2078 $self->unlink_save; 2235 $self->unlink_save;
2079 $self->destroy; 2236 $self->destroy;
2080} 2237}
2081 2238
2082my $nuke_counter = "aaaa"; 2239my $nuke_counter = "aaaa";
2083 2240
2084sub nuke { 2241sub nuke {
2085 my ($self) = @_; 2242 my ($self) = @_;
2086 2243
2244 {
2245 my $lock = cf::lock_acquire "map_data:$self->{path}";
2246
2087 delete $cf::MAP{$self->path}; 2247 delete $cf::MAP{$self->path};
2088 2248
2089 $self->unlink_save; 2249 $self->unlink_save;
2090 2250
2091 bless $self, "cf::map"; 2251 bless $self, "cf::map";
2092 delete $self->{deny_reset}; 2252 delete $self->{deny_reset};
2093 $self->{deny_save} = 1; 2253 $self->{deny_save} = 1;
2094 $self->reset_timeout (1); 2254 $self->reset_timeout (1);
2095 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2255 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2096 2256
2097 $cf::MAP{$self->path} = $self; 2257 $cf::MAP{$self->path} = $self;
2258 }
2098 2259
2099 $self->reset; # polite request, might not happen 2260 $self->reset; # polite request, might not happen
2100} 2261}
2101 2262
2102=item $maps = cf::map::tmp_maps 2263=item $maps = cf::map::tmp_maps
… …
2178 2339
2179sub inv_recursive { 2340sub inv_recursive {
2180 inv_recursive_ inv $_[0] 2341 inv_recursive_ inv $_[0]
2181} 2342}
2182 2343
2344=item $ref = $ob->ref
2345
2346creates and returns a persistent reference to an objetc that can be stored as a string.
2347
2348=item $ob = cf::object::deref ($refstring)
2349
2350returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2351even if the object actually exists. May block.
2352
2353=cut
2354
2355sub deref {
2356 my ($ref) = @_;
2357
2358 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2359 my ($uuid, $name) = ($1, $2);
2360 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2361 or return;
2362 $pl->ob->uuid eq $uuid
2363 or return;
2364
2365 $pl->ob
2366 } else {
2367 warn "$ref: cannot resolve object reference\n";
2368 undef
2369 }
2370}
2371
2183package cf; 2372package cf;
2184 2373
2185=back 2374=back
2186 2375
2187=head3 cf::object::player 2376=head3 cf::object::player
… …
2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2534 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2346 2535
2347 $self->enter_link; 2536 $self->enter_link;
2348 2537
2349 (async { 2538 (async {
2539 $Coro::current->{desc} = "player::goto $path $x $y";
2540
2541 # *tag paths override both path and x|y
2542 if ($path =~ /^\*(.*)$/) {
2543 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2544 my $ob = $obs[rand @obs];
2545
2546 # see if we actually can go there
2547 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2548 $ob = $obs[rand @obs];
2549 } else {
2550 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2551 }
2552 # else put us there anyways for now #d#
2553
2554 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2555 } else {
2556 ($path, $x, $y) = (undef, undef, undef);
2557 }
2558 }
2559
2350 my $map = eval { 2560 my $map = eval {
2351 my $map = cf::map::find $path; 2561 my $map = defined $path ? cf::map::find $path : undef;
2352 2562
2353 if ($map) { 2563 if ($map) {
2354 $map = $map->customise_for ($self); 2564 $map = $map->customise_for ($self);
2355 $map = $check->($map) if $check && $map; 2565 $map = $check->($map) if $check && $map;
2356 } else { 2566 } else {
2357 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2567 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2358 } 2568 }
2359 2569
2360 $map 2570 $map
2361 }; 2571 };
2362 2572
… …
2452 # if exit is damned, update players death & WoR home-position 2662 # if exit is damned, update players death & WoR home-position
2453 $self->contr->savebed ($slaying, $hp, $sp) 2663 $self->contr->savebed ($slaying, $hp, $sp)
2454 if $exit->flag (FLAG_DAMNED); 2664 if $exit->flag (FLAG_DAMNED);
2455 2665
2456 (async { 2666 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2668
2457 $self->deactivate_recursive; # just to be sure 2669 $self->deactivate_recursive; # just to be sure
2458 unless (eval { 2670 unless (eval {
2459 $self->goto ($slaying, $hp, $sp); 2671 $self->goto ($slaying, $hp, $sp);
2460 2672
2461 1; 2673 1;
… …
2496the message, with C<log> being the default. If C<$color> is negative, suppress 2708the message, with C<log> being the default. If C<$color> is negative, suppress
2497the message unless the client supports the msg packet. 2709the message unless the client supports the msg packet.
2498 2710
2499=cut 2711=cut
2500 2712
2713# non-persistent channels (usually the info channel)
2714our %CHANNEL = (
2715 "c/identify" => {
2716 id => "infobox",
2717 title => "Identify",
2718 reply => undef,
2719 tooltip => "Items recently identified",
2720 },
2721 "c/examine" => {
2722 id => "infobox",
2723 title => "Examine",
2724 reply => undef,
2725 tooltip => "Signs and other items you examined",
2726 },
2727 "c/book" => {
2728 id => "infobox",
2729 title => "Book",
2730 reply => undef,
2731 tooltip => "The contents of a note or book",
2732 },
2733 "c/lookat" => {
2734 id => "infobox",
2735 title => "Look",
2736 reply => undef,
2737 tooltip => "What you saw there",
2738 },
2739 "c/who" => {
2740 id => "infobox",
2741 title => "Players",
2742 reply => undef,
2743 tooltip => "Shows players who are currently online",
2744 },
2745 "c/body" => {
2746 id => "infobox",
2747 title => "Body Parts",
2748 reply => undef,
2749 tooltip => "Shows which body parts you posess and are available",
2750 },
2751 "c/uptime" => {
2752 id => "infobox",
2753 title => "Uptime",
2754 reply => undef,
2755 tooltip => "How long the server has been running since last restart",
2756 },
2757 "c/mapinfo" => {
2758 id => "infobox",
2759 title => "Map Info",
2760 reply => undef,
2761 tooltip => "Information related to the maps",
2762 },
2763);
2764
2501sub cf::client::send_msg { 2765sub cf::client::send_msg {
2502 my ($self, $channel, $msg, $color, @extra) = @_; 2766 my ($self, $channel, $msg, $color, @extra) = @_;
2503 2767
2504 $msg = $self->pl->expand_cfpod ($msg); 2768 $msg = $self->pl->expand_cfpod ($msg);
2505 2769
2506 $color &= cf::NDI_CLIENT_MASK; # just in case... 2770 $color &= cf::NDI_CLIENT_MASK; # just in case...
2507 2771
2772 # check predefined channels, for the benefit of C
2773 if ($CHANNEL{$channel}) {
2774 $channel = $CHANNEL{$channel};
2775
2776 $self->ext_msg (channel_info => $channel)
2777 if $self->can_msg;
2778
2779 $channel = $channel->{id};
2780
2508 if (ref $channel) { 2781 } elsif (ref $channel) {
2509 # send meta info to client, if not yet sent 2782 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) { 2783 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel; 2784 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel); 2785 $self->ext_msg (channel_info => $channel)
2786 if $self->can_msg;
2513 } 2787 }
2514 2788
2515 $channel = $channel->{id}; 2789 $channel = $channel->{id};
2516 } 2790 }
2517 2791
… …
2558=cut 2832=cut
2559 2833
2560sub cf::client::ext_msg($$@) { 2834sub cf::client::ext_msg($$@) {
2561 my ($self, $type, @msg) = @_; 2835 my ($self, $type, @msg) = @_;
2562 2836
2563 my $extcmd = $self->extcmd;
2564
2565 if ($extcmd == 2) { 2837 if ($self->extcmd == 2) {
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2838 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2567 } elsif ($extcmd == 1) { # TODO: remove 2839 } elsif ($self->extcmd == 1) { # TODO: remove
2568 push @msg, msgtype => "event_$type"; 2840 push @msg, msgtype => "event_$type";
2569 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2841 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2570 } 2842 }
2571} 2843}
2572 2844
… …
2579sub cf::client::ext_reply($$@) { 2851sub cf::client::ext_reply($$@) {
2580 my ($self, $id, @msg) = @_; 2852 my ($self, $id, @msg) = @_;
2581 2853
2582 if ($self->extcmd == 2) { 2854 if ($self->extcmd == 2) {
2583 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2855 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2584 } elsif ($self->ns->extcmd == 1) { 2856 } elsif ($self->extcmd == 1) {
2585 #TODO: version 1, remove 2857 #TODO: version 1, remove
2586 unshift @msg, msgtype => "reply", msgid => $id; 2858 unshift @msg, msgtype => "reply", msgid => $id;
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2859 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 } 2860 }
2589} 2861}
… …
2731=pod 3003=pod
2732 3004
2733The following functions and methods are available within a safe environment: 3005The following functions and methods are available within a safe environment:
2734 3006
2735 cf::object 3007 cf::object
2736 contr pay_amount pay_player map x y force_find force_add 3008 contr pay_amount pay_player map x y force_find force_add destroy
2737 insert remove name archname title slaying race decrease_ob_nr 3009 insert remove name archname title slaying race decrease_ob_nr
2738 3010
2739 cf::object::player 3011 cf::object::player
2740 player 3012 player
2741 3013
… …
2748=cut 3020=cut
2749 3021
2750for ( 3022for (
2751 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3023 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2752 insert remove inv name archname title slaying race 3024 insert remove inv name archname title slaying race
2753 decrease_ob_nr)], 3025 decrease_ob_nr destroy)],
2754 ["cf::object::player" => qw(player)], 3026 ["cf::object::player" => qw(player)],
2755 ["cf::player" => qw(peaceful)], 3027 ["cf::player" => qw(peaceful)],
2756 ["cf::map" => qw(trigger)], 3028 ["cf::map" => qw(trigger)],
2757) { 3029) {
2758 no strict 'refs'; 3030 no strict 'refs';
… …
2834# the server's init and main functions 3106# the server's init and main functions
2835 3107
2836sub load_facedata($) { 3108sub load_facedata($) {
2837 my ($path) = @_; 3109 my ($path) = @_;
2838 3110
3111 # HACK to clear player env face cache, we need some signal framework
3112 # for this (global event?)
3113 %ext::player_env::MUSIC_FACE_CACHE = ();
3114
2839 my $enc = JSON::XS->new->utf8->canonical; 3115 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2840 3116
2841 warn "loading facedata from $path\n"; 3117 warn "loading facedata from $path\n";
2842 3118
2843 my $facedata; 3119 my $facedata;
2844 0 < aio_load $path, $facedata 3120 0 < aio_load $path, $facedata
… …
2954 $ns->fx_want ($k, $v); 3230 $ns->fx_want ($k, $v);
2955 } 3231 }
2956}; 3232};
2957 3233
2958sub reload_regions { 3234sub reload_regions {
3235 # HACK to clear player env face cache, we need some signal framework
3236 # for this (global event?)
3237 %ext::player_env::MUSIC_FACE_CACHE = ();
3238
2959 load_resource_file "$MAPDIR/regions" 3239 load_resource_file "$MAPDIR/regions"
2960 or die "unable to load regions file\n"; 3240 or die "unable to load regions file\n";
2961 3241
2962 for (cf::region::list) { 3242 for (cf::region::list) {
2963 $_->{match} = qr/$_->{match}/ 3243 $_->{match} = qr/$_->{match}/
… …
2999 3279
3000sub init { 3280sub init {
3001 reload_resources; 3281 reload_resources;
3002} 3282}
3003 3283
3004sub cfg_load { 3284sub reload_config {
3005 open my $fh, "<:utf8", "$CONFDIR/config" 3285 open my $fh, "<:utf8", "$CONFDIR/config"
3006 or return; 3286 or return;
3007 3287
3008 local $/; 3288 local $/;
3009 *CFG = YAML::Syck::Load <$fh>; 3289 *CFG = YAML::Syck::Load <$fh>;
… …
3025sub main { 3305sub main {
3026 # we must not ever block the main coroutine 3306 # we must not ever block the main coroutine
3027 local $Coro::idle = sub { 3307 local $Coro::idle = sub {
3028 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3308 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3029 (async { 3309 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER";
3030 Event::one_event; 3311 Event::one_event;
3031 })->prio (Coro::PRIO_MAX); 3312 })->prio (Coro::PRIO_MAX);
3032 }; 3313 };
3033 3314
3034 cfg_load; 3315 reload_config;
3035 db_init; 3316 db_init;
3036 load_extensions; 3317 load_extensions;
3037 3318
3038 $TICK_WATCHER->start; 3319 $TICK_WATCHER->start;
3039 Event::loop; 3320 Event::loop;
… …
3106 # and maps saved/destroyed asynchronously. 3387 # and maps saved/destroyed asynchronously.
3107 warn "begin emergency player save\n"; 3388 warn "begin emergency player save\n";
3108 for my $login (keys %cf::PLAYER) { 3389 for my $login (keys %cf::PLAYER) {
3109 my $pl = $cf::PLAYER{$login} or next; 3390 my $pl = $cf::PLAYER{$login} or next;
3110 $pl->valid or next; 3391 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3111 $pl->save; 3393 $pl->save;
3112 } 3394 }
3113 warn "end emergency player save\n"; 3395 warn "end emergency player save\n";
3114 3396
3115 warn "begin emergency map save\n"; 3397 warn "begin emergency map save\n";
… …
3163 3445
3164 warn "flushing outstanding aio requests"; 3446 warn "flushing outstanding aio requests";
3165 for (;;) { 3447 for (;;) {
3166 BDB::flush; 3448 BDB::flush;
3167 IO::AIO::flush; 3449 IO::AIO::flush;
3168 Coro::cede; 3450 Coro::cede_notself;
3169 last unless IO::AIO::nreqs || BDB::nreqs; 3451 last unless IO::AIO::nreqs || BDB::nreqs;
3170 warn "iterate..."; 3452 warn "iterate...";
3171 } 3453 }
3172 3454
3173 ++$RELOAD; 3455 ++$RELOAD;
… …
3232 warn "reloading cf.pm"; 3514 warn "reloading cf.pm";
3233 require cf; 3515 require cf;
3234 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3516 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3235 3517
3236 warn "loading config and database again"; 3518 warn "loading config and database again";
3237 cf::cfg_load; 3519 cf::reload_config;
3238 3520
3239 warn "loading extensions"; 3521 warn "loading extensions";
3240 cf::load_extensions; 3522 cf::load_extensions;
3241 3523
3242 warn "reattaching attachments to objects/players"; 3524 warn "reattaching attachments to objects/players";
… …
3278register_command "reload" => sub { 3560register_command "reload" => sub {
3279 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3280 3562
3281 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
3282 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
3283 async { reload_perl }; 3567 reload_perl;
3568 };
3284 } 3569 }
3285}; 3570};
3286 3571
3287unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
3288 3573
… …
3307 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3308 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3309 $signal->wait; 3594 $signal->wait;
3310} 3595}
3311 3596
3312 my $min = 1e6;#d#
3313 my $avg = 10;
3314$TICK_WATCHER = Event->timer ( 3597$TICK_WATCHER = Event->timer (
3315 reentrant => 0, 3598 reentrant => 0,
3316 parked => 1, 3599 parked => 1,
3317 prio => 0, 3600 prio => 0,
3318 at => $NEXT_TICK || $TICK, 3601 at => $NEXT_TICK || $TICK,
… …
3326 3609
3327 $NOW = $tick_start = Event::time; 3610 $NOW = $tick_start = Event::time;
3328 3611
3329 cf::server_tick; # one server iteration 3612 cf::server_tick; # one server iteration
3330 3613
3331 0 && sync_job {#d#
3332 for(1..10) {
3333 my $t = Event::time;
3334 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3335 or die;
3336
3337 $map->width (50);
3338 $map->height (50);
3339 $map->alloc;
3340 $map->_load_objects ("/tmp/x.map", 1);
3341 my $t = Event::time - $t;
3342
3343 #next unless $t < 0.0013;#d#
3344 if ($t < $min) {
3345 $min = $t;
3346 }
3347 $avg = $avg * 0.99 + $t * 0.01;
3348 }
3349 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3350 exit 0;
3351 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3352 };
3353
3354 $RUNTIME += $TICK; 3614 $RUNTIME += $TICK;
3355 $NEXT_TICK += $TICK; 3615 $NEXT_TICK += $TICK;
3356 3616
3357 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3617 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3358 $NEXT_RUNTIME_WRITE = $NOW + 10; 3618 $NEXT_RUNTIME_WRITE = $NOW + 10;
3359 Coro::async_pool { 3619 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver";
3360 write_runtime 3621 write_runtime
3361 or warn "ERROR: unable to write runtime file: $!"; 3622 or warn "ERROR: unable to write runtime file: $!";
3362 }; 3623 };
3363 } 3624 }
3364 3625
3365# my $AFTER = Event::time;
3366# warn $AFTER - $NOW;#d#
3367
3368 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3369 $sig->send; 3627 $sig->send;
3370 } 3628 }
3371 while (my $sig = shift @WAIT_FOR_TICK) { 3629 while (my $sig = shift @WAIT_FOR_TICK) {
3372 $sig->send; 3630 $sig->send;
… …
3382 3640
3383 $LOAD = ($NOW - $tick_start) / $TICK; 3641 $LOAD = ($NOW - $tick_start) / $TICK;
3384 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3385 3643
3386 _post_tick; 3644 _post_tick;
3387
3388
3389 }, 3645 },
3390); 3646);
3391 3647
3392{ 3648{
3649 BDB::min_parallel 8;
3393 BDB::max_poll_time $TICK * 0.1; 3650 BDB::max_poll_time $TICK * 0.1;
3394 $BDB_POLL_WATCHER = Event->io ( 3651 $BDB_POLL_WATCHER = Event->io (
3395 reentrant => 0, 3652 reentrant => 0,
3396 fd => BDB::poll_fileno, 3653 fd => BDB::poll_fileno,
3397 poll => 'r', 3654 poll => 'r',
3398 prio => 0, 3655 prio => 0,
3399 data => WF_AUTOCANCEL, 3656 data => WF_AUTOCANCEL,
3400 cb => \&BDB::poll_cb, 3657 cb => \&BDB::poll_cb,
3401 ); 3658 );
3402 BDB::min_parallel 8;
3403 3659
3404 BDB::set_sync_prepare { 3660 BDB::set_sync_prepare {
3405 my $status; 3661 my $status;
3406 my $current = $Coro::current; 3662 my $current = $Coro::current;
3407 ( 3663 (
… …
3416 ) 3672 )
3417 }; 3673 };
3418 3674
3419 unless ($DB_ENV) { 3675 unless ($DB_ENV) {
3420 $DB_ENV = BDB::db_env_create; 3676 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3678 | BDB::LOG_AUTOREMOVE, 1);
3679 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3680 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3421 3681
3422 cf::sync_job { 3682 cf::sync_job {
3423 eval { 3683 eval {
3424 BDB::db_env_open 3684 BDB::db_env_open
3425 $DB_ENV, 3685 $DB_ENV,
… …
3427 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3687 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3428 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3688 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3429 0666; 3689 0666;
3430 3690
3431 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3691 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3432
3433 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3434 $DB_ENV->set_lk_detect;
3435 }; 3692 };
3436 3693
3437 cf::cleanup "db_env_open(db): $@" if $@; 3694 cf::cleanup "db_env_open(db): $@" if $@;
3438 }; 3695 };
3439 } 3696 }
3697
3698 $BDB_DEADLOCK_WATCHER = Event->timer (
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3706 },
3707 );
3708 $BDB_CHECKPOINT_WATCHER = Event->timer (
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 );
3718 $BDB_TRICKLE_WATCHER = Event->timer (
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 );
3440} 3728}
3441 3729
3442{ 3730{
3443 IO::AIO::min_parallel 8; 3731 IO::AIO::min_parallel 8;
3444 3732
… …
3447 $AIO_POLL_WATCHER = Event->io ( 3735 $AIO_POLL_WATCHER = Event->io (
3448 reentrant => 0, 3736 reentrant => 0,
3449 data => WF_AUTOCANCEL, 3737 data => WF_AUTOCANCEL,
3450 fd => IO::AIO::poll_fileno, 3738 fd => IO::AIO::poll_fileno,
3451 poll => 'r', 3739 poll => 'r',
3452 prio => 6, 3740 prio => 0,
3453 cb => \&IO::AIO::poll_cb, 3741 cb => \&IO::AIO::poll_cb,
3454 ); 3742 );
3455} 3743}
3456 3744
3457my $_log_backtrace; 3745my $_log_backtrace;
… …
3463 3751
3464 # limit the # of concurrent backtraces 3752 # limit the # of concurrent backtraces
3465 if ($_log_backtrace < 2) { 3753 if ($_log_backtrace < 2) {
3466 ++$_log_backtrace; 3754 ++$_log_backtrace;
3467 async { 3755 async {
3756 $Coro::current->{desc} = "abt $msg";
3757
3468 my @bt = fork_call { 3758 my @bt = fork_call {
3469 @addr = map { sprintf "%x", $_ } @addr; 3759 @addr = map { sprintf "%x", $_ } @addr;
3470 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3760 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3471 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3761 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3472 or die "addr2line: $!"; 3762 or die "addr2line: $!";

Diff Legend

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