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.337 by root, Tue Aug 21 00:54:01 2007 UTC vs.
Revision 1.386 by root, Mon Oct 15 17:50:27 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 }
… …
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
… …
478sub fork_call(&@) { 496sub fork_call(&@) {
479 my ($cb, @args) = @_; 497 my ($cb, @args) = @_;
480 498
481 # we seemingly have to make a local copy of the whole thing, 499 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 500 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 501 # TODO: investigate and fix (likely this will be rather laborious)
484 502
485 my @res = Coro::Util::fork_eval { 503 my @res = Coro::Util::fork_eval {
486 reset_signals; 504 reset_signals;
487 &$cb 505 &$cb
488 }, @args; 506 }, @args;
… …
497=item cf::db_put $family => $key => $value 515=item cf::db_put $family => $key => $value
498 516
499Stores the given C<$value> in the family. It can currently store binary 517Stores 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). 518data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 519
520=item $db = cf::db_table "name"
521
522Create and/or open a new database table. The string must not be "db" and must be unique
523within each server.
524
502=cut 525=cut
526
527sub db_table($) {
528 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV;
530
531 eval {
532 $db->set_flags (BDB::CHKSUM);
533
534 utf8::encode $name;
535 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
536 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
537 cf::cleanup "db_open(db): $!" if $!;
538 };
539 cf::cleanup "db_open(db): $@" if $@;
540
541 $db
542}
503 543
504our $DB; 544our $DB;
505 545
506sub db_init { 546sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 547 cf::sync_job {
511 eval { 548 $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 } 549 };
521} 550}
522 551
523sub db_get($$) { 552sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
525 554
… …
575 if (1) { 604 if (1) {
576 $md5 = 605 $md5 =
577 join "\x00", 606 join "\x00",
578 $processversion, 607 $processversion,
579 map { 608 map {
580 Coro::cede; 609 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 610 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 611 } 0.. $#$src;
583 612
584 613
585 my $dbmd5 = db_get cache => "$id/md5"; 614 my $dbmd5 = db_get cache => "$id/md5";
… …
937 966
938=cut 967=cut
939 968
940############################################################################# 969#############################################################################
941# object support 970# object support
942#
943 971
972sub _object_equal($$);
973sub _object_equal($$) {
974 my ($a, $b) = @_;
975
976 return 0 unless (ref $a) eq (ref $b);
977
978 if ("HASH" eq ref $a) {
979 my @ka = keys %$a;
980 my @kb = keys %$b;
981
982 return 0 if @ka != @kb;
983
984 for (0 .. $#ka) {
985 return 0 unless $ka[$_] eq $kb[$_];
986 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
987 }
988
989 } elsif ("ARRAY" eq ref $a) {
990
991 return 0 if @$a != @$b;
992
993 for (0 .. $#$a) {
994 return 0 unless _object_equal $a->[$_], $b->[$_];
995 }
996
997 } elsif ($a ne $b) {
998 return 0;
999 }
1000
1001 1
1002}
1003
1004our $SLOW_MERGES;#d#
944sub _can_merge { 1005sub _can_merge {
945 my ($ob1, $ob2) = @_; 1006 my ($ob1, $ob2) = @_;
946 1007
947 local $Storable::canonical = 1; 1008 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1009
951 $fob1 eq $fob2 1010 # we do the slow way here
1011 return _object_equal $ob1, $ob2
952} 1012}
953 1013
954sub reattach { 1014sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1015 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1016 my ($obj) = @_;
… …
1004sub object_freezer_save { 1064sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1065 my ($filename, $rdata, $objs) = @_;
1006 1066
1007 sync_job { 1067 sync_job {
1008 if (length $$rdata) { 1068 if (length $$rdata) {
1069 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1070 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1071 $decname, length $$rdata, scalar @$objs;
1011 1072
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1073 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1074 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1075 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1076 aio_fsync $fh if $cf::USE_FSYNC;
1016 close $fh; 1077 close $fh;
1017 1078
1018 if (@$objs) { 1079 if (@$objs) {
1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1080 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020 chmod SAVE_MODE, $fh; 1081 chmod SAVE_MODE, $fh;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1082 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1083 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1084 aio_fsync $fh if $cf::USE_FSYNC;
1024 close $fh; 1085 close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1086 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1087 }
… …
1034 } 1095 }
1035 } else { 1096 } else {
1036 aio_unlink $filename; 1097 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1098 aio_unlink "$filename.pst";
1038 } 1099 }
1039 } 1100 };
1040} 1101}
1041 1102
1042sub object_freezer_as_string { 1103sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1104 my ($rdata, $objs) = @_;
1044 1105
… …
1056 or return; 1117 or return;
1057 1118
1058 unless (aio_stat "$filename.pst") { 1119 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1120 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1121 or return;
1061 $av = eval { (Storable::thaw $av)->{objs} };
1062 }
1063 1122
1123 my $st = eval { Coro::Storable::thaw $av }
1124 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1125 $av = $st->{objs};
1126 }
1127
1128 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1129 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1130 $decname, length $data, scalar @{$av || []};
1131
1066 return ($data, $av); 1132 ($data, $av)
1067} 1133}
1068 1134
1069=head2 COMMAND CALLBACKS 1135=head2 COMMAND CALLBACKS
1070 1136
1071=over 4 1137=over 4
… …
1149 my ($type, $reply, @payload) = 1215 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1216 "ARRAY" eq ref $msg
1151 ? @$msg 1217 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1218 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1219
1220 my @reply;
1221
1154 if (my $cb = $EXTCMD{$type}) { 1222 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1223 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1224 }
1225
1226 $pl->ext_reply ($reply, @reply)
1227 if $reply;
1228
1160 } else { 1229 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1230 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1231 }
1163 1232
1164 cf::override; 1233 cf::override;
… …
1254 1323
1255=head3 cf::player 1324=head3 cf::player
1256 1325
1257=over 4 1326=over 4
1258 1327
1328=item cf::player::num_playing
1329
1330Returns the official number of playing players, as per the Crossfire metaserver rules.
1331
1332=cut
1333
1334sub num_playing {
1335 scalar grep
1336 $_->ob->map
1337 && !$_->hidden
1338 && !$_->ob->flag (cf::FLAG_WIZ),
1339 cf::player::list
1340}
1341
1259=item cf::player::find $login 1342=item cf::player::find $login
1260 1343
1261Returns the given player object, loading it if necessary (might block). 1344Returns the given player object, loading it if necessary (might block).
1262 1345
1263=cut 1346=cut
… …
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1381 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1382 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1383 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1384 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1385
1303 my $pl = load_pl path $login 1386 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1387 or return;
1388
1389 my $pl = cf::player::load_pl $f
1390 or return;
1391 local $cf::PLAYER_LOADING{$login} = $pl;
1392 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1393 $cf::PLAYER{$login} = $pl
1306 } 1394 }
1307 } 1395 }
1308} 1396}
1309 1397
… …
1319 1407
1320 aio_mkdir playerdir $pl, 0770; 1408 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1409 $pl->{last_save} = $cf::RUNTIME;
1322 1410
1323 $pl->save_pl ($path); 1411 $pl->save_pl ($path);
1324 Coro::cede; 1412 cf::cede_to_tick;
1325} 1413}
1326 1414
1327sub new($) { 1415sub new($) {
1328 my ($login) = @_; 1416 my ($login) = @_;
1329 1417
… …
1407 or return []; 1495 or return [];
1408 1496
1409 my @logins; 1497 my @logins;
1410 1498
1411 for my $login (@$dirs) { 1499 for my $login (@$dirs) {
1500 my $path = path $login;
1501
1502 # a .pst is a dead give-away for a valid player
1503 unless (-e "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1504 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1505 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1506 $buf !~ /^password -------------$/m or next; # official not-valid tag
1507 }
1415 1508
1416 utf8::decode $login; 1509 utf8::decode $login;
1417 push @logins, $login; 1510 push @logins, $login;
1418 } 1511 }
1419 1512
… …
1457sub expand_cfpod { 1550sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1551 ((my $self), (local $_)) = @_;
1459 1552
1460 # escape & and < 1553 # escape & and <
1461 s/&/&amp;/g; 1554 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g; 1555 s/(?<![BIUGHT])</&lt;/g;
1463 1556
1464 # this is buggy, it needs to properly take care of nested <'s 1557 # this is buggy, it needs to properly take care of nested <'s
1465 1558
1466 1 while 1559 1 while
1467 # replace B<>, I<>, U<> etc. 1560 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1561 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1562 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1563 || s/U<([^\>]*)>/<u>$1<\/u>/
1564 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1471 # replace G<male|female> tags 1565 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1566 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1 1567 $self->gender ? $2 : $1
1474 }ge 1568 }ge
1475 # replace H<hint text> 1569 # replace H<hint text>
… …
1743 1837
1744sub load_header_from($) { 1838sub load_header_from($) {
1745 my ($self, $path) = @_; 1839 my ($self, $path) = @_;
1746 1840
1747 utf8::encode $path; 1841 utf8::encode $path;
1748 #aio_open $path, O_RDONLY, 0 1842 my $f = new_from_file cf::object::thawer $path
1749 # or return;
1750
1751 $self->_load_header ($path)
1752 or return; 1843 or return;
1844
1845 $self->_load_header ($f)
1846 or return;
1847
1848 local $MAP_LOADING{$self->{path}} = $self;
1849 $f->resolve_delayed_derefs;
1753 1850
1754 $self->{load_path} = $path; 1851 $self->{load_path} = $path;
1755 1852
1756 1 1853 1
1757} 1854}
… …
1811sub find { 1908sub find {
1812 my ($path, $origin) = @_; 1909 my ($path, $origin) = @_;
1813 1910
1814 $path = normalise $path, $origin && $origin->path; 1911 $path = normalise $path, $origin && $origin->path;
1815 1912
1913 cf::lock_wait "map_data:$path";#d#remove
1816 cf::lock_wait "map_find:$path"; 1914 cf::lock_wait "map_find:$path";
1817 1915
1818 $cf::MAP{$path} || do { 1916 $cf::MAP{$path} || do {
1819 my $guard = cf::lock_acquire "map_find:$path"; 1917 my $guard1 = cf::lock_acquire "map_find:$path";
1918 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1919
1820 my $map = new_from_path cf::map $path 1920 my $map = new_from_path cf::map $path
1821 or return; 1921 or return;
1822 1922
1823 $map->{last_save} = $cf::RUNTIME; 1923 $map->{last_save} = $cf::RUNTIME;
1824 1924
… …
1826 or return; 1926 or return;
1827 1927
1828 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1928 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1829 # doing this can freeze the server in a sync job, obviously 1929 # doing this can freeze the server in a sync job, obviously
1830 #$cf::WAIT_FOR_TICK->wait; 1930 #$cf::WAIT_FOR_TICK->wait;
1931 undef $guard1;
1932 undef $guard2;
1831 $map->reset; 1933 $map->reset;
1832 undef $guard;
1833 return find $path; 1934 return find $path;
1834 } 1935 }
1835 1936
1836 $cf::MAP{$path} = $map 1937 $cf::MAP{$path} = $map
1837 } 1938 }
… …
1846 local $self->{deny_reset} = 1; # loading can take a long time 1947 local $self->{deny_reset} = 1; # loading can take a long time
1847 1948
1848 my $path = $self->{path}; 1949 my $path = $self->{path};
1849 1950
1850 { 1951 {
1851 my $guard = cf::lock_acquire "map_load:$path"; 1952 my $guard = cf::lock_acquire "map_data:$path";
1852 1953
1954 return unless $self->valid;
1853 return if $self->in_memory != cf::MAP_SWAPPED; 1955 return unless $self->in_memory == cf::MAP_SWAPPED;
1854 1956
1855 $self->in_memory (cf::MAP_LOADING); 1957 $self->in_memory (cf::MAP_LOADING);
1856 1958
1857 $self->alloc; 1959 $self->alloc;
1858 1960
1859 $self->pre_load; 1961 $self->pre_load;
1860 Coro::cede; 1962 cf::cede_to_tick;
1861 1963
1964 my $f = new_from_file cf::object::thawer $self->{load_path};
1965 $f->skip_block;
1862 $self->_load_objects ($self->{load_path}, 1) 1966 $self->_load_objects ($f)
1863 or return; 1967 or return;
1864 1968
1865 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1969 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1866 if delete $self->{load_original}; 1970 if delete $self->{load_original};
1867 1971
1868 if (my $uniq = $self->uniq_path) { 1972 if (my $uniq = $self->uniq_path) {
1869 utf8::encode $uniq; 1973 utf8::encode $uniq;
1870 if (aio_open $uniq, O_RDONLY, 0) { 1974 unless (aio_stat $uniq) {
1975 if (my $f = new_from_file cf::object::thawer $uniq) {
1871 $self->clear_unique_items; 1976 $self->clear_unique_items;
1872 $self->_load_objects ($uniq, 0); 1977 $self->_load_objects ($f);
1978 $f->resolve_delayed_derefs;
1979 }
1873 } 1980 }
1874 } 1981 }
1875 1982
1876 Coro::cede; 1983 $f->resolve_delayed_derefs;
1984
1985 cf::cede_to_tick;
1877 # now do the right thing for maps 1986 # now do the right thing for maps
1878 $self->link_multipart_objects; 1987 $self->link_multipart_objects;
1879 $self->difficulty ($self->estimate_difficulty) 1988 $self->difficulty ($self->estimate_difficulty)
1880 unless $self->difficulty; 1989 unless $self->difficulty;
1881 Coro::cede; 1990 cf::cede_to_tick;
1882 1991
1883 unless ($self->{deny_activate}) { 1992 unless ($self->{deny_activate}) {
1884 $self->decay_objects; 1993 $self->decay_objects;
1885 $self->fix_auto_apply; 1994 $self->fix_auto_apply;
1886 $self->update_buttons; 1995 $self->update_buttons;
1887 Coro::cede; 1996 cf::cede_to_tick;
1888 $self->set_darkness_map; 1997 $self->set_darkness_map;
1889 Coro::cede; 1998 cf::cede_to_tick;
1890 $self->activate; 1999 $self->activate;
1891 } 2000 }
1892 2001
1893 $self->{last_save} = $cf::RUNTIME; 2002 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME); 2003 $self->last_access ($cf::RUNTIME);
… …
1944} 2053}
1945 2054
1946sub do_load_sync { 2055sub do_load_sync {
1947 my ($map) = @_; 2056 my ($map) = @_;
1948 2057
2058 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2059 if $Coro::current == $Coro::main;
2060
1949 cf::sync_job { $map->load }; 2061 cf::sync_job { $map->load };
1950} 2062}
1951 2063
1952our %MAP_PREFETCH; 2064our %MAP_PREFETCH;
1953our $MAP_PREFETCHER = undef; 2065our $MAP_PREFETCHER = undef;
1954 2066
1955sub find_async { 2067sub find_async {
1956 my ($path, $origin) = @_; 2068 my ($path, $origin, $load) = @_;
1957 2069
1958 $path = normalise $path, $origin && $origin->{path}; 2070 $path = normalise $path, $origin && $origin->{path};
1959 2071
1960 if (my $map = $cf::MAP{$path}) { 2072 if (my $map = $cf::MAP{$path}) {
1961 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2073 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1962 } 2074 }
1963 2075
1964 undef $MAP_PREFETCH{$path}; 2076 $MAP_PREFETCH{$path} |= $load;
2077
1965 $MAP_PREFETCHER ||= cf::async { 2078 $MAP_PREFETCHER ||= cf::async {
2079 $Coro::current->{desc} = "map prefetcher";
2080
1966 while (%MAP_PREFETCH) { 2081 while (%MAP_PREFETCH) {
1967 for my $path (keys %MAP_PREFETCH) { 2082 while (my ($k, $v) = each %MAP_PREFETCH) {
1968 if (my $map = find $path) { 2083 if (my $map = find $k) {
1969 $map->load; 2084 $map->load if $v;
1970 } 2085 }
1971 2086
1972 delete $MAP_PREFETCH{$path}; 2087 delete $MAP_PREFETCH{$k};
1973 } 2088 }
1974 } 2089 }
1975 undef $MAP_PREFETCHER; 2090 undef $MAP_PREFETCHER;
1976 }; 2091 };
1977 $MAP_PREFETCHER->prio (6); 2092 $MAP_PREFETCHER->prio (6);
… …
1980} 2095}
1981 2096
1982sub save { 2097sub save {
1983 my ($self) = @_; 2098 my ($self) = @_;
1984 2099
1985 my $lock = cf::lock_acquire "map_data:" . $self->path; 2100 my $lock = cf::lock_acquire "map_data:$self->{path}";
1986 2101
1987 $self->{last_save} = $cf::RUNTIME; 2102 $self->{last_save} = $cf::RUNTIME;
1988 2103
1989 return unless $self->dirty; 2104 return unless $self->dirty;
1990 2105
… …
1996 return if $self->{deny_save}; 2111 return if $self->{deny_save};
1997 2112
1998 local $self->{last_access} = $self->last_access;#d# 2113 local $self->{last_access} = $self->last_access;#d#
1999 2114
2000 cf::async { 2115 cf::async {
2116 $Coro::current->{desc} = "map player save";
2001 $_->contr->save for $self->players; 2117 $_->contr->save for $self->players;
2002 }; 2118 };
2003 2119
2004 if ($uniq) { 2120 if ($uniq) {
2005 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2121 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2013 my ($self) = @_; 2129 my ($self) = @_;
2014 2130
2015 # save first because save cedes 2131 # save first because save cedes
2016 $self->save; 2132 $self->save;
2017 2133
2018 my $lock = cf::lock_acquire "map_data:" . $self->path; 2134 my $lock = cf::lock_acquire "map_data:$self->{path}";
2019 2135
2020 return if $self->players; 2136 return if $self->players;
2021 return if $self->in_memory != cf::MAP_IN_MEMORY; 2137 return if $self->in_memory != cf::MAP_IN_MEMORY;
2022 return if $self->{deny_save}; 2138 return if $self->{deny_save};
2023 2139
2140 $self->in_memory (cf::MAP_SWAPPED);
2141
2142 $self->deactivate;
2143 $_->clear_links_to ($self) for values %cf::MAP;
2024 $self->clear; 2144 $self->clear;
2025 $self->in_memory (cf::MAP_SWAPPED);
2026} 2145}
2027 2146
2028sub reset_at { 2147sub reset_at {
2029 my ($self) = @_; 2148 my ($self) = @_;
2030 2149
… …
2062 if $uniq; 2181 if $uniq;
2063 } 2182 }
2064 2183
2065 delete $cf::MAP{$self->path}; 2184 delete $cf::MAP{$self->path};
2066 2185
2186 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP;
2067 $self->clear; 2188 $self->clear;
2068
2069 $_->clear_links_to ($self) for values %cf::MAP;
2070 2189
2071 $self->unlink_save; 2190 $self->unlink_save;
2072 $self->destroy; 2191 $self->destroy;
2073} 2192}
2074 2193
2075my $nuke_counter = "aaaa"; 2194my $nuke_counter = "aaaa";
2076 2195
2077sub nuke { 2196sub nuke {
2078 my ($self) = @_; 2197 my ($self) = @_;
2079 2198
2199 {
2200 my $lock = cf::lock_acquire "map_data:$self->{path}";
2201
2080 delete $cf::MAP{$self->path}; 2202 delete $cf::MAP{$self->path};
2081 2203
2082 $self->unlink_save; 2204 $self->unlink_save;
2083 2205
2084 bless $self, "cf::map"; 2206 bless $self, "cf::map";
2085 delete $self->{deny_reset}; 2207 delete $self->{deny_reset};
2086 $self->{deny_save} = 1; 2208 $self->{deny_save} = 1;
2087 $self->reset_timeout (1); 2209 $self->reset_timeout (1);
2088 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2210 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2089 2211
2090 $cf::MAP{$self->path} = $self; 2212 $cf::MAP{$self->path} = $self;
2213 }
2091 2214
2092 $self->reset; # polite request, might not happen 2215 $self->reset; # polite request, might not happen
2093} 2216}
2094 2217
2095=item $maps = cf::map::tmp_maps 2218=item $maps = cf::map::tmp_maps
… …
2171 2294
2172sub inv_recursive { 2295sub inv_recursive {
2173 inv_recursive_ inv $_[0] 2296 inv_recursive_ inv $_[0]
2174} 2297}
2175 2298
2299=item $ref = $ob->ref
2300
2301creates and returns a persistent reference to an objetc that can be stored as a string.
2302
2303=item $ob = cf::object::deref ($refstring)
2304
2305returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2306even if the object actually exists. May block.
2307
2308=cut
2309
2310sub deref {
2311 my ($ref) = @_;
2312
2313 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2314 my ($uuid, $name) = ($1, $2);
2315 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2316 or return;
2317 $pl->ob->uuid eq $uuid
2318 or return;
2319
2320 $pl->ob
2321 } else {
2322 warn "$ref: cannot resolve object reference\n";
2323 undef
2324 }
2325}
2326
2176package cf; 2327package cf;
2177 2328
2178=back 2329=back
2179 2330
2180=head3 cf::object::player 2331=head3 cf::object::player
… …
2338 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2489 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2339 2490
2340 $self->enter_link; 2491 $self->enter_link;
2341 2492
2342 (async { 2493 (async {
2494 $Coro::current->{desc} = "player::goto $path $x $y";
2495
2496 # *tag paths override both path and x|y
2497 if ($path =~ /^\*(.*)$/) {
2498 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2499 my $ob = $obs[rand @obs];
2500
2501 # see if we actually can go there
2502 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2503 $ob = $obs[rand @obs];
2504 } else {
2505 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2506 }
2507 # else put us there anyways for now #d#
2508
2509 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2510 } else {
2511 ($path, $x, $y) = (undef, undef, undef);
2512 }
2513 }
2514
2343 my $map = eval { 2515 my $map = eval {
2344 my $map = cf::map::find $path; 2516 my $map = defined $path ? cf::map::find $path : undef;
2345 2517
2346 if ($map) { 2518 if ($map) {
2347 $map = $map->customise_for ($self); 2519 $map = $map->customise_for ($self);
2348 $map = $check->($map) if $check && $map; 2520 $map = $check->($map) if $check && $map;
2349 } else { 2521 } else {
2350 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2522 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2351 } 2523 }
2352 2524
2353 $map 2525 $map
2354 }; 2526 };
2355 2527
… …
2445 # if exit is damned, update players death & WoR home-position 2617 # if exit is damned, update players death & WoR home-position
2446 $self->contr->savebed ($slaying, $hp, $sp) 2618 $self->contr->savebed ($slaying, $hp, $sp)
2447 if $exit->flag (FLAG_DAMNED); 2619 if $exit->flag (FLAG_DAMNED);
2448 2620
2449 (async { 2621 (async {
2622 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2623
2450 $self->deactivate_recursive; # just to be sure 2624 $self->deactivate_recursive; # just to be sure
2451 unless (eval { 2625 unless (eval {
2452 $self->goto ($slaying, $hp, $sp); 2626 $self->goto ($slaying, $hp, $sp);
2453 2627
2454 1; 2628 1;
… …
2489the message, with C<log> being the default. If C<$color> is negative, suppress 2663the message, with C<log> being the default. If C<$color> is negative, suppress
2490the message unless the client supports the msg packet. 2664the message unless the client supports the msg packet.
2491 2665
2492=cut 2666=cut
2493 2667
2668our %CHANNEL = (
2669 "c/identify" => {
2670 id => "infobox",
2671 title => "Identify",
2672 reply => undef,
2673 tooltip => "Items recently identified",
2674 },
2675 "c/examine" => {
2676 id => "infobox",
2677 title => "Examine",
2678 reply => undef,
2679 tooltip => "Signs and other items you examined",
2680 },
2681 "c/lookat" => {
2682 id => "infobox",
2683 title => "Look",
2684 reply => undef,
2685 tooltip => "What you saw there",
2686 },
2687);
2688
2494sub cf::client::send_msg { 2689sub cf::client::send_msg {
2495 my ($self, $channel, $msg, $color, @extra) = @_; 2690 my ($self, $channel, $msg, $color, @extra) = @_;
2496 2691
2497 $msg = $self->pl->expand_cfpod ($msg); 2692 $msg = $self->pl->expand_cfpod ($msg);
2498 2693
2499 $color &= cf::NDI_CLIENT_MASK; # just in case... 2694 $color &= cf::NDI_CLIENT_MASK; # just in case...
2500 2695
2696 # check predefined channels, for the benefit of C
2697 if ($CHANNEL{$channel}) {
2698 $channel = $CHANNEL{$channel};
2699
2700 $self->ext_msg (channel_info => $channel)
2701 if $self->can_msg;
2702
2703 $channel = $channel->{id};
2704
2501 if (ref $channel) { 2705 } elsif (ref $channel) {
2502 # send meta info to client, if not yet sent 2706 # send meta info to client, if not yet sent
2503 unless (exists $self->{channel}{$channel->{id}}) { 2707 unless (exists $self->{channel}{$channel->{id}}) {
2504 $self->{channel}{$channel->{id}} = $channel; 2708 $self->{channel}{$channel->{id}} = $channel;
2505 $self->ext_msg (channel_info => $channel); 2709 $self->ext_msg (channel_info => $channel)
2710 if $self->can_msg;
2506 } 2711 }
2507 2712
2508 $channel = $channel->{id}; 2713 $channel = $channel->{id};
2509 } 2714 }
2510 2715
… …
2551=cut 2756=cut
2552 2757
2553sub cf::client::ext_msg($$@) { 2758sub cf::client::ext_msg($$@) {
2554 my ($self, $type, @msg) = @_; 2759 my ($self, $type, @msg) = @_;
2555 2760
2556 my $extcmd = $self->extcmd;
2557
2558 if ($extcmd == 2) { 2761 if ($self->extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2762 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove 2763 } elsif ($self->extcmd == 1) { # TODO: remove
2561 push @msg, msgtype => "event_$type"; 2764 push @msg, msgtype => "event_$type";
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2765 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 } 2766 }
2564} 2767}
2565 2768
… …
2572sub cf::client::ext_reply($$@) { 2775sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_; 2776 my ($self, $id, @msg) = @_;
2574 2777
2575 if ($self->extcmd == 2) { 2778 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2779 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) { 2780 } elsif ($self->extcmd == 1) {
2578 #TODO: version 1, remove 2781 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id; 2782 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2783 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2784 }
2582} 2785}
… …
2646 my ($type, $reply, @payload) = 2849 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2850 "ARRAY" eq ref $msg
2648 ? @$msg 2851 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2852 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 2853
2854 my @reply;
2855
2651 if (my $cb = $EXTICMD{$type}) { 2856 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 2857 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 2858 }
2859
2860 $ns->ext_reply ($reply, @reply)
2861 if $reply;
2862
2657 } else { 2863 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2864 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 2865 }
2660 2866
2661 cf::override; 2867 cf::override;
… …
2721=pod 2927=pod
2722 2928
2723The following functions and methods are available within a safe environment: 2929The following functions and methods are available within a safe environment:
2724 2930
2725 cf::object 2931 cf::object
2726 contr pay_amount pay_player map x y force_find force_add 2932 contr pay_amount pay_player map x y force_find force_add destroy
2727 insert remove name archname title slaying race 2933 insert remove name archname title slaying race decrease_ob_nr
2728 2934
2729 cf::object::player 2935 cf::object::player
2730 player 2936 player
2731 2937
2732 cf::player 2938 cf::player
… …
2737 2943
2738=cut 2944=cut
2739 2945
2740for ( 2946for (
2741 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2947 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2742 insert remove inv name archname title slaying race)], 2948 insert remove inv name archname title slaying race
2949 decrease_ob_nr destroy)],
2743 ["cf::object::player" => qw(player)], 2950 ["cf::object::player" => qw(player)],
2744 ["cf::player" => qw(peaceful)], 2951 ["cf::player" => qw(peaceful)],
2745 ["cf::map" => qw(trigger)], 2952 ["cf::map" => qw(trigger)],
2746) { 2953) {
2747 no strict 'refs'; 2954 no strict 'refs';
… …
2823# the server's init and main functions 3030# the server's init and main functions
2824 3031
2825sub load_facedata($) { 3032sub load_facedata($) {
2826 my ($path) = @_; 3033 my ($path) = @_;
2827 3034
3035 # HACK to clear player env face cache, we need some signal framework
3036 # for this (global event?)
3037 %ext::player_env::MUSIC_FACE_CACHE = ();
3038
2828 my $enc = JSON::XS->new->utf8->canonical; 3039 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2829 3040
2830 warn "loading facedata from $path\n"; 3041 warn "loading facedata from $path\n";
2831 3042
2832 my $facedata; 3043 my $facedata;
2833 0 < aio_load $path, $facedata 3044 0 < aio_load $path, $facedata
… …
2943 $ns->fx_want ($k, $v); 3154 $ns->fx_want ($k, $v);
2944 } 3155 }
2945}; 3156};
2946 3157
2947sub reload_regions { 3158sub reload_regions {
3159 # HACK to clear player env face cache, we need some signal framework
3160 # for this (global event?)
3161 %ext::player_env::MUSIC_FACE_CACHE = ();
3162
2948 load_resource_file "$MAPDIR/regions" 3163 load_resource_file "$MAPDIR/regions"
2949 or die "unable to load regions file\n"; 3164 or die "unable to load regions file\n";
2950 3165
2951 for (cf::region::list) { 3166 for (cf::region::list) {
2952 $_->{match} = qr/$_->{match}/ 3167 $_->{match} = qr/$_->{match}/
… …
2988 3203
2989sub init { 3204sub init {
2990 reload_resources; 3205 reload_resources;
2991} 3206}
2992 3207
2993sub cfg_load { 3208sub reload_config {
2994 open my $fh, "<:utf8", "$CONFDIR/config" 3209 open my $fh, "<:utf8", "$CONFDIR/config"
2995 or return; 3210 or return;
2996 3211
2997 local $/; 3212 local $/;
2998 *CFG = YAML::Syck::Load <$fh>; 3213 *CFG = YAML::Syck::Load <$fh>;
… …
3014sub main { 3229sub main {
3015 # we must not ever block the main coroutine 3230 # we must not ever block the main coroutine
3016 local $Coro::idle = sub { 3231 local $Coro::idle = sub {
3017 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3232 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3018 (async { 3233 (async {
3234 $Coro::current->{desc} = "IDLE BUG HANDLER";
3019 Event::one_event; 3235 Event::one_event;
3020 })->prio (Coro::PRIO_MAX); 3236 })->prio (Coro::PRIO_MAX);
3021 }; 3237 };
3022 3238
3023 cfg_load; 3239 reload_config;
3024 db_init; 3240 db_init;
3025 load_extensions; 3241 load_extensions;
3026 3242
3027 $TICK_WATCHER->start; 3243 $TICK_WATCHER->start;
3028 Event::loop; 3244 Event::loop;
… …
3095 # and maps saved/destroyed asynchronously. 3311 # and maps saved/destroyed asynchronously.
3096 warn "begin emergency player save\n"; 3312 warn "begin emergency player save\n";
3097 for my $login (keys %cf::PLAYER) { 3313 for my $login (keys %cf::PLAYER) {
3098 my $pl = $cf::PLAYER{$login} or next; 3314 my $pl = $cf::PLAYER{$login} or next;
3099 $pl->valid or next; 3315 $pl->valid or next;
3316 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3100 $pl->save; 3317 $pl->save;
3101 } 3318 }
3102 warn "end emergency player save\n"; 3319 warn "end emergency player save\n";
3103 3320
3104 warn "begin emergency map save\n"; 3321 warn "begin emergency map save\n";
… …
3221 warn "reloading cf.pm"; 3438 warn "reloading cf.pm";
3222 require cf; 3439 require cf;
3223 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3440 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3224 3441
3225 warn "loading config and database again"; 3442 warn "loading config and database again";
3226 cf::cfg_load; 3443 cf::reload_config;
3227 3444
3228 warn "loading extensions"; 3445 warn "loading extensions";
3229 cf::load_extensions; 3446 cf::load_extensions;
3230 3447
3231 warn "reattaching attachments to objects/players"; 3448 warn "reattaching attachments to objects/players";
… …
3267register_command "reload" => sub { 3484register_command "reload" => sub {
3268 my ($who, $arg) = @_; 3485 my ($who, $arg) = @_;
3269 3486
3270 if ($who->flag (FLAG_WIZ)) { 3487 if ($who->flag (FLAG_WIZ)) {
3271 $who->message ("reloading server."); 3488 $who->message ("reloading server.");
3489 async {
3490 $Coro::current->{desc} = "perl_reload";
3272 async { reload_perl }; 3491 reload_perl;
3492 };
3273 } 3493 }
3274}; 3494};
3275 3495
3276unshift @INC, $LIBDIR; 3496unshift @INC, $LIBDIR;
3277 3497
… …
3296 my $signal = new Coro::Signal; 3516 my $signal = new Coro::Signal;
3297 push @WAIT_FOR_TICK_BEGIN, $signal; 3517 push @WAIT_FOR_TICK_BEGIN, $signal;
3298 $signal->wait; 3518 $signal->wait;
3299} 3519}
3300 3520
3301 my $min = 1e6;#d#
3302 my $avg = 10;
3303$TICK_WATCHER = Event->timer ( 3521$TICK_WATCHER = Event->timer (
3304 reentrant => 0, 3522 reentrant => 0,
3305 parked => 1, 3523 parked => 1,
3306 prio => 0, 3524 prio => 0,
3307 at => $NEXT_TICK || $TICK, 3525 at => $NEXT_TICK || $TICK,
… …
3315 3533
3316 $NOW = $tick_start = Event::time; 3534 $NOW = $tick_start = Event::time;
3317 3535
3318 cf::server_tick; # one server iteration 3536 cf::server_tick; # one server iteration
3319 3537
3320 0 && sync_job {#d#
3321 for(1..10) {
3322 my $t = Event::time;
3323 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3324 or die;
3325
3326 $map->width (50);
3327 $map->height (50);
3328 $map->alloc;
3329 $map->_load_objects ("/tmp/x.map", 1);
3330 my $t = Event::time - $t;
3331
3332 #next unless $t < 0.0013;#d#
3333 if ($t < $min) {
3334 $min = $t;
3335 }
3336 $avg = $avg * 0.99 + $t * 0.01;
3337 }
3338 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3339 exit 0;
3340 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3341 };
3342
3343 $RUNTIME += $TICK; 3538 $RUNTIME += $TICK;
3344 $NEXT_TICK += $TICK; 3539 $NEXT_TICK += $TICK;
3345 3540
3346 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3541 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3347 $NEXT_RUNTIME_WRITE = $NOW + 10; 3542 $NEXT_RUNTIME_WRITE = $NOW + 10;
3348 Coro::async_pool { 3543 Coro::async_pool {
3544 $Coro::current->{desc} = "runtime saver";
3349 write_runtime 3545 write_runtime
3350 or warn "ERROR: unable to write runtime file: $!"; 3546 or warn "ERROR: unable to write runtime file: $!";
3351 }; 3547 };
3352 } 3548 }
3353 3549
3354# my $AFTER = Event::time;
3355# warn $AFTER - $NOW;#d#
3356
3357 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3550 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3358 $sig->send; 3551 $sig->send;
3359 } 3552 }
3360 while (my $sig = shift @WAIT_FOR_TICK) { 3553 while (my $sig = shift @WAIT_FOR_TICK) {
3361 $sig->send; 3554 $sig->send;
… …
3371 3564
3372 $LOAD = ($NOW - $tick_start) / $TICK; 3565 $LOAD = ($NOW - $tick_start) / $TICK;
3373 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3566 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3374 3567
3375 _post_tick; 3568 _post_tick;
3376
3377
3378 }, 3569 },
3379); 3570);
3380 3571
3381{ 3572{
3573 BDB::min_parallel 8;
3382 BDB::max_poll_time $TICK * 0.1; 3574 BDB::max_poll_time $TICK * 0.1;
3383 $BDB_POLL_WATCHER = Event->io ( 3575 $BDB_POLL_WATCHER = Event->io (
3384 reentrant => 0, 3576 reentrant => 0,
3385 fd => BDB::poll_fileno, 3577 fd => BDB::poll_fileno,
3386 poll => 'r', 3578 poll => 'r',
3387 prio => 0, 3579 prio => 0,
3388 data => WF_AUTOCANCEL, 3580 data => WF_AUTOCANCEL,
3389 cb => \&BDB::poll_cb, 3581 cb => \&BDB::poll_cb,
3390 ); 3582 );
3391 BDB::min_parallel 8;
3392 3583
3393 BDB::set_sync_prepare { 3584 BDB::set_sync_prepare {
3394 my $status; 3585 my $status;
3395 my $current = $Coro::current; 3586 my $current = $Coro::current;
3396 ( 3587 (
… …
3405 ) 3596 )
3406 }; 3597 };
3407 3598
3408 unless ($DB_ENV) { 3599 unless ($DB_ENV) {
3409 $DB_ENV = BDB::db_env_create; 3600 $DB_ENV = BDB::db_env_create;
3601 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3602 | BDB::LOG_AUTOREMOVE, 1);
3603 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3604 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3410 3605
3411 cf::sync_job { 3606 cf::sync_job {
3412 eval { 3607 eval {
3413 BDB::db_env_open 3608 BDB::db_env_open
3414 $DB_ENV, 3609 $DB_ENV,
… …
3416 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3611 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3417 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3612 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3418 0666; 3613 0666;
3419 3614
3420 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3615 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3421
3422 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3423 $DB_ENV->set_lk_detect;
3424 }; 3616 };
3425 3617
3426 cf::cleanup "db_env_open(db): $@" if $@; 3618 cf::cleanup "db_env_open(db): $@" if $@;
3427 }; 3619 };
3428 } 3620 }
3621
3622 $BDB_DEADLOCK_WATCHER = Event->timer (
3623 after => 3,
3624 interval => 1,
3625 hard => 1,
3626 prio => 0,
3627 data => WF_AUTOCANCEL,
3628 cb => sub {
3629 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3630 },
3631 );
3632 $BDB_CHECKPOINT_WATCHER = Event->timer (
3633 after => 11,
3634 interval => 60,
3635 hard => 1,
3636 prio => 0,
3637 data => WF_AUTOCANCEL,
3638 cb => sub {
3639 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3640 },
3641 );
3642 $BDB_TRICKLE_WATCHER = Event->timer (
3643 after => 5,
3644 interval => 10,
3645 hard => 1,
3646 prio => 0,
3647 data => WF_AUTOCANCEL,
3648 cb => sub {
3649 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3650 },
3651 );
3429} 3652}
3430 3653
3431{ 3654{
3432 IO::AIO::min_parallel 8; 3655 IO::AIO::min_parallel 8;
3433 3656
… …
3436 $AIO_POLL_WATCHER = Event->io ( 3659 $AIO_POLL_WATCHER = Event->io (
3437 reentrant => 0, 3660 reentrant => 0,
3438 data => WF_AUTOCANCEL, 3661 data => WF_AUTOCANCEL,
3439 fd => IO::AIO::poll_fileno, 3662 fd => IO::AIO::poll_fileno,
3440 poll => 'r', 3663 poll => 'r',
3441 prio => 6, 3664 prio => 0,
3442 cb => \&IO::AIO::poll_cb, 3665 cb => \&IO::AIO::poll_cb,
3443 ); 3666 );
3444} 3667}
3445 3668
3446my $_log_backtrace; 3669my $_log_backtrace;
… …
3452 3675
3453 # limit the # of concurrent backtraces 3676 # limit the # of concurrent backtraces
3454 if ($_log_backtrace < 2) { 3677 if ($_log_backtrace < 2) {
3455 ++$_log_backtrace; 3678 ++$_log_backtrace;
3456 async { 3679 async {
3680 $Coro::current->{desc} = "abt $msg";
3681
3457 my @bt = fork_call { 3682 my @bt = fork_call {
3458 @addr = map { sprintf "%x", $_ } @addr; 3683 @addr = map { sprintf "%x", $_ } @addr;
3459 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3684 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3460 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3685 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3461 or die "addr2line: $!"; 3686 or die "addr2line: $!";

Diff Legend

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