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

Diff Legend

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