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.310 by elmex, Mon Jul 16 15:43:49 2007 UTC vs.
Revision 1.361 by root, Sun Sep 9 12:52:48 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 ();
… …
86our %CFG; 87our %CFG;
87 88
88our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 90our $RUNTIME;
90 91
91our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
94 95
95# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 98
… …
271Wait until the given lock is available and then acquires it and returns 272Wait 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, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
274returned. 275returned.
275 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
276Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
278 282
279=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
280 284
281Return true if the lock is currently active, i.e. somebody has locked it. 285Return true if the lock is currently active, i.e. somebody has locked it.
282 286
283=cut 287=cut
284 288
285our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
286 291
287sub lock_wait($) { 292sub lock_wait($) {
288 my ($key) = @_; 293 my ($key) = @_;
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
289 299
290 # wait for lock, if any 300 # wait for lock, if any
291 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 303 Coro::schedule;
… …
299 309
300 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
301 lock_wait $key; 311 lock_wait $key;
302 312
303 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
304 315
305 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
308 } 320 }
309} 321}
310 322
… …
320 my $guard = Coro::guard { 332 my $guard = Coro::guard {
321 $TICK_WATCHER->start; 333 $TICK_WATCHER->start;
322 }; 334 };
323 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
324 $guard 336 $guard
337}
338
339=item cf::get_slot $time[, $priority[, $name]]
340
341Allocate $time seconds of blocking CPU time at priority C<$priority>:
342This call blocks and returns only when you have at least C<$time> seconds
343of cpu time till the next tick. The slot is only valid till the next cede.
344
345The optional C<$name> can be used to identify the job to run. It might be
346used for statistical purposes and should identify the same time-class.
347
348Useful for short background jobs.
349
350=cut
351
352our @SLOT_QUEUE;
353our $SLOT_QUEUE;
354
355$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async {
357 my $signal = new Coro::Signal;
358
359 while () {
360 next_job:
361 my $avail = cf::till_tick;
362 if ($avail > 0.01) {
363 for (0 .. $#SLOT_QUEUE) {
364 if ($SLOT_QUEUE[$_][0] < $avail) {
365 my $job = splice @SLOT_QUEUE, $_, 1, ();
366 $job->[2]->send;
367 Coro::cede;
368 goto next_job;
369 }
370 }
371 }
372
373 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait;
377 } else {
378 Coro::schedule;
379 }
380 }
381};
382
383sub get_slot($;$$) {
384 my ($time, $pri, $name) = @_;
385
386 $time = $TICK * .6 if $time > $TICK * .6;
387 my $sig = new Coro::Signal;
388
389 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
390 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
391 $SLOT_QUEUE->ready;
392 $sig->wait;
325} 393}
326 394
327=item cf::async { BLOCK } 395=item cf::async { BLOCK }
328 396
329Currently the same as Coro::async_pool, meaning you cannot use 397Currently the same as Coro::async_pool, meaning you cannot use
… …
416Coro::Storable. May, of course, block. Note that the executed sub may 484Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 485never block itself or use any form of Event handling.
418 486
419=cut 487=cut
420 488
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429
430sub fork_call(&@) { 489sub fork_call(&@) {
431 my ($cb, @args) = @_; 490 my ($cb, @args) = @_;
432 491
433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 492 # we seemingly have to make a local copy of the whole thing,
434# or die "socketpair: $!"; 493 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 494 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 495
438 if (my $pid = fork) { 496 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 497 reset_signals;
452 local $SIG{__WARN__}; 498 &$cb
453 local $SIG{__DIE__}; 499 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 500
460 eval { 501 wantarray ? @res : $res[-1]
461 close $fh1;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
471 }
472} 502}
473 503
474=item $value = cf::db_get $family => $key 504=item $value = cf::db_get $family => $key
475 505
476Returns a single value from the environment database. 506Returns a single value from the environment database.
… …
556 if (1) { 586 if (1) {
557 $md5 = 587 $md5 =
558 join "\x00", 588 join "\x00",
559 $processversion, 589 $processversion,
560 map { 590 map {
561 Coro::cede; 591 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 592 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 593 } 0.. $#$src;
564 594
565 595
566 my $dbmd5 = db_get cache => "$id/md5"; 596 my $dbmd5 = db_get cache => "$id/md5";
… …
918 948
919=cut 949=cut
920 950
921############################################################################# 951#############################################################################
922# object support 952# object support
953#
954
955sub _can_merge {
956 my ($ob1, $ob2) = @_;
957
958 local $Storable::canonical = 1;
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961
962 $fob1 eq $fob2
963}
923 964
924sub reattach { 965sub reattach {
925 # basically do the same as instantiate, without calling instantiate 966 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 967 my ($obj) = @_;
927 968
… …
971 }, 1012 },
972); 1013);
973 1014
974sub object_freezer_save { 1015sub object_freezer_save {
975 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
1017
1018 my $guard = cf::lock_acquire "io";
976 1019
977 sync_job { 1020 sync_job {
978 if (length $$rdata) { 1021 if (length $$rdata) {
979 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
980 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
… …
1004 } 1047 }
1005 } else { 1048 } else {
1006 aio_unlink $filename; 1049 aio_unlink $filename;
1007 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
1008 } 1051 }
1009 } 1052 };
1053
1054 undef $guard;
1010} 1055}
1011 1056
1012sub object_freezer_as_string { 1057sub object_freezer_as_string {
1013 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
1014 1059
… …
1019 1064
1020sub object_thawer_load { 1065sub object_thawer_load {
1021 my ($filename) = @_; 1066 my ($filename) = @_;
1022 1067
1023 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1024 1071
1025 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
1026 or return; 1073 or return;
1027 1074
1028 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
1029 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
1030 or return; 1077 or return;
1078
1079 undef $guard;
1031 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
1032 } 1081 }
1033 1082
1034 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
1035 $filename, length $data, scalar @{$av || []}; 1084 $filename, length $data, scalar @{$av || []};
1085
1036 return ($data, $av); 1086 ($data, $av)
1037} 1087}
1038 1088
1039=head2 COMMAND CALLBACKS 1089=head2 COMMAND CALLBACKS
1040 1090
1041=over 4 1091=over 4
… …
1114 my ($pl, $buf) = @_; 1164 my ($pl, $buf) = @_;
1115 1165
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1166 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1167
1118 if (ref $msg) { 1168 if (ref $msg) {
1169 my ($type, $reply, @payload) =
1170 "ARRAY" eq ref $msg
1171 ? @$msg
1172 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1173
1174 my @reply;
1175
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1176 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1177 @reply = $cb->($pl, @payload);
1121 $pl->ext_reply ($msg->{msgid}, %reply);
1122 }
1123 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
1124 } else { 1183 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1185 }
1127 1186
1128 cf::override; 1187 cf::override;
… …
1218 1277
1219=head3 cf::player 1278=head3 cf::player
1220 1279
1221=over 4 1280=over 4
1222 1281
1282=item cf::player::num_playing
1283
1284Returns the official number of playing players, as per the Crossfire metaserver rules.
1285
1286=cut
1287
1288sub num_playing {
1289 scalar grep
1290 $_->ob->map
1291 && !$_->hidden
1292 && !$_->ob->flag (cf::FLAG_WIZ),
1293 cf::player::list
1294}
1295
1223=item cf::player::find $login 1296=item cf::player::find $login
1224 1297
1225Returns the given player object, loading it if necessary (might block). 1298Returns the given player object, loading it if necessary (might block).
1226 1299
1227=cut 1300=cut
… …
1262 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1337 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265 aio_unlink +(playerdir $login) . "/$login.pl"; 1338 aio_unlink +(playerdir $login) . "/$login.pl";
1266 1339
1267 my $pl = load_pl path $login 1340 my $f = new_from_file cf::object::thawer path $login
1268 or return; 1341 or return;
1342
1343 $f->next;
1344 my $pl = cf::player::load_pl $f
1345 or return;
1346 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs;
1269 $cf::PLAYER{$login} = $pl 1348 $cf::PLAYER{$login} = $pl
1270 } 1349 }
1271 } 1350 }
1272} 1351}
1273 1352
… …
1283 1362
1284 aio_mkdir playerdir $pl, 0770; 1363 aio_mkdir playerdir $pl, 0770;
1285 $pl->{last_save} = $cf::RUNTIME; 1364 $pl->{last_save} = $cf::RUNTIME;
1286 1365
1287 $pl->save_pl ($path); 1366 $pl->save_pl ($path);
1288 Coro::cede; 1367 cf::cede_to_tick;
1289} 1368}
1290 1369
1291sub new($) { 1370sub new($) {
1292 my ($login) = @_; 1371 my ($login) = @_;
1293 1372
… …
1297 $self->{deny_save} = 1; 1376 $self->{deny_save} = 1;
1298 1377
1299 $cf::PLAYER{$login} = $self; 1378 $cf::PLAYER{$login} = $self;
1300 1379
1301 $self 1380 $self
1381}
1382
1383=item $player->send_msg ($channel, $msg, $color, [extra...])
1384
1385=cut
1386
1387sub send_msg {
1388 my $ns = shift->ns
1389 or return;
1390 $ns->send_msg (@_);
1302} 1391}
1303 1392
1304=item $pl->quit_character 1393=item $pl->quit_character
1305 1394
1306Nukes the player without looking back. If logged in, the connection will 1395Nukes the player without looking back. If logged in, the connection will
… …
1361 or return []; 1450 or return [];
1362 1451
1363 my @logins; 1452 my @logins;
1364 1453
1365 for my $login (@$dirs) { 1454 for my $login (@$dirs) {
1455 my $path = path $login;
1456
1457 # a .pst is a dead give-away for a valid player
1458 unless (-e "$path.pst") {
1366 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1459 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367 aio_read $fh, 0, 512, my $buf, 0 or next; 1460 aio_read $fh, 0, 512, my $buf, 0 or next;
1368 $buf !~ /^password -------------$/m or next; # official not-valid tag 1461 $buf !~ /^password -------------$/m or next; # official not-valid tag
1462 }
1369 1463
1370 utf8::decode $login; 1464 utf8::decode $login;
1371 push @logins, $login; 1465 push @logins, $login;
1372 } 1466 }
1373 1467
… …
1411sub expand_cfpod { 1505sub expand_cfpod {
1412 ((my $self), (local $_)) = @_; 1506 ((my $self), (local $_)) = @_;
1413 1507
1414 # escape & and < 1508 # escape & and <
1415 s/&/&amp;/g; 1509 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g; 1510 s/(?<![BIUGHT])</&lt;/g;
1417 1511
1418 # this is buggy, it needs to properly take care of nested <'s 1512 # this is buggy, it needs to properly take care of nested <'s
1419 1513
1420 1 while 1514 1 while
1421 # replace B<>, I<>, U<> etc. 1515 # replace B<>, I<>, U<> etc.
1422 s/B<([^\>]*)>/<b>$1<\/b>/ 1516 s/B<([^\>]*)>/<b>$1<\/b>/
1423 || s/I<([^\>]*)>/<i>$1<\/i>/ 1517 || s/I<([^\>]*)>/<i>$1<\/i>/
1424 || s/U<([^\>]*)>/<u>$1<\/u>/ 1518 || s/U<([^\>]*)>/<u>$1<\/u>/
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1425 # replace G<male|female> tags 1520 # replace G<male|female> tags
1426 || s{G<([^>|]*)\|([^>]*)>}{ 1521 || s{G<([^>|]*)\|([^>]*)>}{
1427 $self->gender ? $2 : $1 1522 $self->gender ? $2 : $1
1428 }ge 1523 }ge
1429 # replace H<hint text> 1524 # replace H<hint text>
… …
1450sub hintmode { 1545sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1; 1546 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode} 1547 $_[0]{hintmode}
1453} 1548}
1454 1549
1455=item $player->ext_reply ($msgid, %msg) 1550=item $player->ext_reply ($msgid, @msg)
1456 1551
1457Sends an ext reply to the player. 1552Sends an ext reply to the player.
1458 1553
1459=cut 1554=cut
1460 1555
1461sub ext_reply($$%) { 1556sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1557 my ($self, $id, @msg) = @_;
1463 1558
1464 $msg{msgid} = $id; 1559 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1560}
1467 1561
1468=item $player->ext_event ($type, %msg) 1562=item $player->ext_msg ($type, @msg)
1469 1563
1470Sends an ext event to the client. 1564Sends an ext event to the client.
1471 1565
1472=cut 1566=cut
1473 1567
1474sub ext_event($$%) { 1568sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1569 my ($self, $type, @msg) = @_;
1476 1570
1477 $self->ns->ext_event ($type, %msg); 1571 $self->ns->ext_msg ($type, @msg);
1478} 1572}
1479 1573
1480=head3 cf::region 1574=head3 cf::region
1481 1575
1482=over 4 1576=over 4
… …
1698 1792
1699sub load_header_from($) { 1793sub load_header_from($) {
1700 my ($self, $path) = @_; 1794 my ($self, $path) = @_;
1701 1795
1702 utf8::encode $path; 1796 utf8::encode $path;
1703 #aio_open $path, O_RDONLY, 0 1797 my $f = new_from_file cf::object::thawer $path
1704 # or return;
1705
1706 $self->_load_header ($path)
1707 or return; 1798 or return;
1799
1800 $self->_load_header ($f)
1801 or return;
1802
1803 local $MAP_LOADING{$self->{path}} = $self;
1804 $f->resolve_delayed_derefs;
1708 1805
1709 $self->{load_path} = $path; 1806 $self->{load_path} = $path;
1710 1807
1711 1 1808 1
1712} 1809}
… …
1766sub find { 1863sub find {
1767 my ($path, $origin) = @_; 1864 my ($path, $origin) = @_;
1768 1865
1769 $path = normalise $path, $origin && $origin->path; 1866 $path = normalise $path, $origin && $origin->path;
1770 1867
1868 cf::lock_wait "map_data:$path";#d#remove
1771 cf::lock_wait "map_find:$path"; 1869 cf::lock_wait "map_find:$path";
1772 1870
1773 $cf::MAP{$path} || do { 1871 $cf::MAP{$path} || do {
1774 my $guard = cf::lock_acquire "map_find:$path"; 1872 my $guard1 = cf::lock_acquire "map_find:$path";
1873 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1874
1775 my $map = new_from_path cf::map $path 1875 my $map = new_from_path cf::map $path
1776 or return; 1876 or return;
1777 1877
1778 $map->{last_save} = $cf::RUNTIME; 1878 $map->{last_save} = $cf::RUNTIME;
1779 1879
… …
1781 or return; 1881 or return;
1782 1882
1783 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1883 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784 # doing this can freeze the server in a sync job, obviously 1884 # doing this can freeze the server in a sync job, obviously
1785 #$cf::WAIT_FOR_TICK->wait; 1885 #$cf::WAIT_FOR_TICK->wait;
1886 undef $guard1;
1887 undef $guard2;
1786 $map->reset; 1888 $map->reset;
1787 undef $guard;
1788 return find $path; 1889 return find $path;
1789 } 1890 }
1790 1891
1791 $cf::MAP{$path} = $map 1892 $cf::MAP{$path} = $map
1792 } 1893 }
… …
1801 local $self->{deny_reset} = 1; # loading can take a long time 1902 local $self->{deny_reset} = 1; # loading can take a long time
1802 1903
1803 my $path = $self->{path}; 1904 my $path = $self->{path};
1804 1905
1805 { 1906 {
1806 my $guard = cf::lock_acquire "map_load:$path"; 1907 my $guard = cf::lock_acquire "map_data:$path";
1807 1908
1909 return unless $self->valid;
1808 return if $self->in_memory != cf::MAP_SWAPPED; 1910 return unless $self->in_memory == cf::MAP_SWAPPED;
1809 1911
1810 $self->in_memory (cf::MAP_LOADING); 1912 $self->in_memory (cf::MAP_LOADING);
1811 1913
1812 $self->alloc; 1914 $self->alloc;
1813 1915
1814 $self->pre_load; 1916 $self->pre_load;
1815 Coro::cede; 1917 cf::cede_to_tick;
1816 1918
1919 my $f = new_from_file cf::object::thawer $self->{load_path};
1920 $f->skip_block;
1817 $self->_load_objects ($self->{load_path}, 1) 1921 $self->_load_objects ($f)
1818 or return; 1922 or return;
1819 1923
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1924 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1821 if delete $self->{load_original}; 1925 if delete $self->{load_original};
1822 1926
1823 if (my $uniq = $self->uniq_path) { 1927 if (my $uniq = $self->uniq_path) {
1824 utf8::encode $uniq; 1928 utf8::encode $uniq;
1825 if (aio_open $uniq, O_RDONLY, 0) { 1929 unless (aio_stat $uniq) {
1930 if (my $f = new_from_file cf::object::thawer $uniq) {
1826 $self->clear_unique_items; 1931 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 1932 $self->_load_objects ($f);
1933 $f->resolve_delayed_derefs;
1934 }
1828 } 1935 }
1829 } 1936 }
1830 1937
1831 Coro::cede; 1938 $f->resolve_delayed_derefs;
1939
1940 cf::cede_to_tick;
1832 # now do the right thing for maps 1941 # now do the right thing for maps
1833 $self->link_multipart_objects; 1942 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 1943 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 1944 unless $self->difficulty;
1836 Coro::cede; 1945 cf::cede_to_tick;
1837 1946
1838 unless ($self->{deny_activate}) { 1947 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 1948 $self->decay_objects;
1840 $self->fix_auto_apply; 1949 $self->fix_auto_apply;
1841 $self->update_buttons; 1950 $self->update_buttons;
1842 Coro::cede; 1951 cf::cede_to_tick;
1843 $self->set_darkness_map; 1952 $self->set_darkness_map;
1844 Coro::cede; 1953 cf::cede_to_tick;
1845 $self->activate; 1954 $self->activate;
1846 } 1955 }
1956
1957 $self->{last_save} = $cf::RUNTIME;
1958 $self->last_access ($cf::RUNTIME);
1847 1959
1848 $self->in_memory (cf::MAP_IN_MEMORY); 1960 $self->in_memory (cf::MAP_IN_MEMORY);
1849 } 1961 }
1850 1962
1851 $self->post_load; 1963 $self->post_load;
… …
1862 1974
1863 $self 1975 $self
1864} 1976}
1865 1977
1866# find and load all maps in the 3x3 area around a map 1978# find and load all maps in the 3x3 area around a map
1867sub load_diag { 1979sub load_neighbours {
1868 my ($map) = @_; 1980 my ($map) = @_;
1869 1981
1870 my @diag; # diagonal neighbours 1982 my @neigh; # diagonal neighbours
1871 1983
1872 for (0 .. 3) { 1984 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 1985 my $neigh = $map->tile_path ($_)
1874 or next; 1986 or next;
1875 $neigh = find $neigh, $map 1987 $neigh = find $neigh, $map
1876 or next; 1988 or next;
1877 $neigh->load; 1989 $neigh->load;
1878 1990
1991 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1992 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1993 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 1994 }
1882 1995
1883 for (@diag) { 1996 for (grep defined $_->[0], @neigh) {
1997 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 1998 my $neigh = find $path, $origin
1885 or next; 1999 or next;
1886 $neigh->load; 2000 $neigh->load;
1887 } 2001 }
1888} 2002}
1889 2003
… …
1894} 2008}
1895 2009
1896sub do_load_sync { 2010sub do_load_sync {
1897 my ($map) = @_; 2011 my ($map) = @_;
1898 2012
2013 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2014 if $Coro::current == $Coro::main;
2015
1899 cf::sync_job { $map->load }; 2016 cf::sync_job { $map->load };
1900} 2017}
1901 2018
1902our %MAP_PREFETCH; 2019our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 2020our $MAP_PREFETCHER = undef;
1904 2021
1905sub find_async { 2022sub find_async {
1906 my ($path, $origin) = @_; 2023 my ($path, $origin, $load) = @_;
1907 2024
1908 $path = normalise $path, $origin && $origin->{path}; 2025 $path = normalise $path, $origin && $origin->{path};
1909 2026
1910 if (my $map = $cf::MAP{$path}) { 2027 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2028 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1912 } 2029 }
1913 2030
1914 undef $MAP_PREFETCH{$path}; 2031 $MAP_PREFETCH{$path} |= $load;
2032
1915 $MAP_PREFETCHER ||= cf::async { 2033 $MAP_PREFETCHER ||= cf::async {
1916 while (%MAP_PREFETCH) { 2034 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 2035 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 2036 if (my $map = find $k) {
1919 $map->load; 2037 $map->load if $v;
1920 } 2038 }
1921 2039
1922 delete $MAP_PREFETCH{$path}; 2040 delete $MAP_PREFETCH{$k};
1923 } 2041 }
1924 } 2042 }
1925 undef $MAP_PREFETCHER; 2043 undef $MAP_PREFETCHER;
1926 }; 2044 };
1927 $MAP_PREFETCHER->prio (6); 2045 $MAP_PREFETCHER->prio (6);
… …
1930} 2048}
1931 2049
1932sub save { 2050sub save {
1933 my ($self) = @_; 2051 my ($self) = @_;
1934 2052
1935 my $lock = cf::lock_acquire "map_data:" . $self->path; 2053 my $lock = cf::lock_acquire "map_data:$self->{path}";
1936 2054
1937 $self->{last_save} = $cf::RUNTIME; 2055 $self->{last_save} = $cf::RUNTIME;
1938 2056
1939 return unless $self->dirty; 2057 return unless $self->dirty;
1940 2058
… …
1963 my ($self) = @_; 2081 my ($self) = @_;
1964 2082
1965 # save first because save cedes 2083 # save first because save cedes
1966 $self->save; 2084 $self->save;
1967 2085
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2086 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2087
1970 return if $self->players; 2088 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY; 2089 return if $self->in_memory != cf::MAP_IN_MEMORY;
1972 return if $self->{deny_save}; 2090 return if $self->{deny_save};
1973 2091
2092 $self->in_memory (cf::MAP_SWAPPED);
2093
2094 $self->deactivate;
2095 $_->clear_links_to ($self) for values %cf::MAP;
1974 $self->clear; 2096 $self->clear;
1975 $self->in_memory (cf::MAP_SWAPPED);
1976} 2097}
1977 2098
1978sub reset_at { 2099sub reset_at {
1979 my ($self) = @_; 2100 my ($self) = @_;
1980 2101
… …
2012 if $uniq; 2133 if $uniq;
2013 } 2134 }
2014 2135
2015 delete $cf::MAP{$self->path}; 2136 delete $cf::MAP{$self->path};
2016 2137
2138 $self->deactivate;
2139 $_->clear_links_to ($self) for values %cf::MAP;
2017 $self->clear; 2140 $self->clear;
2018
2019 $_->clear_links_to ($self) for values %cf::MAP;
2020 2141
2021 $self->unlink_save; 2142 $self->unlink_save;
2022 $self->destroy; 2143 $self->destroy;
2023} 2144}
2024 2145
2025my $nuke_counter = "aaaa"; 2146my $nuke_counter = "aaaa";
2026 2147
2027sub nuke { 2148sub nuke {
2028 my ($self) = @_; 2149 my ($self) = @_;
2029 2150
2151 {
2152 my $lock = cf::lock_acquire "map_data:$self->{path}";
2153
2030 delete $cf::MAP{$self->path}; 2154 delete $cf::MAP{$self->path};
2031 2155
2032 $self->unlink_save; 2156 $self->unlink_save;
2033 2157
2034 bless $self, "cf::map"; 2158 bless $self, "cf::map";
2035 delete $self->{deny_reset}; 2159 delete $self->{deny_reset};
2036 $self->{deny_save} = 1; 2160 $self->{deny_save} = 1;
2037 $self->reset_timeout (1); 2161 $self->reset_timeout (1);
2038 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2162 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039 2163
2040 $cf::MAP{$self->path} = $self; 2164 $cf::MAP{$self->path} = $self;
2165 }
2041 2166
2042 $self->reset; # polite request, might not happen 2167 $self->reset; # polite request, might not happen
2043} 2168}
2044 2169
2045=item $maps = cf::map::tmp_maps 2170=item $maps = cf::map::tmp_maps
… …
2121 2246
2122sub inv_recursive { 2247sub inv_recursive {
2123 inv_recursive_ inv $_[0] 2248 inv_recursive_ inv $_[0]
2124} 2249}
2125 2250
2251=item $ref = $ob->ref
2252
2253creates and returns a persistent reference to an objetc that can be stored as a string.
2254
2255=item $ob = cf::object::deref ($refstring)
2256
2257returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2258even if the object actually exists. May block.
2259
2260=cut
2261
2262sub deref {
2263 my ($ref) = @_;
2264
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return;
2272 $pl->ob->uuid eq $uuid
2273 or return;
2274
2275 $pl->ob
2276 } else {
2277 warn "$ref: cannot resolve object reference\n";
2278 undef
2279 }
2280}
2281
2126package cf; 2282package cf;
2127 2283
2128=back 2284=back
2129 2285
2130=head3 cf::object::player 2286=head3 cf::object::player
… …
2152 2308
2153 } else { 2309 } else {
2154 my $pl = $self->contr; 2310 my $pl = $self->contr;
2155 2311
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2312 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2313 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2314 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164 2315
2165 } else { 2316 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2317 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2318 $self->message ($msg, $flags);
2168 } 2319 }
2169 } 2320 }
2321}
2322
2323=item $object->send_msg ($channel, $msg, $color, [extra...])
2324
2325=cut
2326
2327sub cf::object::send_msg {
2328 my $pl = shift->contr
2329 or return;
2330 $pl->send_msg (@_);
2170} 2331}
2171 2332
2172=item $player_object->may ("access") 2333=item $player_object->may ("access")
2173 2334
2174Returns wether the given player is authorized to access resource "access" 2335Returns wether the given player is authorized to access resource "access"
… …
2253 # use -1 or undef as default coordinates, not 0, 0 2414 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2415 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2416 if $x <=0 && $y <= 0;
2256 2417
2257 $map->load; 2418 $map->load;
2258 $map->load_diag; 2419 $map->load_neighbours;
2259 2420
2260 return unless $self->contr->active; 2421 return unless $self->contr->active;
2261 $self->activate_recursive; 2422 $self->activate_recursive;
2262 2423
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2424 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2425 2586
2426 utf8::encode $text; 2587 utf8::encode $text;
2427 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2588 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2428} 2589}
2429 2590
2430=item $client->send_msg ($color, $type, $msg, [extra...]) 2591=item $client->send_msg ($channel, $msg, $color, [extra...])
2431 2592
2432Send a drawinfo or msg packet to the client, formatting the msg for the 2593Send a drawinfo or msg packet to the client, formatting the msg for the
2433client if neccessary. C<$type> should be a string identifying the type of 2594client if neccessary. C<$type> should be a string identifying the type of
2434the message, with C<log> being the default. If C<$color> is negative, suppress 2595the message, with C<log> being the default. If C<$color> is negative, suppress
2435the message unless the client supports the msg packet. 2596the message unless the client supports the msg packet.
2436 2597
2437=cut 2598=cut
2438 2599
2600our %CHANNEL = (
2601 "c/identify" => {
2602 id => "identify",
2603 title => "Identify",
2604 reply => undef,
2605 tooltip => "Items recently identified",
2606 },
2607 "c/examine" => {
2608 id => "examine",
2609 title => "Examine",
2610 reply => undef,
2611 tooltip => "Signs and other items you examined",
2612 },
2613);
2614
2439sub cf::client::send_msg { 2615sub cf::client::send_msg {
2440 my ($self, $color, $type, $msg, @extra) = @_; 2616 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2617
2442 $msg = $self->pl->expand_cfpod ($msg); 2618 $msg = $self->pl->expand_cfpod ($msg);
2443 2619
2620 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621
2622 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2624
2625 if (ref $channel) {
2626 # send meta info to client, if not yet sent
2627 unless (exists $self->{channel}{$channel->{id}}) {
2628 $self->{channel}{$channel->{id}} = $channel;
2629 $self->ext_msg (channel_info => $channel)
2630 if $self->can_msg;
2631 }
2632
2633 $channel = $channel->{id};
2634 }
2635
2444 return unless @extra || length $msg; 2636 return unless @extra || length $msg;
2445 2637
2446 if ($self->can_msg) { 2638 if ($self->can_msg) {
2639 # default colour, mask it out
2640 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2641 if $color & cf::NDI_DEF;
2642
2447 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2643 $self->send_packet ("msg " . $self->{json_coder}->encode (
2644 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2448 } else { 2645 } else {
2449 # replace some tags by gcfclient-compatible ones
2450 for ($msg) {
2451 1 while
2452 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2453 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2454 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2455 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2456 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2457 }
2458
2459 if ($color >= 0) { 2646 if ($color >= 0) {
2647 # replace some tags by gcfclient-compatible ones
2648 for ($msg) {
2649 1 while
2650 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2651 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2652 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2653 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2654 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2655 }
2656
2657 $color &= cf::NDI_COLOR_MASK;
2658
2659 utf8::encode $msg;
2660
2460 if (0 && $msg =~ /\[/) { 2661 if (0 && $msg =~ /\[/) {
2662 # COMMAND/INFO
2461 $self->send_packet ("drawextinfo $color 4 0 $msg") 2663 $self->send_packet ("drawextinfo $color 10 8 $msg")
2462 } else { 2664 } else {
2463 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2665 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2464 $self->send_packet ("drawinfo $color $msg") 2666 $self->send_packet ("drawinfo $color $msg")
2465 } 2667 }
2466 } 2668 }
2467 } 2669 }
2468} 2670}
2469 2671
2470=item $client->ext_event ($type, %msg) 2672=item $client->ext_msg ($type, @msg)
2471 2673
2472Sends an ext event to the client. 2674Sends an ext event to the client.
2473 2675
2474=cut 2676=cut
2475 2677
2476sub cf::client::ext_event($$%) { 2678sub cf::client::ext_msg($$@) {
2477 my ($self, $type, %msg) = @_; 2679 my ($self, $type, @msg) = @_;
2478 2680
2479 return unless $self->extcmd; 2681 if ($self->extcmd == 2) {
2480 2682 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2683 } elsif ($self->extcmd == 1) { # TODO: remove
2481 $msg{msgtype} = "event_$type"; 2684 push @msg, msgtype => "event_$type";
2482 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2685 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2686 }
2687}
2688
2689=item $client->ext_reply ($msgid, @msg)
2690
2691Sends an ext reply to the client.
2692
2693=cut
2694
2695sub cf::client::ext_reply($$@) {
2696 my ($self, $id, @msg) = @_;
2697
2698 if ($self->extcmd == 2) {
2699 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2700 } elsif ($self->extcmd == 1) {
2701 #TODO: version 1, remove
2702 unshift @msg, msgtype => "reply", msgid => $id;
2703 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2704 }
2483} 2705}
2484 2706
2485=item $success = $client->query ($flags, "text", \&cb) 2707=item $success = $client->query ($flags, "text", \&cb)
2486 2708
2487Queues a query to the client, calling the given callback with 2709Queues a query to the client, calling the given callback with
… …
2542 my ($ns, $buf) = @_; 2764 my ($ns, $buf) = @_;
2543 2765
2544 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2766 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2545 2767
2546 if (ref $msg) { 2768 if (ref $msg) {
2769 my ($type, $reply, @payload) =
2770 "ARRAY" eq ref $msg
2771 ? @$msg
2772 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2773
2774 my @reply;
2775
2547 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2776 if (my $cb = $EXTICMD{$type}) {
2548 if (my %reply = $cb->($ns, $msg)) { 2777 @reply = $cb->($ns, @payload);
2549 $reply{msgid} = $msg->{msgid};
2550 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2551 }
2552 } 2778 }
2779
2780 $ns->ext_reply ($reply, @reply)
2781 if $reply;
2782
2553 } else { 2783 } else {
2554 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2784 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2555 } 2785 }
2556 2786
2557 cf::override; 2787 cf::override;
… …
2604our $safe = new Safe "safe"; 2834our $safe = new Safe "safe";
2605our $safe_hole = new Safe::Hole; 2835our $safe_hole = new Safe::Hole;
2606 2836
2607$SIG{FPE} = 'IGNORE'; 2837$SIG{FPE} = 'IGNORE';
2608 2838
2609$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2839$safe->permit_only (Opcode::opset qw(
2840 :base_core :base_mem :base_orig :base_math
2841 grepstart grepwhile mapstart mapwhile
2842 sort time
2843));
2610 2844
2611# here we export the classes and methods available to script code 2845# here we export the classes and methods available to script code
2612 2846
2613=pod 2847=pod
2614 2848
2615The following functions and methods are available within a safe environment: 2849The following functions and methods are available within a safe environment:
2616 2850
2617 cf::object 2851 cf::object
2618 contr pay_amount pay_player map x y force_find force_add 2852 contr pay_amount pay_player map x y force_find force_add
2619 insert remove 2853 insert remove name archname title slaying race decrease_ob_nr
2620 2854
2621 cf::object::player 2855 cf::object::player
2622 player 2856 player
2623 2857
2624 cf::player 2858 cf::player
… …
2629 2863
2630=cut 2864=cut
2631 2865
2632for ( 2866for (
2633 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2867 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2868 insert remove inv name archname title slaying race
2634 insert remove)], 2869 decrease_ob_nr)],
2635 ["cf::object::player" => qw(player)], 2870 ["cf::object::player" => qw(player)],
2636 ["cf::player" => qw(peaceful)], 2871 ["cf::player" => qw(peaceful)],
2637 ["cf::map" => qw(trigger)], 2872 ["cf::map" => qw(trigger)],
2638) { 2873) {
2639 no strict 'refs'; 2874 no strict 'refs';
… …
2715# the server's init and main functions 2950# the server's init and main functions
2716 2951
2717sub load_facedata($) { 2952sub load_facedata($) {
2718 my ($path) = @_; 2953 my ($path) = @_;
2719 2954
2955 # HACK to clear player env face cache, we need some signal framework
2956 # for this (global event?)
2957 %ext::player_env::MUSIC_FACE_CACHE = ();
2958
2959 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2960
2720 warn "loading facedata from $path\n"; 2961 warn "loading facedata from $path\n";
2721 2962
2722 my $facedata; 2963 my $facedata;
2723 0 < aio_load $path, $facedata 2964 0 < aio_load $path, $facedata
2724 or die "$path: $!"; 2965 or die "$path: $!";
2725 2966
2726 $facedata = Coro::Storable::thaw $facedata; 2967 $facedata = Coro::Storable::thaw $facedata;
2727 2968
2728 $facedata->{version} == 2 2969 $facedata->{version} == 2
2729 or cf::cleanup "$path: version mismatch, cannot proceed."; 2970 or cf::cleanup "$path: version mismatch, cannot proceed.";
2971
2972 # patch in the exptable
2973 $facedata->{resource}{"res/exp_table"} = {
2974 type => FT_RSRC,
2975 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2976 };
2977 cf::cede_to_tick;
2730 2978
2731 { 2979 {
2732 my $faces = $facedata->{faceinfo}; 2980 my $faces = $facedata->{faceinfo};
2733 2981
2734 while (my ($face, $info) = each %$faces) { 2982 while (my ($face, $info) = each %$faces) {
2735 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2983 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2736 cf::face::set_visibility $idx, $info->{visibility}; 2984 cf::face::set_visibility $idx, $info->{visibility};
2737 cf::face::set_magicmap $idx, $info->{magicmap}; 2985 cf::face::set_magicmap $idx, $info->{magicmap};
2738 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2739 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2987 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2740 2988
2741 cf::cede_to_tick; 2989 cf::cede_to_tick;
2742 } 2990 }
2743 2991
2744 while (my ($face, $info) = each %$faces) { 2992 while (my ($face, $info) = each %$faces) {
… …
2769 3017
2770 { 3018 {
2771 # TODO: for gcfclient pleasure, we should give resources 3019 # TODO: for gcfclient pleasure, we should give resources
2772 # that gcfclient doesn't grok a >10000 face index. 3020 # that gcfclient doesn't grok a >10000 face index.
2773 my $res = $facedata->{resource}; 3021 my $res = $facedata->{resource};
2774 my $enc = JSON::XS->new->utf8->canonical; 3022
3023 my $soundconf = delete $res->{"res/sound.conf"};
2775 3024
2776 while (my ($name, $info) = each %$res) { 3025 while (my ($name, $info) = each %$res) {
2777 my $meta = $enc->encode ({
2778 name => $name,
2779 type => $info->{type},
2780 copyright => $info->{copyright}, #TODO#
2781 });
2782
2783 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3026 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data;
2784 3028
2785 if ($name =~ /\.jpg$/) { 3029 if ($info->{type} & 1) {
2786 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3030 # prepend meta info
2787 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3031
3032 my $meta = $enc->encode ({
3033 name => $name,
3034 %{ $info->{meta} || {} },
3035 });
3036
3037 $data = pack "(w/a*)*", $meta, $info->{data};
2788 } else { 3038 } else {
2789 my $data = pack "(w/a*)*", $meta, $info->{data}; 3039 $data = $info->{data};
2790 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2791
2792 cf::face::set_type $idx, 1;
2793 cf::face::set_data $idx, 0, $data, $chk;
2794 } 3040 }
2795 3041
3042 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3043 cf::face::set_type $idx, $info->{type};
3044
2796 cf::cede_to_tick; 3045 cf::cede_to_tick;
2797 } 3046 }
3047
3048 if ($soundconf) {
3049 $soundconf = $enc->decode (delete $soundconf->{data});
3050
3051 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3052 my $sound = $soundconf->{compat}[$_]
3053 or next;
3054
3055 my $face = cf::face::find "sound/$sound->[1]";
3056 cf::sound::set $sound->[0] => $face;
3057 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3058 }
3059
3060 while (my ($k, $v) = each %{$soundconf->{event}}) {
3061 my $face = cf::face::find "sound/$v";
3062 cf::sound::set $k => $face;
3063 }
3064 }
2798 } 3065 }
2799 3066
2800 1 3067 1
2801} 3068}
2802 3069
3070register_exticmd fx_want => sub {
3071 my ($ns, $want) = @_;
3072
3073 while (my ($k, $v) = each %$want) {
3074 $ns->fx_want ($k, $v);
3075 }
3076};
3077
2803sub reload_regions { 3078sub reload_regions {
3079 # HACK to clear player env face cache, we need some signal framework
3080 # for this (global event?)
3081 %ext::player_env::MUSIC_FACE_CACHE = ();
3082
2804 load_resource_file "$MAPDIR/regions" 3083 load_resource_file "$MAPDIR/regions"
2805 or die "unable to load regions file\n"; 3084 or die "unable to load regions file\n";
2806 3085
2807 for (cf::region::list) { 3086 for (cf::region::list) {
2808 $_->{match} = qr/$_->{match}/ 3087 $_->{match} = qr/$_->{match}/
… …
2844 3123
2845sub init { 3124sub init {
2846 reload_resources; 3125 reload_resources;
2847} 3126}
2848 3127
2849sub cfg_load { 3128sub reload_config {
2850 open my $fh, "<:utf8", "$CONFDIR/config" 3129 open my $fh, "<:utf8", "$CONFDIR/config"
2851 or return; 3130 or return;
2852 3131
2853 local $/; 3132 local $/;
2854 *CFG = YAML::Syck::Load <$fh>; 3133 *CFG = YAML::Syck::Load <$fh>;
… …
2874 (async { 3153 (async {
2875 Event::one_event; 3154 Event::one_event;
2876 })->prio (Coro::PRIO_MAX); 3155 })->prio (Coro::PRIO_MAX);
2877 }; 3156 };
2878 3157
2879 cfg_load; 3158 reload_config;
2880 db_init; 3159 db_init;
2881 load_extensions; 3160 load_extensions;
2882 3161
2883 $TICK_WATCHER->start; 3162 $TICK_WATCHER->start;
2884 Event::loop; 3163 Event::loop;
… …
3077 warn "reloading cf.pm"; 3356 warn "reloading cf.pm";
3078 require cf; 3357 require cf;
3079 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3358 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3080 3359
3081 warn "loading config and database again"; 3360 warn "loading config and database again";
3082 cf::cfg_load; 3361 cf::reload_config;
3083 3362
3084 warn "loading extensions"; 3363 warn "loading extensions";
3085 cf::load_extensions; 3364 cf::load_extensions;
3086 3365
3087 warn "reattaching attachments to objects/players"; 3366 warn "reattaching attachments to objects/players";
… …
3180 or die; 3459 or die;
3181 3460
3182 $map->width (50); 3461 $map->width (50);
3183 $map->height (50); 3462 $map->height (50);
3184 $map->alloc; 3463 $map->alloc;
3185 $map->_load_objects ("/tmp/x.map", 1); 3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3186 my $t = Event::time - $t; 3465 my $t = Event::time - $t;
3187 3466
3188 #next unless $t < 0.0013;#d# 3467 #next unless $t < 0.0013;#d#
3189 if ($t < $min) { 3468 if ($t < $min) {
3190 $min = $t; 3469 $min = $t;

Diff Legend

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