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.391 by root, Fri Oct 26 04:22:05 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
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";
… …
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
… …
1149 my ($type, $reply, @payload) = 1218 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1219 "ARRAY" eq ref $msg
1151 ? @$msg 1220 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1221 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1222
1223 my @reply;
1224
1154 if (my $cb = $EXTCMD{$type}) { 1225 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1226 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1227 }
1228
1229 $pl->ext_reply ($reply, @reply)
1230 if $reply;
1231
1160 } else { 1232 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1234 }
1163 1235
1164 cf::override; 1236 cf::override;
… …
1254 1326
1255=head3 cf::player 1327=head3 cf::player
1256 1328
1257=over 4 1329=over 4
1258 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
1259=item cf::player::find $login 1345=item cf::player::find $login
1260 1346
1261Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1262 1348
1263=cut 1349=cut
… …
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1388
1303 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
1304 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;
1305 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
1306 } 1397 }
1307 } 1398 }
1308} 1399}
1309 1400
… …
1319 1410
1320 aio_mkdir playerdir $pl, 0770; 1411 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1412 $pl->{last_save} = $cf::RUNTIME;
1322 1413
1323 $pl->save_pl ($path); 1414 $pl->save_pl ($path);
1324 Coro::cede; 1415 cf::cede_to_tick;
1325} 1416}
1326 1417
1327sub new($) { 1418sub new($) {
1328 my ($login) = @_; 1419 my ($login) = @_;
1329 1420
… …
1407 or return []; 1498 or return [];
1408 1499
1409 my @logins; 1500 my @logins;
1410 1501
1411 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") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1415 1511
1416 utf8::decode $login; 1512 utf8::decode $login;
1417 push @logins, $login; 1513 push @logins, $login;
1418 } 1514 }
1419 1515
… …
1452 1548
1453Expand crossfire pod fragments into protocol xml. 1549Expand crossfire pod fragments into protocol xml.
1454 1550
1455=cut 1551=cut
1456 1552
1553 use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 (?:
1558 \ (.*?)\ (?{ $group = $^N })
1559 | < (??{$interior}) >
1560 )
1561}x;
1562
1457sub expand_cfpod { 1563sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1564 my ($self, $pod) = @_;
1459 1565
1460 # escape & and < 1566 my $xml;
1461 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g;
1463 1567
1464 # this is buggy, it needs to properly take care of nested <'s 1568 while () {
1569 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?=[^<]) )+ )/xgcs) {
1570 $group = $1;
1465 1571
1466 1 while 1572 $group =~ s/&/&amp;/g;
1467 # replace B<>, I<>, U<> etc. 1573 $group =~ s/</&lt;/g;
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1574
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1575 $xml .= $group;
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1576 } elsif ($pod =~ m%\G
1471 # replace G<male|female> tags 1577 ([BCGHITU])
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1578 <
1473 $self->gender ? $2 : $1 1579 (?:
1474 }ge 1580 ([^<>]*) (?{ $group = $^N })
1475 # replace H<hint text> 1581 | < $interior >
1476 || s{H<([^\>]*)>} 1582 )
1583 >
1584 %gcsx
1477 { 1585 ) {
1586 my ($code, $data) = ($1, $group);
1587
1588 if ($code eq "B") {
1589 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1590 } elsif ($code eq "I") {
1591 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1592 } elsif ($code eq "U") {
1593 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1594 } elsif ($code eq "C") {
1595 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1596 } elsif ($code eq "T") {
1597 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1598 } elsif ($code eq "G") {
1599 my ($male, $female) = split /\|/, $data;
1600 $data = $self->gender ? $female : $male;
1601 $xml .= expand_cfpod ($self, $data);
1602 } elsif ($code eq "H") {
1478 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1603 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1479 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1604 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480 "") 1605 "")
1481 [$self->{hintmode}] 1606 [$self->{hintmode}];
1607 } else {
1608 $xml .= "error processing '$code($data)' directive";
1482 }ge; 1609 }
1610 } else {
1611 if ($pod =~ /\G(.+)/) {
1612 warn "parse error while expanding $pod (at $1)";
1613 }
1614 last;
1615 }
1616 }
1483 1617
1618 for ($xml) {
1484 # create single paragraphs (very hackish) 1619 # create single paragraphs (very hackish)
1485 s/(?<=\S)\n(?=\w)/ /g; 1620 s/(?<=\S)\n(?=\w)/ /g;
1486 1621
1487 # compress some whitespace 1622 # compress some whitespace
1488 s/\s+\n/\n/g; # ws line-ends 1623 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines 1624 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines 1625 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines 1626 s/\n+$//; # ending lines
1627 }
1492 1628
1493 $_ 1629 $xml
1494} 1630}
1495 1631
1496sub hintmode { 1632sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1; 1633 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode} 1634 $_[0]{hintmode}
… …
1743 1879
1744sub load_header_from($) { 1880sub load_header_from($) {
1745 my ($self, $path) = @_; 1881 my ($self, $path) = @_;
1746 1882
1747 utf8::encode $path; 1883 utf8::encode $path;
1748 #aio_open $path, O_RDONLY, 0 1884 my $f = new_from_file cf::object::thawer $path
1749 # or return;
1750
1751 $self->_load_header ($path)
1752 or return; 1885 or return;
1886
1887 $self->_load_header ($f)
1888 or return;
1889
1890 local $MAP_LOADING{$self->{path}} = $self;
1891 $f->resolve_delayed_derefs;
1753 1892
1754 $self->{load_path} = $path; 1893 $self->{load_path} = $path;
1755 1894
1756 1 1895 1
1757} 1896}
… …
1811sub find { 1950sub find {
1812 my ($path, $origin) = @_; 1951 my ($path, $origin) = @_;
1813 1952
1814 $path = normalise $path, $origin && $origin->path; 1953 $path = normalise $path, $origin && $origin->path;
1815 1954
1955 cf::lock_wait "map_data:$path";#d#remove
1816 cf::lock_wait "map_find:$path"; 1956 cf::lock_wait "map_find:$path";
1817 1957
1818 $cf::MAP{$path} || do { 1958 $cf::MAP{$path} || do {
1819 my $guard = cf::lock_acquire "map_find:$path"; 1959 my $guard1 = cf::lock_acquire "map_find:$path";
1960 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961
1820 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1821 or return; 1963 or return;
1822 1964
1823 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1824 1966
… …
1826 or return; 1968 or return;
1827 1969
1828 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1829 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1830 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard1;
1974 undef $guard2;
1831 $map->reset; 1975 $map->reset;
1832 undef $guard;
1833 return find $path; 1976 return find $path;
1834 } 1977 }
1835 1978
1836 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1837 } 1980 }
… …
1846 local $self->{deny_reset} = 1; # loading can take a long time 1989 local $self->{deny_reset} = 1; # loading can take a long time
1847 1990
1848 my $path = $self->{path}; 1991 my $path = $self->{path};
1849 1992
1850 { 1993 {
1851 my $guard = cf::lock_acquire "map_load:$path"; 1994 my $guard = cf::lock_acquire "map_data:$path";
1852 1995
1996 return unless $self->valid;
1853 return if $self->in_memory != cf::MAP_SWAPPED; 1997 return unless $self->in_memory == cf::MAP_SWAPPED;
1854 1998
1855 $self->in_memory (cf::MAP_LOADING); 1999 $self->in_memory (cf::MAP_LOADING);
1856 2000
1857 $self->alloc; 2001 $self->alloc;
1858 2002
1859 $self->pre_load; 2003 $self->pre_load;
1860 Coro::cede; 2004 cf::cede_to_tick;
1861 2005
2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block;
1862 $self->_load_objects ($self->{load_path}, 1) 2008 $self->_load_objects ($f)
1863 or return; 2009 or return;
1864 2010
1865 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1866 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1867 2013
1868 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1869 utf8::encode $uniq; 2015 utf8::encode $uniq;
1870 if (aio_open $uniq, O_RDONLY, 0) { 2016 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) {
1871 $self->clear_unique_items; 2018 $self->clear_unique_items;
1872 $self->_load_objects ($uniq, 0); 2019 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs;
2021 }
1873 } 2022 }
1874 } 2023 }
1875 2024
1876 Coro::cede; 2025 $f->resolve_delayed_derefs;
2026
2027 cf::cede_to_tick;
1877 # now do the right thing for maps 2028 # now do the right thing for maps
1878 $self->link_multipart_objects; 2029 $self->link_multipart_objects;
1879 $self->difficulty ($self->estimate_difficulty) 2030 $self->difficulty ($self->estimate_difficulty)
1880 unless $self->difficulty; 2031 unless $self->difficulty;
1881 Coro::cede; 2032 cf::cede_to_tick;
1882 2033
1883 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
1884 $self->decay_objects; 2035 $self->decay_objects;
1885 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
1886 $self->update_buttons; 2037 $self->update_buttons;
1887 Coro::cede; 2038 cf::cede_to_tick;
1888 $self->set_darkness_map; 2039 $self->set_darkness_map;
1889 Coro::cede; 2040 cf::cede_to_tick;
1890 $self->activate; 2041 $self->activate;
1891 } 2042 }
1892 2043
1893 $self->{last_save} = $cf::RUNTIME; 2044 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME); 2045 $self->last_access ($cf::RUNTIME);
… …
1944} 2095}
1945 2096
1946sub do_load_sync { 2097sub do_load_sync {
1947 my ($map) = @_; 2098 my ($map) = @_;
1948 2099
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main;
2102
1949 cf::sync_job { $map->load }; 2103 cf::sync_job { $map->load };
1950} 2104}
1951 2105
1952our %MAP_PREFETCH; 2106our %MAP_PREFETCH;
1953our $MAP_PREFETCHER = undef; 2107our $MAP_PREFETCHER = undef;
1954 2108
1955sub find_async { 2109sub find_async {
1956 my ($path, $origin) = @_; 2110 my ($path, $origin, $load) = @_;
1957 2111
1958 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
1959 2113
1960 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
1961 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1962 } 2116 }
1963 2117
1964 undef $MAP_PREFETCH{$path}; 2118 $MAP_PREFETCH{$path} |= $load;
2119
1965 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
2121 $Coro::current->{desc} = "map prefetcher";
2122
1966 while (%MAP_PREFETCH) { 2123 while (%MAP_PREFETCH) {
1967 for my $path (keys %MAP_PREFETCH) { 2124 while (my ($k, $v) = each %MAP_PREFETCH) {
1968 if (my $map = find $path) { 2125 if (my $map = find $k) {
1969 $map->load; 2126 $map->load if $v;
1970 } 2127 }
1971 2128
1972 delete $MAP_PREFETCH{$path}; 2129 delete $MAP_PREFETCH{$k};
1973 } 2130 }
1974 } 2131 }
1975 undef $MAP_PREFETCHER; 2132 undef $MAP_PREFETCHER;
1976 }; 2133 };
1977 $MAP_PREFETCHER->prio (6); 2134 $MAP_PREFETCHER->prio (6);
… …
1980} 2137}
1981 2138
1982sub save { 2139sub save {
1983 my ($self) = @_; 2140 my ($self) = @_;
1984 2141
1985 my $lock = cf::lock_acquire "map_data:" . $self->path; 2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
1986 2143
1987 $self->{last_save} = $cf::RUNTIME; 2144 $self->{last_save} = $cf::RUNTIME;
1988 2145
1989 return unless $self->dirty; 2146 return unless $self->dirty;
1990 2147
… …
1996 return if $self->{deny_save}; 2153 return if $self->{deny_save};
1997 2154
1998 local $self->{last_access} = $self->last_access;#d# 2155 local $self->{last_access} = $self->last_access;#d#
1999 2156
2000 cf::async { 2157 cf::async {
2158 $Coro::current->{desc} = "map player save";
2001 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
2002 }; 2160 };
2003 2161
2004 if ($uniq) { 2162 if ($uniq) {
2005 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2013 my ($self) = @_; 2171 my ($self) = @_;
2014 2172
2015 # save first because save cedes 2173 # save first because save cedes
2016 $self->save; 2174 $self->save;
2017 2175
2018 my $lock = cf::lock_acquire "map_data:" . $self->path; 2176 my $lock = cf::lock_acquire "map_data:$self->{path}";
2019 2177
2020 return if $self->players; 2178 return if $self->players;
2021 return if $self->in_memory != cf::MAP_IN_MEMORY; 2179 return if $self->in_memory != cf::MAP_IN_MEMORY;
2022 return if $self->{deny_save}; 2180 return if $self->{deny_save};
2023 2181
2182 $self->in_memory (cf::MAP_SWAPPED);
2183
2184 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP;
2024 $self->clear; 2186 $self->clear;
2025 $self->in_memory (cf::MAP_SWAPPED);
2026} 2187}
2027 2188
2028sub reset_at { 2189sub reset_at {
2029 my ($self) = @_; 2190 my ($self) = @_;
2030 2191
… …
2062 if $uniq; 2223 if $uniq;
2063 } 2224 }
2064 2225
2065 delete $cf::MAP{$self->path}; 2226 delete $cf::MAP{$self->path};
2066 2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
2067 $self->clear; 2230 $self->clear;
2068
2069 $_->clear_links_to ($self) for values %cf::MAP;
2070 2231
2071 $self->unlink_save; 2232 $self->unlink_save;
2072 $self->destroy; 2233 $self->destroy;
2073} 2234}
2074 2235
2075my $nuke_counter = "aaaa"; 2236my $nuke_counter = "aaaa";
2076 2237
2077sub nuke { 2238sub nuke {
2078 my ($self) = @_; 2239 my ($self) = @_;
2079 2240
2241 {
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
2080 delete $cf::MAP{$self->path}; 2244 delete $cf::MAP{$self->path};
2081 2245
2082 $self->unlink_save; 2246 $self->unlink_save;
2083 2247
2084 bless $self, "cf::map"; 2248 bless $self, "cf::map";
2085 delete $self->{deny_reset}; 2249 delete $self->{deny_reset};
2086 $self->{deny_save} = 1; 2250 $self->{deny_save} = 1;
2087 $self->reset_timeout (1); 2251 $self->reset_timeout (1);
2088 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2089 2253
2090 $cf::MAP{$self->path} = $self; 2254 $cf::MAP{$self->path} = $self;
2255 }
2091 2256
2092 $self->reset; # polite request, might not happen 2257 $self->reset; # polite request, might not happen
2093} 2258}
2094 2259
2095=item $maps = cf::map::tmp_maps 2260=item $maps = cf::map::tmp_maps
… …
2171 2336
2172sub inv_recursive { 2337sub inv_recursive {
2173 inv_recursive_ inv $_[0] 2338 inv_recursive_ inv $_[0]
2174} 2339}
2175 2340
2341=item $ref = $ob->ref
2342
2343creates and returns a persistent reference to an objetc that can be stored as a string.
2344
2345=item $ob = cf::object::deref ($refstring)
2346
2347returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2348even if the object actually exists. May block.
2349
2350=cut
2351
2352sub deref {
2353 my ($ref) = @_;
2354
2355 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2356 my ($uuid, $name) = ($1, $2);
2357 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2358 or return;
2359 $pl->ob->uuid eq $uuid
2360 or return;
2361
2362 $pl->ob
2363 } else {
2364 warn "$ref: cannot resolve object reference\n";
2365 undef
2366 }
2367}
2368
2176package cf; 2369package cf;
2177 2370
2178=back 2371=back
2179 2372
2180=head3 cf::object::player 2373=head3 cf::object::player
… …
2338 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2531 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2339 2532
2340 $self->enter_link; 2533 $self->enter_link;
2341 2534
2342 (async { 2535 (async {
2536 $Coro::current->{desc} = "player::goto $path $x $y";
2537
2538 # *tag paths override both path and x|y
2539 if ($path =~ /^\*(.*)$/) {
2540 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2541 my $ob = $obs[rand @obs];
2542
2543 # see if we actually can go there
2544 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2545 $ob = $obs[rand @obs];
2546 } else {
2547 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2548 }
2549 # else put us there anyways for now #d#
2550
2551 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2552 } else {
2553 ($path, $x, $y) = (undef, undef, undef);
2554 }
2555 }
2556
2343 my $map = eval { 2557 my $map = eval {
2344 my $map = cf::map::find $path; 2558 my $map = defined $path ? cf::map::find $path : undef;
2345 2559
2346 if ($map) { 2560 if ($map) {
2347 $map = $map->customise_for ($self); 2561 $map = $map->customise_for ($self);
2348 $map = $check->($map) if $check && $map; 2562 $map = $check->($map) if $check && $map;
2349 } else { 2563 } else {
2350 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2564 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2351 } 2565 }
2352 2566
2353 $map 2567 $map
2354 }; 2568 };
2355 2569
… …
2445 # if exit is damned, update players death & WoR home-position 2659 # if exit is damned, update players death & WoR home-position
2446 $self->contr->savebed ($slaying, $hp, $sp) 2660 $self->contr->savebed ($slaying, $hp, $sp)
2447 if $exit->flag (FLAG_DAMNED); 2661 if $exit->flag (FLAG_DAMNED);
2448 2662
2449 (async { 2663 (async {
2664 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2665
2450 $self->deactivate_recursive; # just to be sure 2666 $self->deactivate_recursive; # just to be sure
2451 unless (eval { 2667 unless (eval {
2452 $self->goto ($slaying, $hp, $sp); 2668 $self->goto ($slaying, $hp, $sp);
2453 2669
2454 1; 2670 1;
… …
2489the message, with C<log> being the default. If C<$color> is negative, suppress 2705the message, with C<log> being the default. If C<$color> is negative, suppress
2490the message unless the client supports the msg packet. 2706the message unless the client supports the msg packet.
2491 2707
2492=cut 2708=cut
2493 2709
2710# non-persistent channels (usually the info channel)
2711our %CHANNEL = (
2712 "c/identify" => {
2713 id => "infobox",
2714 title => "Identify",
2715 reply => undef,
2716 tooltip => "Items recently identified",
2717 },
2718 "c/examine" => {
2719 id => "infobox",
2720 title => "Examine",
2721 reply => undef,
2722 tooltip => "Signs and other items you examined",
2723 },
2724 "c/book" => {
2725 id => "infobox",
2726 title => "Book",
2727 reply => undef,
2728 tooltip => "The contents of a note or book",
2729 },
2730 "c/lookat" => {
2731 id => "infobox",
2732 title => "Look",
2733 reply => undef,
2734 tooltip => "What you saw there",
2735 },
2736 "c/who" => {
2737 id => "infobox",
2738 title => "Players",
2739 reply => undef,
2740 tooltip => "Shows players who are currently online",
2741 },
2742 "c/body" => {
2743 id => "infobox",
2744 title => "Body Parts",
2745 reply => undef,
2746 tooltip => "Shows which body parts you posess and are available",
2747 },
2748 "c/uptime" => {
2749 id => "infobox",
2750 title => "Uptime",
2751 reply => undef,
2752 tooltip => "How long the server has been running since last restart",
2753 },
2754 "c/mapinfo" => {
2755 id => "infobox",
2756 title => "Map Info",
2757 reply => undef,
2758 tooltip => "Information related to the maps",
2759 },
2760);
2761
2494sub cf::client::send_msg { 2762sub cf::client::send_msg {
2495 my ($self, $channel, $msg, $color, @extra) = @_; 2763 my ($self, $channel, $msg, $color, @extra) = @_;
2496 2764
2497 $msg = $self->pl->expand_cfpod ($msg); 2765 $msg = $self->pl->expand_cfpod ($msg);
2498 2766
2499 $color &= cf::NDI_CLIENT_MASK; # just in case... 2767 $color &= cf::NDI_CLIENT_MASK; # just in case...
2500 2768
2769 # check predefined channels, for the benefit of C
2770 if ($CHANNEL{$channel}) {
2771 $channel = $CHANNEL{$channel};
2772
2773 $self->ext_msg (channel_info => $channel)
2774 if $self->can_msg;
2775
2776 $channel = $channel->{id};
2777
2501 if (ref $channel) { 2778 } elsif (ref $channel) {
2502 # send meta info to client, if not yet sent 2779 # send meta info to client, if not yet sent
2503 unless (exists $self->{channel}{$channel->{id}}) { 2780 unless (exists $self->{channel}{$channel->{id}}) {
2504 $self->{channel}{$channel->{id}} = $channel; 2781 $self->{channel}{$channel->{id}} = $channel;
2505 $self->ext_msg (channel_info => $channel); 2782 $self->ext_msg (channel_info => $channel)
2783 if $self->can_msg;
2506 } 2784 }
2507 2785
2508 $channel = $channel->{id}; 2786 $channel = $channel->{id};
2509 } 2787 }
2510 2788
… …
2551=cut 2829=cut
2552 2830
2553sub cf::client::ext_msg($$@) { 2831sub cf::client::ext_msg($$@) {
2554 my ($self, $type, @msg) = @_; 2832 my ($self, $type, @msg) = @_;
2555 2833
2556 my $extcmd = $self->extcmd;
2557
2558 if ($extcmd == 2) { 2834 if ($self->extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2835 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove 2836 } elsif ($self->extcmd == 1) { # TODO: remove
2561 push @msg, msgtype => "event_$type"; 2837 push @msg, msgtype => "event_$type";
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2838 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 } 2839 }
2564} 2840}
2565 2841
… …
2572sub cf::client::ext_reply($$@) { 2848sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_; 2849 my ($self, $id, @msg) = @_;
2574 2850
2575 if ($self->extcmd == 2) { 2851 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2852 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) { 2853 } elsif ($self->extcmd == 1) {
2578 #TODO: version 1, remove 2854 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id; 2855 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2856 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2857 }
2582} 2858}
… …
2646 my ($type, $reply, @payload) = 2922 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2923 "ARRAY" eq ref $msg
2648 ? @$msg 2924 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2925 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 2926
2927 my @reply;
2928
2651 if (my $cb = $EXTICMD{$type}) { 2929 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 2930 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 2931 }
2932
2933 $ns->ext_reply ($reply, @reply)
2934 if $reply;
2935
2657 } else { 2936 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2937 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 2938 }
2660 2939
2661 cf::override; 2940 cf::override;
… …
2721=pod 3000=pod
2722 3001
2723The following functions and methods are available within a safe environment: 3002The following functions and methods are available within a safe environment:
2724 3003
2725 cf::object 3004 cf::object
2726 contr pay_amount pay_player map x y force_find force_add 3005 contr pay_amount pay_player map x y force_find force_add destroy
2727 insert remove name archname title slaying race 3006 insert remove name archname title slaying race decrease_ob_nr
2728 3007
2729 cf::object::player 3008 cf::object::player
2730 player 3009 player
2731 3010
2732 cf::player 3011 cf::player
… …
2737 3016
2738=cut 3017=cut
2739 3018
2740for ( 3019for (
2741 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3020 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2742 insert remove inv name archname title slaying race)], 3021 insert remove inv name archname title slaying race
3022 decrease_ob_nr destroy)],
2743 ["cf::object::player" => qw(player)], 3023 ["cf::object::player" => qw(player)],
2744 ["cf::player" => qw(peaceful)], 3024 ["cf::player" => qw(peaceful)],
2745 ["cf::map" => qw(trigger)], 3025 ["cf::map" => qw(trigger)],
2746) { 3026) {
2747 no strict 'refs'; 3027 no strict 'refs';
… …
2823# the server's init and main functions 3103# the server's init and main functions
2824 3104
2825sub load_facedata($) { 3105sub load_facedata($) {
2826 my ($path) = @_; 3106 my ($path) = @_;
2827 3107
3108 # HACK to clear player env face cache, we need some signal framework
3109 # for this (global event?)
3110 %ext::player_env::MUSIC_FACE_CACHE = ();
3111
2828 my $enc = JSON::XS->new->utf8->canonical; 3112 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2829 3113
2830 warn "loading facedata from $path\n"; 3114 warn "loading facedata from $path\n";
2831 3115
2832 my $facedata; 3116 my $facedata;
2833 0 < aio_load $path, $facedata 3117 0 < aio_load $path, $facedata
… …
2943 $ns->fx_want ($k, $v); 3227 $ns->fx_want ($k, $v);
2944 } 3228 }
2945}; 3229};
2946 3230
2947sub reload_regions { 3231sub reload_regions {
3232 # HACK to clear player env face cache, we need some signal framework
3233 # for this (global event?)
3234 %ext::player_env::MUSIC_FACE_CACHE = ();
3235
2948 load_resource_file "$MAPDIR/regions" 3236 load_resource_file "$MAPDIR/regions"
2949 or die "unable to load regions file\n"; 3237 or die "unable to load regions file\n";
2950 3238
2951 for (cf::region::list) { 3239 for (cf::region::list) {
2952 $_->{match} = qr/$_->{match}/ 3240 $_->{match} = qr/$_->{match}/
… …
2988 3276
2989sub init { 3277sub init {
2990 reload_resources; 3278 reload_resources;
2991} 3279}
2992 3280
2993sub cfg_load { 3281sub reload_config {
2994 open my $fh, "<:utf8", "$CONFDIR/config" 3282 open my $fh, "<:utf8", "$CONFDIR/config"
2995 or return; 3283 or return;
2996 3284
2997 local $/; 3285 local $/;
2998 *CFG = YAML::Syck::Load <$fh>; 3286 *CFG = YAML::Syck::Load <$fh>;
… …
3014sub main { 3302sub main {
3015 # we must not ever block the main coroutine 3303 # we must not ever block the main coroutine
3016 local $Coro::idle = sub { 3304 local $Coro::idle = sub {
3017 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3305 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3018 (async { 3306 (async {
3307 $Coro::current->{desc} = "IDLE BUG HANDLER";
3019 Event::one_event; 3308 Event::one_event;
3020 })->prio (Coro::PRIO_MAX); 3309 })->prio (Coro::PRIO_MAX);
3021 }; 3310 };
3022 3311
3023 cfg_load; 3312 reload_config;
3024 db_init; 3313 db_init;
3025 load_extensions; 3314 load_extensions;
3026 3315
3027 $TICK_WATCHER->start; 3316 $TICK_WATCHER->start;
3028 Event::loop; 3317 Event::loop;
… …
3095 # and maps saved/destroyed asynchronously. 3384 # and maps saved/destroyed asynchronously.
3096 warn "begin emergency player save\n"; 3385 warn "begin emergency player save\n";
3097 for my $login (keys %cf::PLAYER) { 3386 for my $login (keys %cf::PLAYER) {
3098 my $pl = $cf::PLAYER{$login} or next; 3387 my $pl = $cf::PLAYER{$login} or next;
3099 $pl->valid or next; 3388 $pl->valid or next;
3389 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3100 $pl->save; 3390 $pl->save;
3101 } 3391 }
3102 warn "end emergency player save\n"; 3392 warn "end emergency player save\n";
3103 3393
3104 warn "begin emergency map save\n"; 3394 warn "begin emergency map save\n";
… …
3152 3442
3153 warn "flushing outstanding aio requests"; 3443 warn "flushing outstanding aio requests";
3154 for (;;) { 3444 for (;;) {
3155 BDB::flush; 3445 BDB::flush;
3156 IO::AIO::flush; 3446 IO::AIO::flush;
3157 Coro::cede; 3447 Coro::cede_notself;
3158 last unless IO::AIO::nreqs || BDB::nreqs; 3448 last unless IO::AIO::nreqs || BDB::nreqs;
3159 warn "iterate..."; 3449 warn "iterate...";
3160 } 3450 }
3161 3451
3162 ++$RELOAD; 3452 ++$RELOAD;
… …
3221 warn "reloading cf.pm"; 3511 warn "reloading cf.pm";
3222 require cf; 3512 require cf;
3223 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3513 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3224 3514
3225 warn "loading config and database again"; 3515 warn "loading config and database again";
3226 cf::cfg_load; 3516 cf::reload_config;
3227 3517
3228 warn "loading extensions"; 3518 warn "loading extensions";
3229 cf::load_extensions; 3519 cf::load_extensions;
3230 3520
3231 warn "reattaching attachments to objects/players"; 3521 warn "reattaching attachments to objects/players";
… …
3267register_command "reload" => sub { 3557register_command "reload" => sub {
3268 my ($who, $arg) = @_; 3558 my ($who, $arg) = @_;
3269 3559
3270 if ($who->flag (FLAG_WIZ)) { 3560 if ($who->flag (FLAG_WIZ)) {
3271 $who->message ("reloading server."); 3561 $who->message ("reloading server.");
3562 async {
3563 $Coro::current->{desc} = "perl_reload";
3272 async { reload_perl }; 3564 reload_perl;
3565 };
3273 } 3566 }
3274}; 3567};
3275 3568
3276unshift @INC, $LIBDIR; 3569unshift @INC, $LIBDIR;
3277 3570
… …
3296 my $signal = new Coro::Signal; 3589 my $signal = new Coro::Signal;
3297 push @WAIT_FOR_TICK_BEGIN, $signal; 3590 push @WAIT_FOR_TICK_BEGIN, $signal;
3298 $signal->wait; 3591 $signal->wait;
3299} 3592}
3300 3593
3301 my $min = 1e6;#d#
3302 my $avg = 10;
3303$TICK_WATCHER = Event->timer ( 3594$TICK_WATCHER = Event->timer (
3304 reentrant => 0, 3595 reentrant => 0,
3305 parked => 1, 3596 parked => 1,
3306 prio => 0, 3597 prio => 0,
3307 at => $NEXT_TICK || $TICK, 3598 at => $NEXT_TICK || $TICK,
… …
3315 3606
3316 $NOW = $tick_start = Event::time; 3607 $NOW = $tick_start = Event::time;
3317 3608
3318 cf::server_tick; # one server iteration 3609 cf::server_tick; # one server iteration
3319 3610
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; 3611 $RUNTIME += $TICK;
3344 $NEXT_TICK += $TICK; 3612 $NEXT_TICK += $TICK;
3345 3613
3346 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3614 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3347 $NEXT_RUNTIME_WRITE = $NOW + 10; 3615 $NEXT_RUNTIME_WRITE = $NOW + 10;
3348 Coro::async_pool { 3616 Coro::async_pool {
3617 $Coro::current->{desc} = "runtime saver";
3349 write_runtime 3618 write_runtime
3350 or warn "ERROR: unable to write runtime file: $!"; 3619 or warn "ERROR: unable to write runtime file: $!";
3351 }; 3620 };
3352 } 3621 }
3353 3622
3354# my $AFTER = Event::time;
3355# warn $AFTER - $NOW;#d#
3356
3357 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3623 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3358 $sig->send; 3624 $sig->send;
3359 } 3625 }
3360 while (my $sig = shift @WAIT_FOR_TICK) { 3626 while (my $sig = shift @WAIT_FOR_TICK) {
3361 $sig->send; 3627 $sig->send;
… …
3371 3637
3372 $LOAD = ($NOW - $tick_start) / $TICK; 3638 $LOAD = ($NOW - $tick_start) / $TICK;
3373 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3639 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3374 3640
3375 _post_tick; 3641 _post_tick;
3376
3377
3378 }, 3642 },
3379); 3643);
3380 3644
3381{ 3645{
3646 BDB::min_parallel 8;
3382 BDB::max_poll_time $TICK * 0.1; 3647 BDB::max_poll_time $TICK * 0.1;
3383 $BDB_POLL_WATCHER = Event->io ( 3648 $BDB_POLL_WATCHER = Event->io (
3384 reentrant => 0, 3649 reentrant => 0,
3385 fd => BDB::poll_fileno, 3650 fd => BDB::poll_fileno,
3386 poll => 'r', 3651 poll => 'r',
3387 prio => 0, 3652 prio => 0,
3388 data => WF_AUTOCANCEL, 3653 data => WF_AUTOCANCEL,
3389 cb => \&BDB::poll_cb, 3654 cb => \&BDB::poll_cb,
3390 ); 3655 );
3391 BDB::min_parallel 8;
3392 3656
3393 BDB::set_sync_prepare { 3657 BDB::set_sync_prepare {
3394 my $status; 3658 my $status;
3395 my $current = $Coro::current; 3659 my $current = $Coro::current;
3396 ( 3660 (
… …
3405 ) 3669 )
3406 }; 3670 };
3407 3671
3408 unless ($DB_ENV) { 3672 unless ($DB_ENV) {
3409 $DB_ENV = BDB::db_env_create; 3673 $DB_ENV = BDB::db_env_create;
3674 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3675 | BDB::LOG_AUTOREMOVE, 1);
3676 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3677 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3410 3678
3411 cf::sync_job { 3679 cf::sync_job {
3412 eval { 3680 eval {
3413 BDB::db_env_open 3681 BDB::db_env_open
3414 $DB_ENV, 3682 $DB_ENV,
… …
3416 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3684 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3417 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3685 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3418 0666; 3686 0666;
3419 3687
3420 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3688 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 }; 3689 };
3425 3690
3426 cf::cleanup "db_env_open(db): $@" if $@; 3691 cf::cleanup "db_env_open(db): $@" if $@;
3427 }; 3692 };
3428 } 3693 }
3694
3695 $BDB_DEADLOCK_WATCHER = Event->timer (
3696 after => 3,
3697 interval => 1,
3698 hard => 1,
3699 prio => 0,
3700 data => WF_AUTOCANCEL,
3701 cb => sub {
3702 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3703 },
3704 );
3705 $BDB_CHECKPOINT_WATCHER = Event->timer (
3706 after => 11,
3707 interval => 60,
3708 hard => 1,
3709 prio => 0,
3710 data => WF_AUTOCANCEL,
3711 cb => sub {
3712 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3713 },
3714 );
3715 $BDB_TRICKLE_WATCHER = Event->timer (
3716 after => 5,
3717 interval => 10,
3718 hard => 1,
3719 prio => 0,
3720 data => WF_AUTOCANCEL,
3721 cb => sub {
3722 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3723 },
3724 );
3429} 3725}
3430 3726
3431{ 3727{
3432 IO::AIO::min_parallel 8; 3728 IO::AIO::min_parallel 8;
3433 3729
… …
3436 $AIO_POLL_WATCHER = Event->io ( 3732 $AIO_POLL_WATCHER = Event->io (
3437 reentrant => 0, 3733 reentrant => 0,
3438 data => WF_AUTOCANCEL, 3734 data => WF_AUTOCANCEL,
3439 fd => IO::AIO::poll_fileno, 3735 fd => IO::AIO::poll_fileno,
3440 poll => 'r', 3736 poll => 'r',
3441 prio => 6, 3737 prio => 0,
3442 cb => \&IO::AIO::poll_cb, 3738 cb => \&IO::AIO::poll_cb,
3443 ); 3739 );
3444} 3740}
3445 3741
3446my $_log_backtrace; 3742my $_log_backtrace;
… …
3452 3748
3453 # limit the # of concurrent backtraces 3749 # limit the # of concurrent backtraces
3454 if ($_log_backtrace < 2) { 3750 if ($_log_backtrace < 2) {
3455 ++$_log_backtrace; 3751 ++$_log_backtrace;
3456 async { 3752 async {
3753 $Coro::current->{desc} = "abt $msg";
3754
3457 my @bt = fork_call { 3755 my @bt = fork_call {
3458 @addr = map { sprintf "%x", $_ } @addr; 3756 @addr = map { sprintf "%x", $_ } @addr;
3459 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3757 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3460 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3758 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3461 or die "addr2line: $!"; 3759 or die "addr2line: $!";

Diff Legend

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