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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.373 by root, Sat Sep 15 15:58:06 2007 UTC

10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
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 ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
79our $NEXT_TICK; 80our $NEXT_TICK;
80our $NOW; 81our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
82 83
83our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 88our $DB_ENV;
85 89
86our %CFG; 90our %CFG;
87 91
88our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 93our $RUNTIME;
90 94
91our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
94 98
95# 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 ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 101
186 $msg .= "\n" 190 $msg .= "\n"
187 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
188 192
189 $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;
190 194
191 utf8::encode $msg;
192 LOG llevError, $msg; 195 LOG llevError, $msg;
193 }; 196 };
194} 197}
195 198
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
271Wait 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
272a 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,
273for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
274returned. 277returned.
275 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
276Lock 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
277uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
278 284
279=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
280 286
281Return 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.
282 288
283=cut 289=cut
284 290
285our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
286 293
287sub lock_wait($) { 294sub lock_wait($) {
288 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#
289 301
290 # wait for lock, if any 302 # wait for lock, if any
291 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 305 Coro::schedule;
299 311
300 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
301 lock_wait $key; 313 lock_wait $key;
302 314
303 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
304 317
305 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
308 } 322 }
309} 323}
310 324
322 }; 336 };
323 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
324 $guard 338 $guard
325} 339}
326 340
327=item cf::get_slot $time[, $priority] 341=item cf::get_slot $time[, $priority[, $name]]
328 342
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 343Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 344This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
332 349
333Useful for short background jobs. 350Useful for short background jobs.
334 351
335=cut 352=cut
336 353
363 Coro::schedule; 380 Coro::schedule;
364 } 381 }
365 } 382 }
366}; 383};
367 384
368sub get_slot($;$) { 385sub get_slot($;$$) {
369 my ($time, $pri) = @_; 386 my ($time, $pri, $name) = @_;
370 387
388 $time = $TICK * .6 if $time > $TICK * .6;
389 my $sig = new Coro::Signal;
390
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal]; 391 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 392 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready; 393 $SLOT_QUEUE->ready;
374 $sig->wait; 394 $sig->wait;
375} 395}
376 396
466Coro::Storable. May, of course, block. Note that the executed sub may 486Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling. 487never block itself or use any form of Event handling.
468 488
469=cut 489=cut
470 490
471sub _store_scalar {
472 open my $fh, ">", \my $buf
473 or die "fork_call: cannot open fh-to-buf in child : $!";
474 Storable::store_fd $_[0], $fh;
475 close $fh;
476
477 $buf
478}
479
480sub fork_call(&@) { 491sub fork_call(&@) {
481 my ($cb, @args) = @_; 492 my ($cb, @args) = @_;
482 493
483# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 494 # we seemingly have to make a local copy of the whole thing,
484# or die "socketpair: $!"; 495 # otherwise perl prematurely frees the stuff :/
485 pipe my $fh1, my $fh2 496 # TODO: investigate and fix (likely this will be rather laborious)
486 or die "pipe: $!";
487 497
488 if (my $pid = fork) { 498 my @res = Coro::Util::fork_eval {
489 close $fh2;
490
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492 warn "pst<$res>" unless $res =~ /^pst/;
493 $res = Coro::Storable::thaw $res;
494
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals; 499 reset_signals;
502 local $SIG{__WARN__}; 500 &$cb
503 local $SIG{__DIE__}; 501 }, @args;
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509 502
510 eval { 503 wantarray ? @res : $res[-1]
511 close $fh1;
512
513 my @res = eval { $cb->(@args) };
514
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
516 close $fh2;
517 };
518
519 warn $@ if $@;
520 _exit 0;
521 }
522} 504}
523 505
524=item $value = cf::db_get $family => $key 506=item $value = cf::db_get $family => $key
525 507
526Returns a single value from the environment database. 508Returns a single value from the environment database.
528=item cf::db_put $family => $key => $value 510=item cf::db_put $family => $key => $value
529 511
530Stores the given C<$value> in the family. It can currently store binary 512Stores the given C<$value> in the family. It can currently store binary
531data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 513data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
532 514
515=item $db = cf::db_table "name"
516
517Create and/or open a new database table. The string must not be "db" and must be unique
518within each server.
519
533=cut 520=cut
521
522sub db_table($) {
523 my ($name) = @_;
524 my $db = BDB::db_create $DB_ENV;
525
526 eval {
527 $db->set_flags (BDB::CHKSUM);
528
529 utf8::encode $name;
530 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
531 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
532 cf::cleanup "db_open(db): $!" if $!;
533 };
534 cf::cleanup "db_open(db): $@" if $@;
535
536 $db
537}
534 538
535our $DB; 539our $DB;
536 540
537sub db_init { 541sub db_init {
538 unless ($DB) {
539 $DB = BDB::db_create $DB_ENV;
540
541 cf::sync_job { 542 cf::sync_job {
542 eval { 543 $DB ||= db_table "db";
543 $DB->set_flags (BDB::CHKSUM);
544
545 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
546 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
547 cf::cleanup "db_open(db): $!" if $!;
548 };
549 cf::cleanup "db_open(db): $@" if $@;
550 };
551 } 544 };
552} 545}
553 546
554sub db_get($$) { 547sub db_get($$) {
555 my $key = "$_[0]/$_[1]"; 548 my $key = "$_[0]/$_[1]";
556 549
606 if (1) { 599 if (1) {
607 $md5 = 600 $md5 =
608 join "\x00", 601 join "\x00",
609 $processversion, 602 $processversion,
610 map { 603 map {
611 Coro::cede; 604 cf::cede_to_tick;
612 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 605 ($src->[$_], Digest::MD5::md5_hex $data[$_])
613 } 0.. $#$src; 606 } 0.. $#$src;
614 607
615 608
616 my $dbmd5 = db_get cache => "$id/md5"; 609 my $dbmd5 = db_get cache => "$id/md5";
1035sub object_freezer_save { 1028sub object_freezer_save {
1036 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
1037 1030
1038 sync_job { 1031 sync_job {
1039 if (length $$rdata) { 1032 if (length $$rdata) {
1033 utf8::decode (my $decname = $filename);
1040 warn sprintf "saving %s (%d,%d)\n", 1034 warn sprintf "saving %s (%d,%d)\n",
1041 $filename, length $$rdata, scalar @$objs; 1035 $decname, length $$rdata, scalar @$objs;
1042 1036
1043 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1037 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1044 chmod SAVE_MODE, $fh; 1038 chmod SAVE_MODE, $fh;
1045 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1039 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1046 aio_fsync $fh if $cf::USE_FSYNC; 1040 aio_fsync $fh if $cf::USE_FSYNC;
1065 } 1059 }
1066 } else { 1060 } else {
1067 aio_unlink $filename; 1061 aio_unlink $filename;
1068 aio_unlink "$filename.pst"; 1062 aio_unlink "$filename.pst";
1069 } 1063 }
1070 } 1064 };
1071} 1065}
1072 1066
1073sub object_freezer_as_string { 1067sub object_freezer_as_string {
1074 my ($rdata, $objs) = @_; 1068 my ($rdata, $objs) = @_;
1075 1069
1087 or return; 1081 or return;
1088 1082
1089 unless (aio_stat "$filename.pst") { 1083 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1084 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1085 or return;
1086
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1087 $av = eval { (Storable::thaw $av)->{objs} };
1093 } 1088 }
1094 1089
1090 utf8::decode (my $decname = $filename);
1095 warn sprintf "loading %s (%d)\n", 1091 warn sprintf "loading %s (%d,%d)\n",
1096 $filename, length $data, scalar @{$av || []}; 1092 $decname, length $data, scalar @{$av || []};
1093
1097 return ($data, $av); 1094 ($data, $av)
1098} 1095}
1099 1096
1100=head2 COMMAND CALLBACKS 1097=head2 COMMAND CALLBACKS
1101 1098
1102=over 4 1099=over 4
1175 my ($pl, $buf) = @_; 1172 my ($pl, $buf) = @_;
1176 1173
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1174 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1175
1179 if (ref $msg) { 1176 if (ref $msg) {
1177 my ($type, $reply, @payload) =
1178 "ARRAY" eq ref $msg
1179 ? @$msg
1180 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1181
1182 my @reply;
1183
1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1184 if (my $cb = $EXTCMD{$type}) {
1181 if (my %reply = $cb->($pl, $msg)) { 1185 @reply = $cb->($pl, @payload);
1182 $pl->ext_reply ($msg->{msgid}, %reply);
1183 }
1184 } 1186 }
1187
1188 $pl->ext_reply ($reply, @reply)
1189 if $reply;
1190
1185 } else { 1191 } else {
1186 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187 } 1193 }
1188 1194
1189 cf::override; 1195 cf::override;
1279 1285
1280=head3 cf::player 1286=head3 cf::player
1281 1287
1282=over 4 1288=over 4
1283 1289
1290=item cf::player::num_playing
1291
1292Returns the official number of playing players, as per the Crossfire metaserver rules.
1293
1294=cut
1295
1296sub num_playing {
1297 scalar grep
1298 $_->ob->map
1299 && !$_->hidden
1300 && !$_->ob->flag (cf::FLAG_WIZ),
1301 cf::player::list
1302}
1303
1284=item cf::player::find $login 1304=item cf::player::find $login
1285 1305
1286Returns the given player object, loading it if necessary (might block). 1306Returns the given player object, loading it if necessary (might block).
1287 1307
1288=cut 1308=cut
1323 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1343 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1324 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1344 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1325 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1345 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1326 aio_unlink +(playerdir $login) . "/$login.pl"; 1346 aio_unlink +(playerdir $login) . "/$login.pl";
1327 1347
1328 my $pl = load_pl path $login 1348 my $f = new_from_file cf::object::thawer path $login
1329 or return; 1349 or return;
1350
1351 my $pl = cf::player::load_pl $f
1352 or return;
1353 local $cf::PLAYER_LOADING{$login} = $pl;
1354 $f->resolve_delayed_derefs;
1330 $cf::PLAYER{$login} = $pl 1355 $cf::PLAYER{$login} = $pl
1331 } 1356 }
1332 } 1357 }
1333} 1358}
1334 1359
1344 1369
1345 aio_mkdir playerdir $pl, 0770; 1370 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1371 $pl->{last_save} = $cf::RUNTIME;
1347 1372
1348 $pl->save_pl ($path); 1373 $pl->save_pl ($path);
1349 Coro::cede; 1374 cf::cede_to_tick;
1350} 1375}
1351 1376
1352sub new($) { 1377sub new($) {
1353 my ($login) = @_; 1378 my ($login) = @_;
1354 1379
1358 $self->{deny_save} = 1; 1383 $self->{deny_save} = 1;
1359 1384
1360 $cf::PLAYER{$login} = $self; 1385 $cf::PLAYER{$login} = $self;
1361 1386
1362 $self 1387 $self
1388}
1389
1390=item $player->send_msg ($channel, $msg, $color, [extra...])
1391
1392=cut
1393
1394sub send_msg {
1395 my $ns = shift->ns
1396 or return;
1397 $ns->send_msg (@_);
1363} 1398}
1364 1399
1365=item $pl->quit_character 1400=item $pl->quit_character
1366 1401
1367Nukes the player without looking back. If logged in, the connection will 1402Nukes the player without looking back. If logged in, the connection will
1422 or return []; 1457 or return [];
1423 1458
1424 my @logins; 1459 my @logins;
1425 1460
1426 for my $login (@$dirs) { 1461 for my $login (@$dirs) {
1462 my $path = path $login;
1463
1464 # a .pst is a dead give-away for a valid player
1465 unless (-e "$path.pst") {
1427 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1466 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428 aio_read $fh, 0, 512, my $buf, 0 or next; 1467 aio_read $fh, 0, 512, my $buf, 0 or next;
1429 $buf !~ /^password -------------$/m or next; # official not-valid tag 1468 $buf !~ /^password -------------$/m or next; # official not-valid tag
1469 }
1430 1470
1431 utf8::decode $login; 1471 utf8::decode $login;
1432 push @logins, $login; 1472 push @logins, $login;
1433 } 1473 }
1434 1474
1472sub expand_cfpod { 1512sub expand_cfpod {
1473 ((my $self), (local $_)) = @_; 1513 ((my $self), (local $_)) = @_;
1474 1514
1475 # escape & and < 1515 # escape & and <
1476 s/&/&amp;/g; 1516 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g; 1517 s/(?<![BIUGHT])</&lt;/g;
1478 1518
1479 # this is buggy, it needs to properly take care of nested <'s 1519 # this is buggy, it needs to properly take care of nested <'s
1480 1520
1481 1 while 1521 1 while
1482 # replace B<>, I<>, U<> etc. 1522 # replace B<>, I<>, U<> etc.
1483 s/B<([^\>]*)>/<b>$1<\/b>/ 1523 s/B<([^\>]*)>/<b>$1<\/b>/
1484 || s/I<([^\>]*)>/<i>$1<\/i>/ 1524 || s/I<([^\>]*)>/<i>$1<\/i>/
1485 || s/U<([^\>]*)>/<u>$1<\/u>/ 1525 || s/U<([^\>]*)>/<u>$1<\/u>/
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1486 # replace G<male|female> tags 1527 # replace G<male|female> tags
1487 || s{G<([^>|]*)\|([^>]*)>}{ 1528 || s{G<([^>|]*)\|([^>]*)>}{
1488 $self->gender ? $2 : $1 1529 $self->gender ? $2 : $1
1489 }ge 1530 }ge
1490 # replace H<hint text> 1531 # replace H<hint text>
1511sub hintmode { 1552sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1; 1553 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode} 1554 $_[0]{hintmode}
1514} 1555}
1515 1556
1516=item $player->ext_reply ($msgid, %msg) 1557=item $player->ext_reply ($msgid, @msg)
1517 1558
1518Sends an ext reply to the player. 1559Sends an ext reply to the player.
1519 1560
1520=cut 1561=cut
1521 1562
1522sub ext_reply($$%) { 1563sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1564 my ($self, $id, @msg) = @_;
1524 1565
1525 $msg{msgid} = $id; 1566 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1567}
1528 1568
1529=item $player->ext_event ($type, %msg) 1569=item $player->ext_msg ($type, @msg)
1530 1570
1531Sends an ext event to the client. 1571Sends an ext event to the client.
1532 1572
1533=cut 1573=cut
1534 1574
1535sub ext_event($$%) { 1575sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1576 my ($self, $type, @msg) = @_;
1537 1577
1538 $self->ns->ext_event ($type, %msg); 1578 $self->ns->ext_msg ($type, @msg);
1539} 1579}
1540 1580
1541=head3 cf::region 1581=head3 cf::region
1542 1582
1543=over 4 1583=over 4
1759 1799
1760sub load_header_from($) { 1800sub load_header_from($) {
1761 my ($self, $path) = @_; 1801 my ($self, $path) = @_;
1762 1802
1763 utf8::encode $path; 1803 utf8::encode $path;
1764 #aio_open $path, O_RDONLY, 0 1804 my $f = new_from_file cf::object::thawer $path
1765 # or return;
1766
1767 $self->_load_header ($path)
1768 or return; 1805 or return;
1806
1807 $self->_load_header ($f)
1808 or return;
1809
1810 local $MAP_LOADING{$self->{path}} = $self;
1811 $f->resolve_delayed_derefs;
1769 1812
1770 $self->{load_path} = $path; 1813 $self->{load_path} = $path;
1771 1814
1772 1 1815 1
1773} 1816}
1827sub find { 1870sub find {
1828 my ($path, $origin) = @_; 1871 my ($path, $origin) = @_;
1829 1872
1830 $path = normalise $path, $origin && $origin->path; 1873 $path = normalise $path, $origin && $origin->path;
1831 1874
1875 cf::lock_wait "map_data:$path";#d#remove
1832 cf::lock_wait "map_find:$path"; 1876 cf::lock_wait "map_find:$path";
1833 1877
1834 $cf::MAP{$path} || do { 1878 $cf::MAP{$path} || do {
1835 my $guard = cf::lock_acquire "map_find:$path"; 1879 my $guard1 = cf::lock_acquire "map_find:$path";
1880 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1881
1836 my $map = new_from_path cf::map $path 1882 my $map = new_from_path cf::map $path
1837 or return; 1883 or return;
1838 1884
1839 $map->{last_save} = $cf::RUNTIME; 1885 $map->{last_save} = $cf::RUNTIME;
1840 1886
1842 or return; 1888 or return;
1843 1889
1844 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1890 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1845 # doing this can freeze the server in a sync job, obviously 1891 # doing this can freeze the server in a sync job, obviously
1846 #$cf::WAIT_FOR_TICK->wait; 1892 #$cf::WAIT_FOR_TICK->wait;
1893 undef $guard1;
1894 undef $guard2;
1847 $map->reset; 1895 $map->reset;
1848 undef $guard;
1849 return find $path; 1896 return find $path;
1850 } 1897 }
1851 1898
1852 $cf::MAP{$path} = $map 1899 $cf::MAP{$path} = $map
1853 } 1900 }
1862 local $self->{deny_reset} = 1; # loading can take a long time 1909 local $self->{deny_reset} = 1; # loading can take a long time
1863 1910
1864 my $path = $self->{path}; 1911 my $path = $self->{path};
1865 1912
1866 { 1913 {
1867 my $guard = cf::lock_acquire "map_load:$path"; 1914 my $guard = cf::lock_acquire "map_data:$path";
1868 1915
1916 return unless $self->valid;
1869 return if $self->in_memory != cf::MAP_SWAPPED; 1917 return unless $self->in_memory == cf::MAP_SWAPPED;
1870 1918
1871 $self->in_memory (cf::MAP_LOADING); 1919 $self->in_memory (cf::MAP_LOADING);
1872 1920
1873 $self->alloc; 1921 $self->alloc;
1874 1922
1875 $self->pre_load; 1923 $self->pre_load;
1876 Coro::cede; 1924 cf::cede_to_tick;
1877 1925
1926 my $f = new_from_file cf::object::thawer $self->{load_path};
1927 $f->skip_block;
1878 $self->_load_objects ($self->{load_path}, 1) 1928 $self->_load_objects ($f)
1879 or return; 1929 or return;
1880 1930
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1931 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1882 if delete $self->{load_original}; 1932 if delete $self->{load_original};
1883 1933
1884 if (my $uniq = $self->uniq_path) { 1934 if (my $uniq = $self->uniq_path) {
1885 utf8::encode $uniq; 1935 utf8::encode $uniq;
1886 if (aio_open $uniq, O_RDONLY, 0) { 1936 unless (aio_stat $uniq) {
1937 if (my $f = new_from_file cf::object::thawer $uniq) {
1887 $self->clear_unique_items; 1938 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 1939 $self->_load_objects ($f);
1940 $f->resolve_delayed_derefs;
1941 }
1889 } 1942 }
1890 } 1943 }
1891 1944
1892 Coro::cede; 1945 $f->resolve_delayed_derefs;
1946
1947 cf::cede_to_tick;
1893 # now do the right thing for maps 1948 # now do the right thing for maps
1894 $self->link_multipart_objects; 1949 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 1950 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 1951 unless $self->difficulty;
1897 Coro::cede; 1952 cf::cede_to_tick;
1898 1953
1899 unless ($self->{deny_activate}) { 1954 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 1955 $self->decay_objects;
1901 $self->fix_auto_apply; 1956 $self->fix_auto_apply;
1902 $self->update_buttons; 1957 $self->update_buttons;
1903 Coro::cede; 1958 cf::cede_to_tick;
1904 $self->set_darkness_map; 1959 $self->set_darkness_map;
1905 Coro::cede; 1960 cf::cede_to_tick;
1906 $self->activate; 1961 $self->activate;
1907 } 1962 }
1963
1964 $self->{last_save} = $cf::RUNTIME;
1965 $self->last_access ($cf::RUNTIME);
1908 1966
1909 $self->in_memory (cf::MAP_IN_MEMORY); 1967 $self->in_memory (cf::MAP_IN_MEMORY);
1910 } 1968 }
1911 1969
1912 $self->post_load; 1970 $self->post_load;
1923 1981
1924 $self 1982 $self
1925} 1983}
1926 1984
1927# find and load all maps in the 3x3 area around a map 1985# find and load all maps in the 3x3 area around a map
1928sub load_diag { 1986sub load_neighbours {
1929 my ($map) = @_; 1987 my ($map) = @_;
1930 1988
1931 my @diag; # diagonal neighbours 1989 my @neigh; # diagonal neighbours
1932 1990
1933 for (0 .. 3) { 1991 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 1992 my $neigh = $map->tile_path ($_)
1935 or next; 1993 or next;
1936 $neigh = find $neigh, $map 1994 $neigh = find $neigh, $map
1937 or next; 1995 or next;
1938 $neigh->load; 1996 $neigh->load;
1939 1997
1998 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1999 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2000 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 2001 }
1943 2002
1944 for (@diag) { 2003 for (grep defined $_->[0], @neigh) {
2004 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 2005 my $neigh = find $path, $origin
1946 or next; 2006 or next;
1947 $neigh->load; 2007 $neigh->load;
1948 } 2008 }
1949} 2009}
1950 2010
1955} 2015}
1956 2016
1957sub do_load_sync { 2017sub do_load_sync {
1958 my ($map) = @_; 2018 my ($map) = @_;
1959 2019
2020 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2021 if $Coro::current == $Coro::main;
2022
1960 cf::sync_job { $map->load }; 2023 cf::sync_job { $map->load };
1961} 2024}
1962 2025
1963our %MAP_PREFETCH; 2026our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 2027our $MAP_PREFETCHER = undef;
1965 2028
1966sub find_async { 2029sub find_async {
1967 my ($path, $origin) = @_; 2030 my ($path, $origin, $load) = @_;
1968 2031
1969 $path = normalise $path, $origin && $origin->{path}; 2032 $path = normalise $path, $origin && $origin->{path};
1970 2033
1971 if (my $map = $cf::MAP{$path}) { 2034 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2035 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1973 } 2036 }
1974 2037
1975 undef $MAP_PREFETCH{$path}; 2038 $MAP_PREFETCH{$path} |= $load;
2039
1976 $MAP_PREFETCHER ||= cf::async { 2040 $MAP_PREFETCHER ||= cf::async {
1977 while (%MAP_PREFETCH) { 2041 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 2042 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 2043 if (my $map = find $k) {
1980 $map->load; 2044 $map->load if $v;
1981 } 2045 }
1982 2046
1983 delete $MAP_PREFETCH{$path}; 2047 delete $MAP_PREFETCH{$k};
1984 } 2048 }
1985 } 2049 }
1986 undef $MAP_PREFETCHER; 2050 undef $MAP_PREFETCHER;
1987 }; 2051 };
1988 $MAP_PREFETCHER->prio (6); 2052 $MAP_PREFETCHER->prio (6);
1991} 2055}
1992 2056
1993sub save { 2057sub save {
1994 my ($self) = @_; 2058 my ($self) = @_;
1995 2059
1996 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1997 2061
1998 $self->{last_save} = $cf::RUNTIME; 2062 $self->{last_save} = $cf::RUNTIME;
1999 2063
2000 return unless $self->dirty; 2064 return unless $self->dirty;
2001 2065
2024 my ($self) = @_; 2088 my ($self) = @_;
2025 2089
2026 # save first because save cedes 2090 # save first because save cedes
2027 $self->save; 2091 $self->save;
2028 2092
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2094
2031 return if $self->players; 2095 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2096 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2097 return if $self->{deny_save};
2034 2098
2099 $self->in_memory (cf::MAP_SWAPPED);
2100
2101 $self->deactivate;
2102 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2103 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2104}
2038 2105
2039sub reset_at { 2106sub reset_at {
2040 my ($self) = @_; 2107 my ($self) = @_;
2041 2108
2073 if $uniq; 2140 if $uniq;
2074 } 2141 }
2075 2142
2076 delete $cf::MAP{$self->path}; 2143 delete $cf::MAP{$self->path};
2077 2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2147 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2148
2082 $self->unlink_save; 2149 $self->unlink_save;
2083 $self->destroy; 2150 $self->destroy;
2084} 2151}
2085 2152
2086my $nuke_counter = "aaaa"; 2153my $nuke_counter = "aaaa";
2087 2154
2088sub nuke { 2155sub nuke {
2089 my ($self) = @_; 2156 my ($self) = @_;
2090 2157
2158 {
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160
2091 delete $cf::MAP{$self->path}; 2161 delete $cf::MAP{$self->path};
2092 2162
2093 $self->unlink_save; 2163 $self->unlink_save;
2094 2164
2095 bless $self, "cf::map"; 2165 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2166 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2167 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2168 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2169 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2170
2101 $cf::MAP{$self->path} = $self; 2171 $cf::MAP{$self->path} = $self;
2172 }
2102 2173
2103 $self->reset; # polite request, might not happen 2174 $self->reset; # polite request, might not happen
2104} 2175}
2105 2176
2106=item $maps = cf::map::tmp_maps 2177=item $maps = cf::map::tmp_maps
2182 2253
2183sub inv_recursive { 2254sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2255 inv_recursive_ inv $_[0]
2185} 2256}
2186 2257
2258=item $ref = $ob->ref
2259
2260creates and returns a persistent reference to an objetc that can be stored as a string.
2261
2262=item $ob = cf::object::deref ($refstring)
2263
2264returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2265even if the object actually exists. May block.
2266
2267=cut
2268
2269sub deref {
2270 my ($ref) = @_;
2271
2272 # temporary compatibility#TODO#remove
2273 $ref =~ s{^<}{player/<};
2274
2275 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2276 my ($uuid, $name) = ($1, $2);
2277 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2278 or return;
2279 $pl->ob->uuid eq $uuid
2280 or return;
2281
2282 $pl->ob
2283 } else {
2284 warn "$ref: cannot resolve object reference\n";
2285 undef
2286 }
2287}
2288
2187package cf; 2289package cf;
2188 2290
2189=back 2291=back
2190 2292
2191=head3 cf::object::player 2293=head3 cf::object::player
2213 2315
2214 } else { 2316 } else {
2215 my $pl = $self->contr; 2317 my $pl = $self->contr;
2216 2318
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2319 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2320 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2321 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225 2322
2226 } else { 2323 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2324 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2325 $self->message ($msg, $flags);
2229 } 2326 }
2230 } 2327 }
2328}
2329
2330=item $object->send_msg ($channel, $msg, $color, [extra...])
2331
2332=cut
2333
2334sub cf::object::send_msg {
2335 my $pl = shift->contr
2336 or return;
2337 $pl->send_msg (@_);
2231} 2338}
2232 2339
2233=item $player_object->may ("access") 2340=item $player_object->may ("access")
2234 2341
2235Returns wether the given player is authorized to access resource "access" 2342Returns wether the given player is authorized to access resource "access"
2314 # use -1 or undef as default coordinates, not 0, 0 2421 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2422 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2423 if $x <=0 && $y <= 0;
2317 2424
2318 $map->load; 2425 $map->load;
2319 $map->load_diag; 2426 $map->load_neighbours;
2320 2427
2321 return unless $self->contr->active; 2428 return unless $self->contr->active;
2322 $self->activate_recursive; 2429 $self->activate_recursive;
2323 2430
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2431 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2452
2346 $self->enter_link; 2453 $self->enter_link;
2347 2454
2348 (async { 2455 (async {
2456 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs];
2460
2461 # see if we actually can go there
2462 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2463 $ob = $obs[rand @obs];
2464 } else {
2465 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2466 }
2467 # else put us there anyways for now #d#
2468
2469 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2470 } else {
2471 ($path, $x, $y) = (undef, undef, undef);
2472 }
2473 }
2474
2349 my $map = eval { 2475 my $map = eval {
2350 my $map = cf::map::find $path; 2476 my $map = defined $path ? cf::map::find $path : undef;
2351 2477
2352 if ($map) { 2478 if ($map) {
2353 $map = $map->customise_for ($self); 2479 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map; 2480 $map = $check->($map) if $check && $map;
2355 } else { 2481 } else {
2356 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2482 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2357 } 2483 }
2358 2484
2359 $map 2485 $map
2360 }; 2486 };
2361 2487
2495the message, with C<log> being the default. If C<$color> is negative, suppress 2621the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet. 2622the message unless the client supports the msg packet.
2497 2623
2498=cut 2624=cut
2499 2625
2626our %CHANNEL = (
2627 "c/identify" => {
2628 id => "identify",
2629 title => "Identify",
2630 reply => undef,
2631 tooltip => "Items recently identified",
2632 },
2633 "c/examine" => {
2634 id => "examine",
2635 title => "Examine",
2636 reply => undef,
2637 tooltip => "Signs and other items you examined",
2638 },
2639);
2640
2500sub cf::client::send_msg { 2641sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2642 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2643
2503 $msg = $self->pl->expand_cfpod ($msg); 2644 $msg = $self->pl->expand_cfpod ($msg);
2504 2645
2505 $color &= ~cf::NDI_UNIQUE; # just in case... 2646 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647
2648 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2506 2650
2507 if (ref $channel) { 2651 if (ref $channel) {
2508 # send meta info to client, if not yet sent 2652 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2653 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2654 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 2655 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg;
2512 } 2657 }
2513 2658
2514 $channel = $channel->{id}; 2659 $channel = $channel->{id};
2515 } 2660 }
2516 2661
2517 return unless @extra || length $msg; 2662 return unless @extra || length $msg;
2518 2663
2519 if ($self->can_msg) { 2664 if ($self->can_msg) {
2665 # default colour, mask it out
2666 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2667 if $color & cf::NDI_DEF;
2668
2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2669 $self->send_packet ("msg " . $self->{json_coder}->encode (
2670 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2521 } else { 2671 } else {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 if ($color >= 0) { 2672 if ($color >= 0) {
2673 # replace some tags by gcfclient-compatible ones
2674 for ($msg) {
2675 1 while
2676 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2677 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2678 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2679 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2680 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2681 }
2682
2683 $color &= cf::NDI_COLOR_MASK;
2684
2685 utf8::encode $msg;
2686
2533 if (0 && $msg =~ /\[/) { 2687 if (0 && $msg =~ /\[/) {
2688 # COMMAND/INFO
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 2689 $self->send_packet ("drawextinfo $color 10 8 $msg")
2535 } else { 2690 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2691 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg") 2692 $self->send_packet ("drawinfo $color $msg")
2538 } 2693 }
2539 } 2694 }
2540 } 2695 }
2541} 2696}
2542 2697
2543=item $client->ext_event ($type, %msg) 2698=item $client->ext_msg ($type, @msg)
2544 2699
2545Sends an ext event to the client. 2700Sends an ext event to the client.
2546 2701
2547=cut 2702=cut
2548 2703
2549sub cf::client::ext_event($$%) { 2704sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 2705 my ($self, $type, @msg) = @_;
2551 2706
2552 return unless $self->extcmd; 2707 if ($self->extcmd == 2) {
2553 2708 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2709 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 2710 push @msg, msgtype => "event_$type";
2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2711 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2712 }
2713}
2714
2715=item $client->ext_reply ($msgid, @msg)
2716
2717Sends an ext reply to the client.
2718
2719=cut
2720
2721sub cf::client::ext_reply($$@) {
2722 my ($self, $id, @msg) = @_;
2723
2724 if ($self->extcmd == 2) {
2725 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2726 } elsif ($self->extcmd == 1) {
2727 #TODO: version 1, remove
2728 unshift @msg, msgtype => "reply", msgid => $id;
2729 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2730 }
2556} 2731}
2557 2732
2558=item $success = $client->query ($flags, "text", \&cb) 2733=item $success = $client->query ($flags, "text", \&cb)
2559 2734
2560Queues a query to the client, calling the given callback with 2735Queues a query to the client, calling the given callback with
2615 my ($ns, $buf) = @_; 2790 my ($ns, $buf) = @_;
2616 2791
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2792 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 2793
2619 if (ref $msg) { 2794 if (ref $msg) {
2795 my ($type, $reply, @payload) =
2796 "ARRAY" eq ref $msg
2797 ? @$msg
2798 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2799
2800 my @reply;
2801
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2802 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 2803 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 2804 }
2805
2806 $ns->ext_reply ($reply, @reply)
2807 if $reply;
2808
2626 } else { 2809 } else {
2627 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2810 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2628 } 2811 }
2629 2812
2630 cf::override; 2813 cf::override;
2677our $safe = new Safe "safe"; 2860our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 2861our $safe_hole = new Safe::Hole;
2679 2862
2680$SIG{FPE} = 'IGNORE'; 2863$SIG{FPE} = 'IGNORE';
2681 2864
2682$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2865$safe->permit_only (Opcode::opset qw(
2866 :base_core :base_mem :base_orig :base_math
2867 grepstart grepwhile mapstart mapwhile
2868 sort time
2869));
2683 2870
2684# here we export the classes and methods available to script code 2871# here we export the classes and methods available to script code
2685 2872
2686=pod 2873=pod
2687 2874
2688The following functions and methods are available within a safe environment: 2875The following functions and methods are available within a safe environment:
2689 2876
2690 cf::object 2877 cf::object
2691 contr pay_amount pay_player map x y force_find force_add 2878 contr pay_amount pay_player map x y force_find force_add
2692 insert remove 2879 insert remove name archname title slaying race decrease_ob_nr
2693 2880
2694 cf::object::player 2881 cf::object::player
2695 player 2882 player
2696 2883
2697 cf::player 2884 cf::player
2702 2889
2703=cut 2890=cut
2704 2891
2705for ( 2892for (
2706 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2894 insert remove inv name archname title slaying race
2707 insert remove)], 2895 decrease_ob_nr)],
2708 ["cf::object::player" => qw(player)], 2896 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 2897 ["cf::player" => qw(peaceful)],
2710 ["cf::map" => qw(trigger)], 2898 ["cf::map" => qw(trigger)],
2711) { 2899) {
2712 no strict 'refs'; 2900 no strict 'refs';
2788# the server's init and main functions 2976# the server's init and main functions
2789 2977
2790sub load_facedata($) { 2978sub load_facedata($) {
2791 my ($path) = @_; 2979 my ($path) = @_;
2792 2980
2981 # HACK to clear player env face cache, we need some signal framework
2982 # for this (global event?)
2983 %ext::player_env::MUSIC_FACE_CACHE = ();
2984
2985 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2986
2793 warn "loading facedata from $path\n"; 2987 warn "loading facedata from $path\n";
2794 2988
2795 my $facedata; 2989 my $facedata;
2796 0 < aio_load $path, $facedata 2990 0 < aio_load $path, $facedata
2797 or die "$path: $!"; 2991 or die "$path: $!";
2798 2992
2799 $facedata = Coro::Storable::thaw $facedata; 2993 $facedata = Coro::Storable::thaw $facedata;
2800 2994
2801 $facedata->{version} == 2 2995 $facedata->{version} == 2
2802 or cf::cleanup "$path: version mismatch, cannot proceed."; 2996 or cf::cleanup "$path: version mismatch, cannot proceed.";
2997
2998 # patch in the exptable
2999 $facedata->{resource}{"res/exp_table"} = {
3000 type => FT_RSRC,
3001 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3002 };
3003 cf::cede_to_tick;
2803 3004
2804 { 3005 {
2805 my $faces = $facedata->{faceinfo}; 3006 my $faces = $facedata->{faceinfo};
2806 3007
2807 while (my ($face, $info) = each %$faces) { 3008 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3009 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2809 cf::face::set_visibility $idx, $info->{visibility}; 3010 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 3011 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813 3014
2814 cf::cede_to_tick; 3015 cf::cede_to_tick;
2815 } 3016 }
2816 3017
2817 while (my ($face, $info) = each %$faces) { 3018 while (my ($face, $info) = each %$faces) {
2842 3043
2843 { 3044 {
2844 # TODO: for gcfclient pleasure, we should give resources 3045 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index. 3046 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 3047 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical; 3048
3049 my $soundconf = delete $res->{"res/sound.conf"};
2848 3050
2849 while (my ($name, $info) = each %$res) { 3051 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3052 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data;
2857 3054
2858 if ($name =~ /\.jpg$/) { 3055 if ($info->{type} & 1) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3056 # prepend meta info
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3057
3058 my $meta = $enc->encode ({
3059 name => $name,
3060 %{ $info->{meta} || {} },
3061 });
3062
3063 $data = pack "(w/a*)*", $meta, $info->{data};
2861 } else { 3064 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 3065 $data = $info->{data};
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 } 3066 }
2868 3067
3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3069 cf::face::set_type $idx, $info->{type};
3070
2869 cf::cede_to_tick; 3071 cf::cede_to_tick;
2870 } 3072 }
3073
3074 if ($soundconf) {
3075 $soundconf = $enc->decode (delete $soundconf->{data});
3076
3077 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3078 my $sound = $soundconf->{compat}[$_]
3079 or next;
3080
3081 my $face = cf::face::find "sound/$sound->[1]";
3082 cf::sound::set $sound->[0] => $face;
3083 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3084 }
3085
3086 while (my ($k, $v) = each %{$soundconf->{event}}) {
3087 my $face = cf::face::find "sound/$v";
3088 cf::sound::set $k => $face;
3089 }
3090 }
2871 } 3091 }
2872 3092
2873 1 3093 1
2874} 3094}
2875 3095
3096register_exticmd fx_want => sub {
3097 my ($ns, $want) = @_;
3098
3099 while (my ($k, $v) = each %$want) {
3100 $ns->fx_want ($k, $v);
3101 }
3102};
3103
2876sub reload_regions { 3104sub reload_regions {
3105 # HACK to clear player env face cache, we need some signal framework
3106 # for this (global event?)
3107 %ext::player_env::MUSIC_FACE_CACHE = ();
3108
2877 load_resource_file "$MAPDIR/regions" 3109 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 3110 or die "unable to load regions file\n";
2879 3111
2880 for (cf::region::list) { 3112 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 3113 $_->{match} = qr/$_->{match}/
2917 3149
2918sub init { 3150sub init {
2919 reload_resources; 3151 reload_resources;
2920} 3152}
2921 3153
2922sub cfg_load { 3154sub reload_config {
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3155 open my $fh, "<:utf8", "$CONFDIR/config"
2924 or return; 3156 or return;
2925 3157
2926 local $/; 3158 local $/;
2927 *CFG = YAML::Syck::Load <$fh>; 3159 *CFG = YAML::Syck::Load <$fh>;
2947 (async { 3179 (async {
2948 Event::one_event; 3180 Event::one_event;
2949 })->prio (Coro::PRIO_MAX); 3181 })->prio (Coro::PRIO_MAX);
2950 }; 3182 };
2951 3183
2952 cfg_load; 3184 reload_config;
2953 db_init; 3185 db_init;
2954 load_extensions; 3186 load_extensions;
2955 3187
2956 $TICK_WATCHER->start; 3188 $TICK_WATCHER->start;
2957 Event::loop; 3189 Event::loop;
3150 warn "reloading cf.pm"; 3382 warn "reloading cf.pm";
3151 require cf; 3383 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3384 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153 3385
3154 warn "loading config and database again"; 3386 warn "loading config and database again";
3155 cf::cfg_load; 3387 cf::reload_config;
3156 3388
3157 warn "loading extensions"; 3389 warn "loading extensions";
3158 cf::load_extensions; 3390 cf::load_extensions;
3159 3391
3160 warn "reattaching attachments to objects/players"; 3392 warn "reattaching attachments to objects/players";
3225 my $signal = new Coro::Signal; 3457 my $signal = new Coro::Signal;
3226 push @WAIT_FOR_TICK_BEGIN, $signal; 3458 push @WAIT_FOR_TICK_BEGIN, $signal;
3227 $signal->wait; 3459 $signal->wait;
3228} 3460}
3229 3461
3230 my $min = 1e6;#d#
3231 my $avg = 10;
3232$TICK_WATCHER = Event->timer ( 3462$TICK_WATCHER = Event->timer (
3233 reentrant => 0, 3463 reentrant => 0,
3234 parked => 1, 3464 parked => 1,
3235 prio => 0, 3465 prio => 0,
3236 at => $NEXT_TICK || $TICK, 3466 at => $NEXT_TICK || $TICK,
3244 3474
3245 $NOW = $tick_start = Event::time; 3475 $NOW = $tick_start = Event::time;
3246 3476
3247 cf::server_tick; # one server iteration 3477 cf::server_tick; # one server iteration
3248 3478
3249 0 && sync_job {#d#
3250 for(1..10) {
3251 my $t = Event::time;
3252 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3253 or die;
3254
3255 $map->width (50);
3256 $map->height (50);
3257 $map->alloc;
3258 $map->_load_objects ("/tmp/x.map", 1);
3259 my $t = Event::time - $t;
3260
3261 #next unless $t < 0.0013;#d#
3262 if ($t < $min) {
3263 $min = $t;
3264 }
3265 $avg = $avg * 0.99 + $t * 0.01;
3266 }
3267 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3268 exit 0;
3269 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3270 };
3271
3272 $RUNTIME += $TICK; 3479 $RUNTIME += $TICK;
3273 $NEXT_TICK += $TICK; 3480 $NEXT_TICK += $TICK;
3274 3481
3275 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3482 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3276 $NEXT_RUNTIME_WRITE = $NOW + 10; 3483 $NEXT_RUNTIME_WRITE = $NOW + 10;
3278 write_runtime 3485 write_runtime
3279 or warn "ERROR: unable to write runtime file: $!"; 3486 or warn "ERROR: unable to write runtime file: $!";
3280 }; 3487 };
3281 } 3488 }
3282 3489
3283# my $AFTER = Event::time;
3284# warn $AFTER - $NOW;#d#
3285
3286 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3287 $sig->send; 3491 $sig->send;
3288 } 3492 }
3289 while (my $sig = shift @WAIT_FOR_TICK) { 3493 while (my $sig = shift @WAIT_FOR_TICK) {
3290 $sig->send; 3494 $sig->send;
3300 3504
3301 $LOAD = ($NOW - $tick_start) / $TICK; 3505 $LOAD = ($NOW - $tick_start) / $TICK;
3302 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3303 3507
3304 _post_tick; 3508 _post_tick;
3305
3306
3307 }, 3509 },
3308); 3510);
3309 3511
3310{ 3512{
3513 BDB::min_parallel 8;
3311 BDB::max_poll_time $TICK * 0.1; 3514 BDB::max_poll_time $TICK * 0.1;
3312 $BDB_POLL_WATCHER = Event->io ( 3515 $BDB_POLL_WATCHER = Event->io (
3313 reentrant => 0, 3516 reentrant => 0,
3314 fd => BDB::poll_fileno, 3517 fd => BDB::poll_fileno,
3315 poll => 'r', 3518 poll => 'r',
3316 prio => 0, 3519 prio => 0,
3317 data => WF_AUTOCANCEL, 3520 data => WF_AUTOCANCEL,
3318 cb => \&BDB::poll_cb, 3521 cb => \&BDB::poll_cb,
3319 ); 3522 );
3320 BDB::min_parallel 8;
3321 3523
3322 BDB::set_sync_prepare { 3524 BDB::set_sync_prepare {
3323 my $status; 3525 my $status;
3324 my $current = $Coro::current; 3526 my $current = $Coro::current;
3325 ( 3527 (
3334 ) 3536 )
3335 }; 3537 };
3336 3538
3337 unless ($DB_ENV) { 3539 unless ($DB_ENV) {
3338 $DB_ENV = BDB::db_env_create; 3540 $DB_ENV = BDB::db_env_create;
3541 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3542 | BDB::LOG_AUTOREMOVE, 1);
3543 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3544 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3339 3545
3340 cf::sync_job { 3546 cf::sync_job {
3341 eval { 3547 eval {
3342 BDB::db_env_open 3548 BDB::db_env_open
3343 $DB_ENV, 3549 $DB_ENV,
3345 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3346 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3347 0666; 3553 0666;
3348 3554
3349 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3350
3351 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3352 $DB_ENV->set_lk_detect;
3353 }; 3556 };
3354 3557
3355 cf::cleanup "db_env_open(db): $@" if $@; 3558 cf::cleanup "db_env_open(db): $@" if $@;
3356 }; 3559 };
3357 } 3560 }
3561
3562 $BDB_DEADLOCK_WATCHER = Event->timer (
3563 after => 3,
3564 interval => 1,
3565 hard => 1,
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3570 },
3571 );
3572 $BDB_CHECKPOINT_WATCHER = Event->timer (
3573 after => 11,
3574 interval => 60,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3580 },
3581 );
3582 $BDB_TRICKLE_WATCHER = Event->timer (
3583 after => 5,
3584 interval => 10,
3585 hard => 1,
3586 prio => 0,
3587 data => WF_AUTOCANCEL,
3588 cb => sub {
3589 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3590 },
3591 );
3358} 3592}
3359 3593
3360{ 3594{
3361 IO::AIO::min_parallel 8; 3595 IO::AIO::min_parallel 8;
3362 3596

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines