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.336 by root, Tue Aug 21 00:31:18 2007 UTC vs.
Revision 1.387 by root, Mon Oct 15 23:49:10 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::blocking_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;
1061 $av = eval { (Storable::thaw $av)->{objs} };
1062 }
1063 1126
1127 my $st = eval { Coro::Storable::thaw $av }
1128 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1129 $av = $st->{objs};
1130 }
1131
1132 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1133 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1134 $decname, length $data, scalar @{$av || []};
1135
1066 return ($data, $av); 1136 ($data, $av)
1067} 1137}
1068 1138
1069=head2 COMMAND CALLBACKS 1139=head2 COMMAND CALLBACKS
1070 1140
1071=over 4 1141=over 4
… …
1149 my ($type, $reply, @payload) = 1219 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1220 "ARRAY" eq ref $msg
1151 ? @$msg 1221 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1222 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1223
1224 my @reply;
1225
1154 if (my $cb = $EXTCMD{$type}) { 1226 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1227 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1228 }
1229
1230 $pl->ext_reply ($reply, @reply)
1231 if $reply;
1232
1160 } else { 1233 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1234 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1235 }
1163 1236
1164 cf::override; 1237 cf::override;
… …
1254 1327
1255=head3 cf::player 1328=head3 cf::player
1256 1329
1257=over 4 1330=over 4
1258 1331
1332=item cf::player::num_playing
1333
1334Returns the official number of playing players, as per the Crossfire metaserver rules.
1335
1336=cut
1337
1338sub num_playing {
1339 scalar grep
1340 $_->ob->map
1341 && !$_->hidden
1342 && !$_->ob->flag (cf::FLAG_WIZ),
1343 cf::player::list
1344}
1345
1259=item cf::player::find $login 1346=item cf::player::find $login
1260 1347
1261Returns the given player object, loading it if necessary (might block). 1348Returns the given player object, loading it if necessary (might block).
1262 1349
1263=cut 1350=cut
… …
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1385 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1386 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1387 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1388 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1389
1303 my $pl = load_pl path $login 1390 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1391 or return;
1392
1393 my $pl = cf::player::load_pl $f
1394 or return;
1395 local $cf::PLAYER_LOADING{$login} = $pl;
1396 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1397 $cf::PLAYER{$login} = $pl
1306 } 1398 }
1307 } 1399 }
1308} 1400}
1309 1401
… …
1319 1411
1320 aio_mkdir playerdir $pl, 0770; 1412 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1413 $pl->{last_save} = $cf::RUNTIME;
1322 1414
1323 $pl->save_pl ($path); 1415 $pl->save_pl ($path);
1324 Coro::cede; 1416 cf::cede_to_tick;
1325} 1417}
1326 1418
1327sub new($) { 1419sub new($) {
1328 my ($login) = @_; 1420 my ($login) = @_;
1329 1421
… …
1407 or return []; 1499 or return [];
1408 1500
1409 my @logins; 1501 my @logins;
1410 1502
1411 for my $login (@$dirs) { 1503 for my $login (@$dirs) {
1504 my $path = path $login;
1505
1506 # a .pst is a dead give-away for a valid player
1507 unless (-e "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1508 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1509 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1510 $buf !~ /^password -------------$/m or next; # official not-valid tag
1511 }
1415 1512
1416 utf8::decode $login; 1513 utf8::decode $login;
1417 push @logins, $login; 1514 push @logins, $login;
1418 } 1515 }
1419 1516
… …
1457sub expand_cfpod { 1554sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1555 ((my $self), (local $_)) = @_;
1459 1556
1460 # escape & and < 1557 # escape & and <
1461 s/&/&amp;/g; 1558 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g; 1559 s/(?<![BIUGHT])</&lt;/g;
1463 1560
1464 # this is buggy, it needs to properly take care of nested <'s 1561 # this is buggy, it needs to properly take care of nested <'s
1465 1562
1466 1 while 1563 1 while
1467 # replace B<>, I<>, U<> etc. 1564 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1565 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1566 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1567 || s/U<([^\>]*)>/<u>$1<\/u>/
1568 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1471 # replace G<male|female> tags 1569 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1570 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1 1571 $self->gender ? $2 : $1
1474 }ge 1572 }ge
1475 # replace H<hint text> 1573 # replace H<hint text>
… …
1743 1841
1744sub load_header_from($) { 1842sub load_header_from($) {
1745 my ($self, $path) = @_; 1843 my ($self, $path) = @_;
1746 1844
1747 utf8::encode $path; 1845 utf8::encode $path;
1748 #aio_open $path, O_RDONLY, 0 1846 my $f = new_from_file cf::object::thawer $path
1749 # or return;
1750
1751 $self->_load_header ($path)
1752 or return; 1847 or return;
1848
1849 $self->_load_header ($f)
1850 or return;
1851
1852 local $MAP_LOADING{$self->{path}} = $self;
1853 $f->resolve_delayed_derefs;
1753 1854
1754 $self->{load_path} = $path; 1855 $self->{load_path} = $path;
1755 1856
1756 1 1857 1
1757} 1858}
… …
1811sub find { 1912sub find {
1812 my ($path, $origin) = @_; 1913 my ($path, $origin) = @_;
1813 1914
1814 $path = normalise $path, $origin && $origin->path; 1915 $path = normalise $path, $origin && $origin->path;
1815 1916
1917 cf::lock_wait "map_data:$path";#d#remove
1816 cf::lock_wait "map_find:$path"; 1918 cf::lock_wait "map_find:$path";
1817 1919
1818 $cf::MAP{$path} || do { 1920 $cf::MAP{$path} || do {
1819 my $guard = cf::lock_acquire "map_find:$path"; 1921 my $guard1 = cf::lock_acquire "map_find:$path";
1922 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1923
1820 my $map = new_from_path cf::map $path 1924 my $map = new_from_path cf::map $path
1821 or return; 1925 or return;
1822 1926
1823 $map->{last_save} = $cf::RUNTIME; 1927 $map->{last_save} = $cf::RUNTIME;
1824 1928
… …
1826 or return; 1930 or return;
1827 1931
1828 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1932 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1829 # doing this can freeze the server in a sync job, obviously 1933 # doing this can freeze the server in a sync job, obviously
1830 #$cf::WAIT_FOR_TICK->wait; 1934 #$cf::WAIT_FOR_TICK->wait;
1935 undef $guard1;
1936 undef $guard2;
1831 $map->reset; 1937 $map->reset;
1832 undef $guard;
1833 return find $path; 1938 return find $path;
1834 } 1939 }
1835 1940
1836 $cf::MAP{$path} = $map 1941 $cf::MAP{$path} = $map
1837 } 1942 }
… …
1846 local $self->{deny_reset} = 1; # loading can take a long time 1951 local $self->{deny_reset} = 1; # loading can take a long time
1847 1952
1848 my $path = $self->{path}; 1953 my $path = $self->{path};
1849 1954
1850 { 1955 {
1851 my $guard = cf::lock_acquire "map_load:$path"; 1956 my $guard = cf::lock_acquire "map_data:$path";
1852 1957
1958 return unless $self->valid;
1853 return if $self->in_memory != cf::MAP_SWAPPED; 1959 return unless $self->in_memory == cf::MAP_SWAPPED;
1854 1960
1855 $self->in_memory (cf::MAP_LOADING); 1961 $self->in_memory (cf::MAP_LOADING);
1856 1962
1857 $self->alloc; 1963 $self->alloc;
1858 1964
1859 $self->pre_load; 1965 $self->pre_load;
1860 Coro::cede; 1966 cf::cede_to_tick;
1861 1967
1968 my $f = new_from_file cf::object::thawer $self->{load_path};
1969 $f->skip_block;
1862 $self->_load_objects ($self->{load_path}, 1) 1970 $self->_load_objects ($f)
1863 or return; 1971 or return;
1864 1972
1865 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1973 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1866 if delete $self->{load_original}; 1974 if delete $self->{load_original};
1867 1975
1868 if (my $uniq = $self->uniq_path) { 1976 if (my $uniq = $self->uniq_path) {
1869 utf8::encode $uniq; 1977 utf8::encode $uniq;
1870 if (aio_open $uniq, O_RDONLY, 0) { 1978 unless (aio_stat $uniq) {
1979 if (my $f = new_from_file cf::object::thawer $uniq) {
1871 $self->clear_unique_items; 1980 $self->clear_unique_items;
1872 $self->_load_objects ($uniq, 0); 1981 $self->_load_objects ($f);
1982 $f->resolve_delayed_derefs;
1983 }
1873 } 1984 }
1874 } 1985 }
1875 1986
1876 Coro::cede; 1987 $f->resolve_delayed_derefs;
1988
1989 cf::cede_to_tick;
1877 # now do the right thing for maps 1990 # now do the right thing for maps
1878 $self->link_multipart_objects; 1991 $self->link_multipart_objects;
1879 $self->difficulty ($self->estimate_difficulty) 1992 $self->difficulty ($self->estimate_difficulty)
1880 unless $self->difficulty; 1993 unless $self->difficulty;
1881 Coro::cede; 1994 cf::cede_to_tick;
1882 1995
1883 unless ($self->{deny_activate}) { 1996 unless ($self->{deny_activate}) {
1884 $self->decay_objects; 1997 $self->decay_objects;
1885 $self->fix_auto_apply; 1998 $self->fix_auto_apply;
1886 $self->update_buttons; 1999 $self->update_buttons;
1887 Coro::cede; 2000 cf::cede_to_tick;
1888 $self->set_darkness_map; 2001 $self->set_darkness_map;
1889 Coro::cede; 2002 cf::cede_to_tick;
1890 $self->activate; 2003 $self->activate;
1891 } 2004 }
1892 2005
1893 $self->{last_save} = $cf::RUNTIME; 2006 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME); 2007 $self->last_access ($cf::RUNTIME);
… …
1944} 2057}
1945 2058
1946sub do_load_sync { 2059sub do_load_sync {
1947 my ($map) = @_; 2060 my ($map) = @_;
1948 2061
2062 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2063 if $Coro::current == $Coro::main;
2064
1949 cf::sync_job { $map->load }; 2065 cf::sync_job { $map->load };
1950} 2066}
1951 2067
1952our %MAP_PREFETCH; 2068our %MAP_PREFETCH;
1953our $MAP_PREFETCHER = undef; 2069our $MAP_PREFETCHER = undef;
1954 2070
1955sub find_async { 2071sub find_async {
1956 my ($path, $origin) = @_; 2072 my ($path, $origin, $load) = @_;
1957 2073
1958 $path = normalise $path, $origin && $origin->{path}; 2074 $path = normalise $path, $origin && $origin->{path};
1959 2075
1960 if (my $map = $cf::MAP{$path}) { 2076 if (my $map = $cf::MAP{$path}) {
1961 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2077 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1962 } 2078 }
1963 2079
1964 undef $MAP_PREFETCH{$path}; 2080 $MAP_PREFETCH{$path} |= $load;
2081
1965 $MAP_PREFETCHER ||= cf::async { 2082 $MAP_PREFETCHER ||= cf::async {
2083 $Coro::current->{desc} = "map prefetcher";
2084
1966 while (%MAP_PREFETCH) { 2085 while (%MAP_PREFETCH) {
1967 for my $path (keys %MAP_PREFETCH) { 2086 while (my ($k, $v) = each %MAP_PREFETCH) {
1968 if (my $map = find $path) { 2087 if (my $map = find $k) {
1969 $map->load; 2088 $map->load if $v;
1970 } 2089 }
1971 2090
1972 delete $MAP_PREFETCH{$path}; 2091 delete $MAP_PREFETCH{$k};
1973 } 2092 }
1974 } 2093 }
1975 undef $MAP_PREFETCHER; 2094 undef $MAP_PREFETCHER;
1976 }; 2095 };
1977 $MAP_PREFETCHER->prio (6); 2096 $MAP_PREFETCHER->prio (6);
… …
1980} 2099}
1981 2100
1982sub save { 2101sub save {
1983 my ($self) = @_; 2102 my ($self) = @_;
1984 2103
1985 my $lock = cf::lock_acquire "map_data:" . $self->path; 2104 my $lock = cf::lock_acquire "map_data:$self->{path}";
1986 2105
1987 $self->{last_save} = $cf::RUNTIME; 2106 $self->{last_save} = $cf::RUNTIME;
1988 2107
1989 return unless $self->dirty; 2108 return unless $self->dirty;
1990 2109
… …
1996 return if $self->{deny_save}; 2115 return if $self->{deny_save};
1997 2116
1998 local $self->{last_access} = $self->last_access;#d# 2117 local $self->{last_access} = $self->last_access;#d#
1999 2118
2000 cf::async { 2119 cf::async {
2120 $Coro::current->{desc} = "map player save";
2001 $_->contr->save for $self->players; 2121 $_->contr->save for $self->players;
2002 }; 2122 };
2003 2123
2004 if ($uniq) { 2124 if ($uniq) {
2005 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2125 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2013 my ($self) = @_; 2133 my ($self) = @_;
2014 2134
2015 # save first because save cedes 2135 # save first because save cedes
2016 $self->save; 2136 $self->save;
2017 2137
2018 my $lock = cf::lock_acquire "map_data:" . $self->path; 2138 my $lock = cf::lock_acquire "map_data:$self->{path}";
2019 2139
2020 return if $self->players; 2140 return if $self->players;
2021 return if $self->in_memory != cf::MAP_IN_MEMORY; 2141 return if $self->in_memory != cf::MAP_IN_MEMORY;
2022 return if $self->{deny_save}; 2142 return if $self->{deny_save};
2023 2143
2144 $self->in_memory (cf::MAP_SWAPPED);
2145
2146 $self->deactivate;
2147 $_->clear_links_to ($self) for values %cf::MAP;
2024 $self->clear; 2148 $self->clear;
2025 $self->in_memory (cf::MAP_SWAPPED);
2026} 2149}
2027 2150
2028sub reset_at { 2151sub reset_at {
2029 my ($self) = @_; 2152 my ($self) = @_;
2030 2153
… …
2062 if $uniq; 2185 if $uniq;
2063 } 2186 }
2064 2187
2065 delete $cf::MAP{$self->path}; 2188 delete $cf::MAP{$self->path};
2066 2189
2190 $self->deactivate;
2191 $_->clear_links_to ($self) for values %cf::MAP;
2067 $self->clear; 2192 $self->clear;
2068
2069 $_->clear_links_to ($self) for values %cf::MAP;
2070 2193
2071 $self->unlink_save; 2194 $self->unlink_save;
2072 $self->destroy; 2195 $self->destroy;
2073} 2196}
2074 2197
2075my $nuke_counter = "aaaa"; 2198my $nuke_counter = "aaaa";
2076 2199
2077sub nuke { 2200sub nuke {
2078 my ($self) = @_; 2201 my ($self) = @_;
2079 2202
2203 {
2204 my $lock = cf::lock_acquire "map_data:$self->{path}";
2205
2080 delete $cf::MAP{$self->path}; 2206 delete $cf::MAP{$self->path};
2081 2207
2082 $self->unlink_save; 2208 $self->unlink_save;
2083 2209
2084 bless $self, "cf::map"; 2210 bless $self, "cf::map";
2085 delete $self->{deny_reset}; 2211 delete $self->{deny_reset};
2086 $self->{deny_save} = 1; 2212 $self->{deny_save} = 1;
2087 $self->reset_timeout (1); 2213 $self->reset_timeout (1);
2088 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2214 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2089 2215
2090 $cf::MAP{$self->path} = $self; 2216 $cf::MAP{$self->path} = $self;
2217 }
2091 2218
2092 $self->reset; # polite request, might not happen 2219 $self->reset; # polite request, might not happen
2093} 2220}
2094 2221
2095=item $maps = cf::map::tmp_maps 2222=item $maps = cf::map::tmp_maps
… …
2171 2298
2172sub inv_recursive { 2299sub inv_recursive {
2173 inv_recursive_ inv $_[0] 2300 inv_recursive_ inv $_[0]
2174} 2301}
2175 2302
2303=item $ref = $ob->ref
2304
2305creates and returns a persistent reference to an objetc that can be stored as a string.
2306
2307=item $ob = cf::object::deref ($refstring)
2308
2309returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2310even if the object actually exists. May block.
2311
2312=cut
2313
2314sub deref {
2315 my ($ref) = @_;
2316
2317 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2318 my ($uuid, $name) = ($1, $2);
2319 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2320 or return;
2321 $pl->ob->uuid eq $uuid
2322 or return;
2323
2324 $pl->ob
2325 } else {
2326 warn "$ref: cannot resolve object reference\n";
2327 undef
2328 }
2329}
2330
2176package cf; 2331package cf;
2177 2332
2178=back 2333=back
2179 2334
2180=head3 cf::object::player 2335=head3 cf::object::player
… …
2338 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2493 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2339 2494
2340 $self->enter_link; 2495 $self->enter_link;
2341 2496
2342 (async { 2497 (async {
2498 $Coro::current->{desc} = "player::goto $path $x $y";
2499
2500 # *tag paths override both path and x|y
2501 if ($path =~ /^\*(.*)$/) {
2502 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2503 my $ob = $obs[rand @obs];
2504
2505 # see if we actually can go there
2506 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2507 $ob = $obs[rand @obs];
2508 } else {
2509 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2510 }
2511 # else put us there anyways for now #d#
2512
2513 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2514 } else {
2515 ($path, $x, $y) = (undef, undef, undef);
2516 }
2517 }
2518
2343 my $map = eval { 2519 my $map = eval {
2344 my $map = cf::map::find $path; 2520 my $map = defined $path ? cf::map::find $path : undef;
2345 2521
2346 if ($map) { 2522 if ($map) {
2347 $map = $map->customise_for ($self); 2523 $map = $map->customise_for ($self);
2348 $map = $check->($map) if $check && $map; 2524 $map = $check->($map) if $check && $map;
2349 } else { 2525 } else {
2350 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2526 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2351 } 2527 }
2352 2528
2353 $map 2529 $map
2354 }; 2530 };
2355 2531
… …
2445 # if exit is damned, update players death & WoR home-position 2621 # if exit is damned, update players death & WoR home-position
2446 $self->contr->savebed ($slaying, $hp, $sp) 2622 $self->contr->savebed ($slaying, $hp, $sp)
2447 if $exit->flag (FLAG_DAMNED); 2623 if $exit->flag (FLAG_DAMNED);
2448 2624
2449 (async { 2625 (async {
2626 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2627
2450 $self->deactivate_recursive; # just to be sure 2628 $self->deactivate_recursive; # just to be sure
2451 unless (eval { 2629 unless (eval {
2452 $self->goto ($slaying, $hp, $sp); 2630 $self->goto ($slaying, $hp, $sp);
2453 2631
2454 1; 2632 1;
… …
2489the message, with C<log> being the default. If C<$color> is negative, suppress 2667the message, with C<log> being the default. If C<$color> is negative, suppress
2490the message unless the client supports the msg packet. 2668the message unless the client supports the msg packet.
2491 2669
2492=cut 2670=cut
2493 2671
2672our %CHANNEL = (
2673 "c/identify" => {
2674 id => "infobox",
2675 title => "Identify",
2676 reply => undef,
2677 tooltip => "Items recently identified",
2678 },
2679 "c/examine" => {
2680 id => "infobox",
2681 title => "Examine",
2682 reply => undef,
2683 tooltip => "Signs and other items you examined",
2684 },
2685 "c/lookat" => {
2686 id => "infobox",
2687 title => "Look",
2688 reply => undef,
2689 tooltip => "What you saw there",
2690 },
2691);
2692
2494sub cf::client::send_msg { 2693sub cf::client::send_msg {
2495 my ($self, $channel, $msg, $color, @extra) = @_; 2694 my ($self, $channel, $msg, $color, @extra) = @_;
2496 2695
2497 $msg = $self->pl->expand_cfpod ($msg); 2696 $msg = $self->pl->expand_cfpod ($msg);
2498 2697
2499 $color &= cf::NDI_CLIENT_MASK; # just in case... 2698 $color &= cf::NDI_CLIENT_MASK; # just in case...
2500 2699
2700 # check predefined channels, for the benefit of C
2701 if ($CHANNEL{$channel}) {
2702 $channel = $CHANNEL{$channel};
2703
2704 $self->ext_msg (channel_info => $channel)
2705 if $self->can_msg;
2706
2707 $channel = $channel->{id};
2708
2501 if (ref $channel) { 2709 } elsif (ref $channel) {
2502 # send meta info to client, if not yet sent 2710 # send meta info to client, if not yet sent
2503 unless (exists $self->{channel}{$channel->{id}}) { 2711 unless (exists $self->{channel}{$channel->{id}}) {
2504 $self->{channel}{$channel->{id}} = $channel; 2712 $self->{channel}{$channel->{id}} = $channel;
2505 $self->ext_msg (channel_info => $channel); 2713 $self->ext_msg (channel_info => $channel)
2714 if $self->can_msg;
2506 } 2715 }
2507 2716
2508 $channel = $channel->{id}; 2717 $channel = $channel->{id};
2509 } 2718 }
2510 2719
… …
2551=cut 2760=cut
2552 2761
2553sub cf::client::ext_msg($$@) { 2762sub cf::client::ext_msg($$@) {
2554 my ($self, $type, @msg) = @_; 2763 my ($self, $type, @msg) = @_;
2555 2764
2556 my $extcmd = $self->extcmd;
2557
2558 if ($extcmd == 2) { 2765 if ($self->extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2766 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove 2767 } elsif ($self->extcmd == 1) { # TODO: remove
2561 push @msg, msgtype => "event_$type"; 2768 push @msg, msgtype => "event_$type";
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2769 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 } 2770 }
2564} 2771}
2565 2772
… …
2572sub cf::client::ext_reply($$@) { 2779sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_; 2780 my ($self, $id, @msg) = @_;
2574 2781
2575 if ($self->extcmd == 2) { 2782 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2783 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) { 2784 } elsif ($self->extcmd == 1) {
2578 #TODO: version 1, remove 2785 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id; 2786 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2787 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2788 }
2582} 2789}
… …
2646 my ($type, $reply, @payload) = 2853 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2854 "ARRAY" eq ref $msg
2648 ? @$msg 2855 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2856 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 2857
2858 my @reply;
2859
2651 if (my $cb = $EXTICMD{$type}) { 2860 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 2861 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 2862 }
2863
2864 $ns->ext_reply ($reply, @reply)
2865 if $reply;
2866
2657 } else { 2867 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2868 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 2869 }
2660 2870
2661 cf::override; 2871 cf::override;
… …
2721=pod 2931=pod
2722 2932
2723The following functions and methods are available within a safe environment: 2933The following functions and methods are available within a safe environment:
2724 2934
2725 cf::object 2935 cf::object
2726 contr pay_amount pay_player map x y force_find force_add 2936 contr pay_amount pay_player map x y force_find force_add destroy
2727 insert remove name archname title slaying race 2937 insert remove name archname title slaying race decrease_ob_nr
2728 2938
2729 cf::object::player 2939 cf::object::player
2730 player 2940 player
2731 2941
2732 cf::player 2942 cf::player
… …
2737 2947
2738=cut 2948=cut
2739 2949
2740for ( 2950for (
2741 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2951 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2742 insert remove inv name archname title slaying race)], 2952 insert remove inv name archname title slaying race
2953 decrease_ob_nr destroy)],
2743 ["cf::object::player" => qw(player)], 2954 ["cf::object::player" => qw(player)],
2744 ["cf::player" => qw(peaceful)], 2955 ["cf::player" => qw(peaceful)],
2745 ["cf::map" => qw(trigger)], 2956 ["cf::map" => qw(trigger)],
2746) { 2957) {
2747 no strict 'refs'; 2958 no strict 'refs';
… …
2823# the server's init and main functions 3034# the server's init and main functions
2824 3035
2825sub load_facedata($) { 3036sub load_facedata($) {
2826 my ($path) = @_; 3037 my ($path) = @_;
2827 3038
3039 # HACK to clear player env face cache, we need some signal framework
3040 # for this (global event?)
3041 %ext::player_env::MUSIC_FACE_CACHE = ();
3042
2828 my $enc = JSON::XS->new->utf8->canonical; 3043 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2829 3044
2830 warn "loading facedata from $path\n"; 3045 warn "loading facedata from $path\n";
2831 3046
2832 my $facedata; 3047 my $facedata;
2833 0 < aio_load $path, $facedata 3048 0 < aio_load $path, $facedata
… …
2839 or cf::cleanup "$path: version mismatch, cannot proceed."; 3054 or cf::cleanup "$path: version mismatch, cannot proceed.";
2840 3055
2841 # patch in the exptable 3056 # patch in the exptable
2842 $facedata->{resource}{"res/exp_table"} = { 3057 $facedata->{resource}{"res/exp_table"} = {
2843 type => FT_RSRC, 3058 type => FT_RSRC,
2844 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]), 3059 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2845 }; 3060 };
2846 cf::cede_to_tick; 3061 cf::cede_to_tick;
2847 3062
2848 { 3063 {
2849 my $faces = $facedata->{faceinfo}; 3064 my $faces = $facedata->{faceinfo};
… …
2902 name => $name, 3117 name => $name,
2903 %{ $info->{meta} || {} }, 3118 %{ $info->{meta} || {} },
2904 }); 3119 });
2905 3120
2906 $data = pack "(w/a*)*", $meta, $info->{data}; 3121 $data = pack "(w/a*)*", $meta, $info->{data};
3122 } else {
3123 $data = $info->{data};
2907 } 3124 }
2908 3125
2909 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; 3126 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2910 cf::face::set_type $idx, $info->{type}; 3127 cf::face::set_type $idx, $info->{type};
2911 3128
… …
2941 $ns->fx_want ($k, $v); 3158 $ns->fx_want ($k, $v);
2942 } 3159 }
2943}; 3160};
2944 3161
2945sub reload_regions { 3162sub reload_regions {
3163 # HACK to clear player env face cache, we need some signal framework
3164 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = ();
3166
2946 load_resource_file "$MAPDIR/regions" 3167 load_resource_file "$MAPDIR/regions"
2947 or die "unable to load regions file\n"; 3168 or die "unable to load regions file\n";
2948 3169
2949 for (cf::region::list) { 3170 for (cf::region::list) {
2950 $_->{match} = qr/$_->{match}/ 3171 $_->{match} = qr/$_->{match}/
… …
2986 3207
2987sub init { 3208sub init {
2988 reload_resources; 3209 reload_resources;
2989} 3210}
2990 3211
2991sub cfg_load { 3212sub reload_config {
2992 open my $fh, "<:utf8", "$CONFDIR/config" 3213 open my $fh, "<:utf8", "$CONFDIR/config"
2993 or return; 3214 or return;
2994 3215
2995 local $/; 3216 local $/;
2996 *CFG = YAML::Syck::Load <$fh>; 3217 *CFG = YAML::Syck::Load <$fh>;
… …
3012sub main { 3233sub main {
3013 # we must not ever block the main coroutine 3234 # we must not ever block the main coroutine
3014 local $Coro::idle = sub { 3235 local $Coro::idle = sub {
3015 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3236 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3016 (async { 3237 (async {
3238 $Coro::current->{desc} = "IDLE BUG HANDLER";
3017 Event::one_event; 3239 Event::one_event;
3018 })->prio (Coro::PRIO_MAX); 3240 })->prio (Coro::PRIO_MAX);
3019 }; 3241 };
3020 3242
3021 cfg_load; 3243 reload_config;
3022 db_init; 3244 db_init;
3023 load_extensions; 3245 load_extensions;
3024 3246
3025 $TICK_WATCHER->start; 3247 $TICK_WATCHER->start;
3026 Event::loop; 3248 Event::loop;
… …
3093 # and maps saved/destroyed asynchronously. 3315 # and maps saved/destroyed asynchronously.
3094 warn "begin emergency player save\n"; 3316 warn "begin emergency player save\n";
3095 for my $login (keys %cf::PLAYER) { 3317 for my $login (keys %cf::PLAYER) {
3096 my $pl = $cf::PLAYER{$login} or next; 3318 my $pl = $cf::PLAYER{$login} or next;
3097 $pl->valid or next; 3319 $pl->valid or next;
3320 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3098 $pl->save; 3321 $pl->save;
3099 } 3322 }
3100 warn "end emergency player save\n"; 3323 warn "end emergency player save\n";
3101 3324
3102 warn "begin emergency map save\n"; 3325 warn "begin emergency map save\n";
… …
3150 3373
3151 warn "flushing outstanding aio requests"; 3374 warn "flushing outstanding aio requests";
3152 for (;;) { 3375 for (;;) {
3153 BDB::flush; 3376 BDB::flush;
3154 IO::AIO::flush; 3377 IO::AIO::flush;
3155 Coro::cede; 3378 Coro::cede_notself;
3156 last unless IO::AIO::nreqs || BDB::nreqs; 3379 last unless IO::AIO::nreqs || BDB::nreqs;
3157 warn "iterate..."; 3380 warn "iterate...";
3158 } 3381 }
3159 3382
3160 ++$RELOAD; 3383 ++$RELOAD;
… …
3219 warn "reloading cf.pm"; 3442 warn "reloading cf.pm";
3220 require cf; 3443 require cf;
3221 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3444 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3222 3445
3223 warn "loading config and database again"; 3446 warn "loading config and database again";
3224 cf::cfg_load; 3447 cf::reload_config;
3225 3448
3226 warn "loading extensions"; 3449 warn "loading extensions";
3227 cf::load_extensions; 3450 cf::load_extensions;
3228 3451
3229 warn "reattaching attachments to objects/players"; 3452 warn "reattaching attachments to objects/players";
… …
3265register_command "reload" => sub { 3488register_command "reload" => sub {
3266 my ($who, $arg) = @_; 3489 my ($who, $arg) = @_;
3267 3490
3268 if ($who->flag (FLAG_WIZ)) { 3491 if ($who->flag (FLAG_WIZ)) {
3269 $who->message ("reloading server."); 3492 $who->message ("reloading server.");
3493 async {
3494 $Coro::current->{desc} = "perl_reload";
3270 async { reload_perl }; 3495 reload_perl;
3496 };
3271 } 3497 }
3272}; 3498};
3273 3499
3274unshift @INC, $LIBDIR; 3500unshift @INC, $LIBDIR;
3275 3501
… …
3294 my $signal = new Coro::Signal; 3520 my $signal = new Coro::Signal;
3295 push @WAIT_FOR_TICK_BEGIN, $signal; 3521 push @WAIT_FOR_TICK_BEGIN, $signal;
3296 $signal->wait; 3522 $signal->wait;
3297} 3523}
3298 3524
3299 my $min = 1e6;#d#
3300 my $avg = 10;
3301$TICK_WATCHER = Event->timer ( 3525$TICK_WATCHER = Event->timer (
3302 reentrant => 0, 3526 reentrant => 0,
3303 parked => 1, 3527 parked => 1,
3304 prio => 0, 3528 prio => 0,
3305 at => $NEXT_TICK || $TICK, 3529 at => $NEXT_TICK || $TICK,
… …
3313 3537
3314 $NOW = $tick_start = Event::time; 3538 $NOW = $tick_start = Event::time;
3315 3539
3316 cf::server_tick; # one server iteration 3540 cf::server_tick; # one server iteration
3317 3541
3318 0 && sync_job {#d#
3319 for(1..10) {
3320 my $t = Event::time;
3321 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3322 or die;
3323
3324 $map->width (50);
3325 $map->height (50);
3326 $map->alloc;
3327 $map->_load_objects ("/tmp/x.map", 1);
3328 my $t = Event::time - $t;
3329
3330 #next unless $t < 0.0013;#d#
3331 if ($t < $min) {
3332 $min = $t;
3333 }
3334 $avg = $avg * 0.99 + $t * 0.01;
3335 }
3336 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3337 exit 0;
3338 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3339 };
3340
3341 $RUNTIME += $TICK; 3542 $RUNTIME += $TICK;
3342 $NEXT_TICK += $TICK; 3543 $NEXT_TICK += $TICK;
3343 3544
3344 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3545 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3345 $NEXT_RUNTIME_WRITE = $NOW + 10; 3546 $NEXT_RUNTIME_WRITE = $NOW + 10;
3346 Coro::async_pool { 3547 Coro::async_pool {
3548 $Coro::current->{desc} = "runtime saver";
3347 write_runtime 3549 write_runtime
3348 or warn "ERROR: unable to write runtime file: $!"; 3550 or warn "ERROR: unable to write runtime file: $!";
3349 }; 3551 };
3350 } 3552 }
3351 3553
3352# my $AFTER = Event::time;
3353# warn $AFTER - $NOW;#d#
3354
3355 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3554 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3356 $sig->send; 3555 $sig->send;
3357 } 3556 }
3358 while (my $sig = shift @WAIT_FOR_TICK) { 3557 while (my $sig = shift @WAIT_FOR_TICK) {
3359 $sig->send; 3558 $sig->send;
… …
3369 3568
3370 $LOAD = ($NOW - $tick_start) / $TICK; 3569 $LOAD = ($NOW - $tick_start) / $TICK;
3371 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3570 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3372 3571
3373 _post_tick; 3572 _post_tick;
3374
3375
3376 }, 3573 },
3377); 3574);
3378 3575
3379{ 3576{
3577 BDB::min_parallel 8;
3380 BDB::max_poll_time $TICK * 0.1; 3578 BDB::max_poll_time $TICK * 0.1;
3381 $BDB_POLL_WATCHER = Event->io ( 3579 $BDB_POLL_WATCHER = Event->io (
3382 reentrant => 0, 3580 reentrant => 0,
3383 fd => BDB::poll_fileno, 3581 fd => BDB::poll_fileno,
3384 poll => 'r', 3582 poll => 'r',
3385 prio => 0, 3583 prio => 0,
3386 data => WF_AUTOCANCEL, 3584 data => WF_AUTOCANCEL,
3387 cb => \&BDB::poll_cb, 3585 cb => \&BDB::poll_cb,
3388 ); 3586 );
3389 BDB::min_parallel 8;
3390 3587
3391 BDB::set_sync_prepare { 3588 BDB::set_sync_prepare {
3392 my $status; 3589 my $status;
3393 my $current = $Coro::current; 3590 my $current = $Coro::current;
3394 ( 3591 (
… …
3403 ) 3600 )
3404 }; 3601 };
3405 3602
3406 unless ($DB_ENV) { 3603 unless ($DB_ENV) {
3407 $DB_ENV = BDB::db_env_create; 3604 $DB_ENV = BDB::db_env_create;
3605 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3606 | BDB::LOG_AUTOREMOVE, 1);
3607 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3608 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3408 3609
3409 cf::sync_job { 3610 cf::sync_job {
3410 eval { 3611 eval {
3411 BDB::db_env_open 3612 BDB::db_env_open
3412 $DB_ENV, 3613 $DB_ENV,
… …
3414 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3615 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3415 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3616 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3416 0666; 3617 0666;
3417 3618
3418 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3619 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3419
3420 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3421 $DB_ENV->set_lk_detect;
3422 }; 3620 };
3423 3621
3424 cf::cleanup "db_env_open(db): $@" if $@; 3622 cf::cleanup "db_env_open(db): $@" if $@;
3425 }; 3623 };
3426 } 3624 }
3625
3626 $BDB_DEADLOCK_WATCHER = Event->timer (
3627 after => 3,
3628 interval => 1,
3629 hard => 1,
3630 prio => 0,
3631 data => WF_AUTOCANCEL,
3632 cb => sub {
3633 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3634 },
3635 );
3636 $BDB_CHECKPOINT_WATCHER = Event->timer (
3637 after => 11,
3638 interval => 60,
3639 hard => 1,
3640 prio => 0,
3641 data => WF_AUTOCANCEL,
3642 cb => sub {
3643 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3644 },
3645 );
3646 $BDB_TRICKLE_WATCHER = Event->timer (
3647 after => 5,
3648 interval => 10,
3649 hard => 1,
3650 prio => 0,
3651 data => WF_AUTOCANCEL,
3652 cb => sub {
3653 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3654 },
3655 );
3427} 3656}
3428 3657
3429{ 3658{
3430 IO::AIO::min_parallel 8; 3659 IO::AIO::min_parallel 8;
3431 3660
… …
3434 $AIO_POLL_WATCHER = Event->io ( 3663 $AIO_POLL_WATCHER = Event->io (
3435 reentrant => 0, 3664 reentrant => 0,
3436 data => WF_AUTOCANCEL, 3665 data => WF_AUTOCANCEL,
3437 fd => IO::AIO::poll_fileno, 3666 fd => IO::AIO::poll_fileno,
3438 poll => 'r', 3667 poll => 'r',
3439 prio => 6, 3668 prio => 0,
3440 cb => \&IO::AIO::poll_cb, 3669 cb => \&IO::AIO::poll_cb,
3441 ); 3670 );
3442} 3671}
3443 3672
3444my $_log_backtrace; 3673my $_log_backtrace;
… …
3450 3679
3451 # limit the # of concurrent backtraces 3680 # limit the # of concurrent backtraces
3452 if ($_log_backtrace < 2) { 3681 if ($_log_backtrace < 2) {
3453 ++$_log_backtrace; 3682 ++$_log_backtrace;
3454 async { 3683 async {
3684 $Coro::current->{desc} = "abt $msg";
3685
3455 my @bt = fork_call { 3686 my @bt = fork_call {
3456 @addr = map { sprintf "%x", $_ } @addr; 3687 @addr = map { sprintf "%x", $_ } @addr;
3457 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3688 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3458 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3689 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3459 or die "addr2line: $!"; 3690 or die "addr2line: $!";

Diff Legend

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