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.308 by root, Mon Jul 16 14:09:40 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
… …
166=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
167 168
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
170per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
171 178
172=back 179=back
173 180
174=cut 181=cut
175 182
… …
265Wait 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
266a 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,
267for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
268returned. 275returned.
269 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
270Lock 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
271uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
272 282
273=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
274 284
275Return 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.
276 286
277=cut 287=cut
278 288
279our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
280 291
281sub lock_wait($) { 292sub lock_wait($) {
282 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#
283 299
284 # wait for lock, if any 300 # wait for lock, if any
285 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule; 303 Coro::schedule;
… …
293 309
294 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
295 lock_wait $key; 311 lock_wait $key;
296 312
297 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
298 315
299 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
300 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
302 } 320 }
303} 321}
304 322
… …
314 my $guard = Coro::guard { 332 my $guard = Coro::guard {
315 $TICK_WATCHER->start; 333 $TICK_WATCHER->start;
316 }; 334 };
317 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
318 $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;
319} 393}
320 394
321=item cf::async { BLOCK } 395=item cf::async { BLOCK }
322 396
323Currently the same as Coro::async_pool, meaning you cannot use 397Currently the same as Coro::async_pool, meaning you cannot use
… …
410Coro::Storable. May, of course, block. Note that the executed sub may 484Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 485never block itself or use any form of Event handling.
412 486
413=cut 487=cut
414 488
415sub _store_scalar {
416 open my $fh, ">", \my $buf
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422}
423
424sub fork_call(&@) { 489sub fork_call(&@) {
425 my ($cb, @args) = @_; 490 my ($cb, @args) = @_;
426 491
427# 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,
428# or die "socketpair: $!"; 493 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 494 # TODO: investigate and fix (likely this will be rather laborious)
430 or die "pipe: $!";
431 495
432 if (my $pid = fork) { 496 my @res = Coro::Util::fork_eval {
433 close $fh2;
434
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
437 $res = Coro::Storable::thaw $res;
438
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals; 497 reset_signals;
446 local $SIG{__WARN__}; 498 &$cb
447 local $SIG{__DIE__}; 499 }, @args;
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453 500
454 eval { 501 wantarray ? @res : $res[-1]
455 close $fh1;
456
457 my @res = eval { $cb->(@args) };
458
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460 close $fh2;
461 };
462
463 warn $@ if $@;
464 _exit 0;
465 }
466} 502}
467 503
468=item $value = cf::db_get $family => $key 504=item $value = cf::db_get $family => $key
469 505
470Returns a single value from the environment database. 506Returns a single value from the environment database.
… …
550 if (1) { 586 if (1) {
551 $md5 = 587 $md5 =
552 join "\x00", 588 join "\x00",
553 $processversion, 589 $processversion,
554 map { 590 map {
555 Coro::cede; 591 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 592 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 593 } 0.. $#$src;
558 594
559 595
560 my $dbmd5 = db_get cache => "$id/md5"; 596 my $dbmd5 = db_get cache => "$id/md5";
… …
866 "; 902 ";
867 die if $@; 903 die if $@;
868} 904}
869 905
870our $override; 906our $override;
871our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 907our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872 908
873sub override { 909sub override {
874 $override = 1; 910 $override = 1;
875 @invoke_results = (); 911 @INVOKE_RESULTS = (@_);
876} 912}
877 913
878sub do_invoke { 914sub do_invoke {
879 my $event = shift; 915 my $event = shift;
880 my $callbacks = shift; 916 my $callbacks = shift;
881 917
882 @invoke_results = (); 918 @INVOKE_RESULTS = ();
883 919
884 local $override; 920 local $override;
885 921
886 for (@$callbacks) { 922 for (@$callbacks) {
887 eval { &{$_->[1]} }; 923 eval { &{$_->[1]} };
… …
904 940
905Generate an object-specific event with the given arguments. 941Generate an object-specific event with the given arguments.
906 942
907This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 943This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908removed in future versions), and there is no public API to access override 944removed in future versions), and there is no public API to access override
909results (if you must, access C<@cf::invoke_results> directly). 945results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 946
911=back 947=back
912 948
913=cut 949=cut
914 950
915############################################################################# 951#############################################################################
916# 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}
917 964
918sub reattach { 965sub reattach {
919 # basically do the same as instantiate, without calling instantiate 966 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 967 my ($obj) = @_;
921 968
… …
965 }, 1012 },
966); 1013);
967 1014
968sub object_freezer_save { 1015sub object_freezer_save {
969 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
1017
1018 my $guard = cf::lock_acquire "io";
970 1019
971 sync_job { 1020 sync_job {
972 if (length $$rdata) { 1021 if (length $$rdata) {
973 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
974 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
… …
998 } 1047 }
999 } else { 1048 } else {
1000 aio_unlink $filename; 1049 aio_unlink $filename;
1001 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
1002 } 1051 }
1003 } 1052 };
1053
1054 undef $guard;
1004} 1055}
1005 1056
1006sub object_freezer_as_string { 1057sub object_freezer_as_string {
1007 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
1008 1059
… …
1013 1064
1014sub object_thawer_load { 1065sub object_thawer_load {
1015 my ($filename) = @_; 1066 my ($filename) = @_;
1016 1067
1017 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1018 1071
1019 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
1020 or return; 1073 or return;
1021 1074
1022 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
1023 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
1024 or return; 1077 or return;
1078
1079 undef $guard;
1025 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
1026 } 1081 }
1027 1082
1028 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
1029 $filename, length $data, scalar @{$av || []}; 1084 $filename, length $data, scalar @{$av || []};
1085
1030 return ($data, $av); 1086 ($data, $av)
1031} 1087}
1032 1088
1033=head2 COMMAND CALLBACKS 1089=head2 COMMAND CALLBACKS
1034 1090
1035=over 4 1091=over 4
… …
1108 my ($pl, $buf) = @_; 1164 my ($pl, $buf) = @_;
1109 1165
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1166 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1167
1112 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
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1176 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1177 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
1118 } else { 1183 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1185 }
1121 1186
1122 cf::override; 1187 cf::override;
… …
1212 1277
1213=head3 cf::player 1278=head3 cf::player
1214 1279
1215=over 4 1280=over 4
1216 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
1217=item cf::player::find $login 1296=item cf::player::find $login
1218 1297
1219Returns the given player object, loading it if necessary (might block). 1298Returns the given player object, loading it if necessary (might block).
1220 1299
1221=cut 1300=cut
… …
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1337 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl"; 1338 aio_unlink +(playerdir $login) . "/$login.pl";
1260 1339
1261 my $pl = load_pl path $login 1340 my $f = new_from_file cf::object::thawer path $login
1262 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;
1263 $cf::PLAYER{$login} = $pl 1348 $cf::PLAYER{$login} = $pl
1264 } 1349 }
1265 } 1350 }
1266} 1351}
1267 1352
… …
1277 1362
1278 aio_mkdir playerdir $pl, 0770; 1363 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1364 $pl->{last_save} = $cf::RUNTIME;
1280 1365
1281 $pl->save_pl ($path); 1366 $pl->save_pl ($path);
1282 Coro::cede; 1367 cf::cede_to_tick;
1283} 1368}
1284 1369
1285sub new($) { 1370sub new($) {
1286 my ($login) = @_; 1371 my ($login) = @_;
1287 1372
… …
1291 $self->{deny_save} = 1; 1376 $self->{deny_save} = 1;
1292 1377
1293 $cf::PLAYER{$login} = $self; 1378 $cf::PLAYER{$login} = $self;
1294 1379
1295 $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 (@_);
1296} 1391}
1297 1392
1298=item $pl->quit_character 1393=item $pl->quit_character
1299 1394
1300Nukes the player without looking back. If logged in, the connection will 1395Nukes the player without looking back. If logged in, the connection will
… …
1355 or return []; 1450 or return [];
1356 1451
1357 my @logins; 1452 my @logins;
1358 1453
1359 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") {
1360 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1459 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361 aio_read $fh, 0, 512, my $buf, 0 or next; 1460 aio_read $fh, 0, 512, my $buf, 0 or next;
1362 $buf !~ /^password -------------$/m or next; # official not-valid tag 1461 $buf !~ /^password -------------$/m or next; # official not-valid tag
1462 }
1363 1463
1364 utf8::decode $login; 1464 utf8::decode $login;
1365 push @logins, $login; 1465 push @logins, $login;
1366 } 1466 }
1367 1467
… …
1405sub expand_cfpod { 1505sub expand_cfpod {
1406 ((my $self), (local $_)) = @_; 1506 ((my $self), (local $_)) = @_;
1407 1507
1408 # escape & and < 1508 # escape & and <
1409 s/&/&amp;/g; 1509 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g; 1510 s/(?<![BIUGHT])</&lt;/g;
1411 1511
1412 # 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
1413 1513
1414 1 while 1514 1 while
1415 # replace B<>, I<>, U<> etc. 1515 # replace B<>, I<>, U<> etc.
1416 s/B<([^\>]*)>/<b>$1<\/b>/ 1516 s/B<([^\>]*)>/<b>$1<\/b>/
1417 || s/I<([^\>]*)>/<i>$1<\/i>/ 1517 || s/I<([^\>]*)>/<i>$1<\/i>/
1418 || s/U<([^\>]*)>/<u>$1<\/u>/ 1518 || s/U<([^\>]*)>/<u>$1<\/u>/
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1419 # replace G<male|female> tags 1520 # replace G<male|female> tags
1420 || s{G<([^>|]*)\|([^>]*)>}{ 1521 || s{G<([^>|]*)\|([^>]*)>}{
1421 $self->gender ? $2 : $1 1522 $self->gender ? $2 : $1
1422 }ge 1523 }ge
1423 # replace H<hint text> 1524 # replace H<hint text>
… …
1444sub hintmode { 1545sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1546 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1547 $_[0]{hintmode}
1447} 1548}
1448 1549
1449=item $player->ext_reply ($msgid, %msg) 1550=item $player->ext_reply ($msgid, @msg)
1450 1551
1451Sends an ext reply to the player. 1552Sends an ext reply to the player.
1452 1553
1453=cut 1554=cut
1454 1555
1455sub ext_reply($$%) { 1556sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1557 my ($self, $id, @msg) = @_;
1457 1558
1458 $msg{msgid} = $id; 1559 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1560}
1461 1561
1462=item $player->ext_event ($type, %msg) 1562=item $player->ext_msg ($type, @msg)
1463 1563
1464Sends an ext event to the client. 1564Sends an ext event to the client.
1465 1565
1466=cut 1566=cut
1467 1567
1468sub ext_event($$%) { 1568sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1569 my ($self, $type, @msg) = @_;
1470 1570
1471 $self->ns->ext_event ($type, %msg); 1571 $self->ns->ext_msg ($type, @msg);
1472} 1572}
1473 1573
1474=head3 cf::region 1574=head3 cf::region
1475 1575
1476=over 4 1576=over 4
… …
1692 1792
1693sub load_header_from($) { 1793sub load_header_from($) {
1694 my ($self, $path) = @_; 1794 my ($self, $path) = @_;
1695 1795
1696 utf8::encode $path; 1796 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1797 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 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;
1702 1805
1703 $self->{load_path} = $path; 1806 $self->{load_path} = $path;
1704 1807
1705 1 1808 1
1706} 1809}
… …
1760sub find { 1863sub find {
1761 my ($path, $origin) = @_; 1864 my ($path, $origin) = @_;
1762 1865
1763 $path = normalise $path, $origin && $origin->path; 1866 $path = normalise $path, $origin && $origin->path;
1764 1867
1868 cf::lock_wait "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 1869 cf::lock_wait "map_find:$path";
1766 1870
1767 $cf::MAP{$path} || do { 1871 $cf::MAP{$path} || do {
1768 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
1769 my $map = new_from_path cf::map $path 1875 my $map = new_from_path cf::map $path
1770 or return; 1876 or return;
1771 1877
1772 $map->{last_save} = $cf::RUNTIME; 1878 $map->{last_save} = $cf::RUNTIME;
1773 1879
… …
1775 or return; 1881 or return;
1776 1882
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1883 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 1884 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 1885 #$cf::WAIT_FOR_TICK->wait;
1886 undef $guard1;
1887 undef $guard2;
1780 $map->reset; 1888 $map->reset;
1781 undef $guard;
1782 return find $path; 1889 return find $path;
1783 } 1890 }
1784 1891
1785 $cf::MAP{$path} = $map 1892 $cf::MAP{$path} = $map
1786 } 1893 }
… …
1795 local $self->{deny_reset} = 1; # loading can take a long time 1902 local $self->{deny_reset} = 1; # loading can take a long time
1796 1903
1797 my $path = $self->{path}; 1904 my $path = $self->{path};
1798 1905
1799 { 1906 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 1907 my $guard = cf::lock_acquire "map_data:$path";
1801 1908
1909 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 1910 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 1911
1804 $self->in_memory (cf::MAP_LOADING); 1912 $self->in_memory (cf::MAP_LOADING);
1805 1913
1806 $self->alloc; 1914 $self->alloc;
1807 1915
1808 $self->pre_load; 1916 $self->pre_load;
1809 Coro::cede; 1917 cf::cede_to_tick;
1810 1918
1919 my $f = new_from_file cf::object::thawer $self->{load_path};
1920 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 1921 $self->_load_objects ($f)
1812 or return; 1922 or return;
1813 1923
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1924 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815 if delete $self->{load_original}; 1925 if delete $self->{load_original};
1816 1926
1817 if (my $uniq = $self->uniq_path) { 1927 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 1928 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 1929 unless (aio_stat $uniq) {
1930 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 1931 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 1932 $self->_load_objects ($f);
1933 $f->resolve_delayed_derefs;
1934 }
1822 } 1935 }
1823 } 1936 }
1824 1937
1825 Coro::cede; 1938 $f->resolve_delayed_derefs;
1939
1940 cf::cede_to_tick;
1826 # now do the right thing for maps 1941 # now do the right thing for maps
1827 $self->link_multipart_objects; 1942 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 1943 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 1944 unless $self->difficulty;
1830 Coro::cede; 1945 cf::cede_to_tick;
1831 1946
1832 unless ($self->{deny_activate}) { 1947 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 1948 $self->decay_objects;
1834 $self->fix_auto_apply; 1949 $self->fix_auto_apply;
1835 $self->update_buttons; 1950 $self->update_buttons;
1836 Coro::cede; 1951 cf::cede_to_tick;
1837 $self->set_darkness_map; 1952 $self->set_darkness_map;
1838 Coro::cede; 1953 cf::cede_to_tick;
1839 $self->activate; 1954 $self->activate;
1840 } 1955 }
1956
1957 $self->{last_save} = $cf::RUNTIME;
1958 $self->last_access ($cf::RUNTIME);
1841 1959
1842 $self->in_memory (cf::MAP_IN_MEMORY); 1960 $self->in_memory (cf::MAP_IN_MEMORY);
1843 } 1961 }
1844 1962
1845 $self->post_load; 1963 $self->post_load;
… …
1856 1974
1857 $self 1975 $self
1858} 1976}
1859 1977
1860# 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
1861sub load_diag { 1979sub load_neighbours {
1862 my ($map) = @_; 1980 my ($map) = @_;
1863 1981
1864 my @diag; # diagonal neighbours 1982 my @neigh; # diagonal neighbours
1865 1983
1866 for (0 .. 3) { 1984 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 1985 my $neigh = $map->tile_path ($_)
1868 or next; 1986 or next;
1869 $neigh = find $neigh, $map 1987 $neigh = find $neigh, $map
1870 or next; 1988 or next;
1871 $neigh->load; 1989 $neigh->load;
1872 1990
1991 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1992 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1993 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 1994 }
1876 1995
1877 for (@diag) { 1996 for (grep defined $_->[0], @neigh) {
1997 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 1998 my $neigh = find $path, $origin
1879 or next; 1999 or next;
1880 $neigh->load; 2000 $neigh->load;
1881 } 2001 }
1882} 2002}
1883 2003
… …
1888} 2008}
1889 2009
1890sub do_load_sync { 2010sub do_load_sync {
1891 my ($map) = @_; 2011 my ($map) = @_;
1892 2012
2013 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2014 if $Coro::current == $Coro::main;
2015
1893 cf::sync_job { $map->load }; 2016 cf::sync_job { $map->load };
1894} 2017}
1895 2018
1896our %MAP_PREFETCH; 2019our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2020our $MAP_PREFETCHER = undef;
1898 2021
1899sub find_async { 2022sub find_async {
1900 my ($path, $origin) = @_; 2023 my ($path, $origin, $load) = @_;
1901 2024
1902 $path = normalise $path, $origin && $origin->{path}; 2025 $path = normalise $path, $origin && $origin->{path};
1903 2026
1904 if (my $map = $cf::MAP{$path}) { 2027 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2028 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1906 } 2029 }
1907 2030
1908 undef $MAP_PREFETCH{$path}; 2031 $MAP_PREFETCH{$path} |= $load;
2032
1909 $MAP_PREFETCHER ||= cf::async { 2033 $MAP_PREFETCHER ||= cf::async {
1910 while (%MAP_PREFETCH) { 2034 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2035 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 if (my $map = find $path) { 2036 if (my $map = find $k) {
1913 $map->load; 2037 $map->load if $v;
1914 } 2038 }
1915 2039
1916 delete $MAP_PREFETCH{$path}; 2040 delete $MAP_PREFETCH{$k};
1917 } 2041 }
1918 } 2042 }
1919 undef $MAP_PREFETCHER; 2043 undef $MAP_PREFETCHER;
1920 }; 2044 };
1921 $MAP_PREFETCHER->prio (6); 2045 $MAP_PREFETCHER->prio (6);
… …
1924} 2048}
1925 2049
1926sub save { 2050sub save {
1927 my ($self) = @_; 2051 my ($self) = @_;
1928 2052
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2053 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2054
1931 $self->{last_save} = $cf::RUNTIME; 2055 $self->{last_save} = $cf::RUNTIME;
1932 2056
1933 return unless $self->dirty; 2057 return unless $self->dirty;
1934 2058
… …
1957 my ($self) = @_; 2081 my ($self) = @_;
1958 2082
1959 # save first because save cedes 2083 # save first because save cedes
1960 $self->save; 2084 $self->save;
1961 2085
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2086 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2087
1964 return if $self->players; 2088 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2089 return if $self->in_memory != cf::MAP_IN_MEMORY;
1966 return if $self->{deny_save}; 2090 return if $self->{deny_save};
1967 2091
2092 $self->in_memory (cf::MAP_SWAPPED);
2093
2094 $self->deactivate;
2095 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2096 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2097}
1971 2098
1972sub reset_at { 2099sub reset_at {
1973 my ($self) = @_; 2100 my ($self) = @_;
1974 2101
… …
2006 if $uniq; 2133 if $uniq;
2007 } 2134 }
2008 2135
2009 delete $cf::MAP{$self->path}; 2136 delete $cf::MAP{$self->path};
2010 2137
2138 $self->deactivate;
2139 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2140 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2141
2015 $self->unlink_save; 2142 $self->unlink_save;
2016 $self->destroy; 2143 $self->destroy;
2017} 2144}
2018 2145
2019my $nuke_counter = "aaaa"; 2146my $nuke_counter = "aaaa";
2020 2147
2021sub nuke { 2148sub nuke {
2022 my ($self) = @_; 2149 my ($self) = @_;
2023 2150
2151 {
2152 my $lock = cf::lock_acquire "map_data:$self->{path}";
2153
2024 delete $cf::MAP{$self->path}; 2154 delete $cf::MAP{$self->path};
2025 2155
2026 $self->unlink_save; 2156 $self->unlink_save;
2027 2157
2028 bless $self, "cf::map"; 2158 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2159 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2160 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2161 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2162 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2163
2034 $cf::MAP{$self->path} = $self; 2164 $cf::MAP{$self->path} = $self;
2165 }
2035 2166
2036 $self->reset; # polite request, might not happen 2167 $self->reset; # polite request, might not happen
2037} 2168}
2038 2169
2039=item $maps = cf::map::tmp_maps 2170=item $maps = cf::map::tmp_maps
… …
2115 2246
2116sub inv_recursive { 2247sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2248 inv_recursive_ inv $_[0]
2118} 2249}
2119 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
2120package cf; 2282package cf;
2121 2283
2122=back 2284=back
2123 2285
2124=head3 cf::object::player 2286=head3 cf::object::player
… …
2146 2308
2147 } else { 2309 } else {
2148 my $pl = $self->contr; 2310 my $pl = $self->contr;
2149 2311
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2312 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2313 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2314 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2315
2159 } else { 2316 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2317 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2318 $self->message ($msg, $flags);
2162 } 2319 }
2163 } 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 (@_);
2164} 2331}
2165 2332
2166=item $player_object->may ("access") 2333=item $player_object->may ("access")
2167 2334
2168Returns wether the given player is authorized to access resource "access" 2335Returns wether the given player is authorized to access resource "access"
… …
2247 # use -1 or undef as default coordinates, not 0, 0 2414 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2415 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2416 if $x <=0 && $y <= 0;
2250 2417
2251 $map->load; 2418 $map->load;
2252 $map->load_diag; 2419 $map->load_neighbours;
2253 2420
2254 return unless $self->contr->active; 2421 return unless $self->contr->active;
2255 $self->activate_recursive; 2422 $self->activate_recursive;
2256 2423
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2424 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2419 2586
2420 utf8::encode $text; 2587 utf8::encode $text;
2421 $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);
2422} 2589}
2423 2590
2424=item $client->send_msg ($color, $type, $msg, [extra...]) 2591=item $client->send_msg ($channel, $msg, $color, [extra...])
2425 2592
2426Send 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
2427client 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
2428the 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
2429the message unless the client supports the msg packet. 2596the message unless the client supports the msg packet.
2430 2597
2431=cut 2598=cut
2432 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
2433sub cf::client::send_msg { 2615sub cf::client::send_msg {
2434 my ($self, $color, $type, $msg, @extra) = @_; 2616 my ($self, $channel, $msg, $color, @extra) = @_;
2435 2617
2436 $msg = $self->pl->expand_cfpod ($msg); 2618 $msg = $self->pl->expand_cfpod ($msg);
2437 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
2438 return unless @extra || length $msg; 2636 return unless @extra || length $msg;
2439 2637
2440 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
2441 $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]));
2442 } else { 2645 } else {
2443 # replace some tags by gcfclient-compatible ones
2444 for ($msg) {
2445 1 while
2446 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2447 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2448 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2449 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2450 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2451 }
2452
2453 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
2454 if (0 && $msg =~ /\[/) { 2661 if (0 && $msg =~ /\[/) {
2662 # COMMAND/INFO
2455 $self->send_packet ("drawextinfo $color 4 0 $msg") 2663 $self->send_packet ("drawextinfo $color 10 8 $msg")
2456 } else { 2664 } else {
2457 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2665 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2458 $self->send_packet ("drawinfo $color $msg") 2666 $self->send_packet ("drawinfo $color $msg")
2459 } 2667 }
2460 } 2668 }
2461 } 2669 }
2462} 2670}
2463 2671
2464=item $client->ext_event ($type, %msg) 2672=item $client->ext_msg ($type, @msg)
2465 2673
2466Sends an ext event to the client. 2674Sends an ext event to the client.
2467 2675
2468=cut 2676=cut
2469 2677
2470sub cf::client::ext_event($$%) { 2678sub cf::client::ext_msg($$@) {
2471 my ($self, $type, %msg) = @_; 2679 my ($self, $type, @msg) = @_;
2472 2680
2473 return unless $self->extcmd; 2681 if ($self->extcmd == 2) {
2474 2682 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2683 } elsif ($self->extcmd == 1) { # TODO: remove
2475 $msg{msgtype} = "event_$type"; 2684 push @msg, msgtype => "event_$type";
2476 $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 }
2477} 2705}
2478 2706
2479=item $success = $client->query ($flags, "text", \&cb) 2707=item $success = $client->query ($flags, "text", \&cb)
2480 2708
2481Queues a query to the client, calling the given callback with 2709Queues a query to the client, calling the given callback with
… …
2536 my ($ns, $buf) = @_; 2764 my ($ns, $buf) = @_;
2537 2765
2538 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2766 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539 2767
2540 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
2541 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2776 if (my $cb = $EXTICMD{$type}) {
2542 if (my %reply = $cb->($ns, $msg)) { 2777 @reply = $cb->($ns, @payload);
2543 $reply{msgid} = $msg->{msgid};
2544 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2545 }
2546 } 2778 }
2779
2780 $ns->ext_reply ($reply, @reply)
2781 if $reply;
2782
2547 } else { 2783 } else {
2548 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";
2549 } 2785 }
2550 2786
2551 cf::override; 2787 cf::override;
… …
2598our $safe = new Safe "safe"; 2834our $safe = new Safe "safe";
2599our $safe_hole = new Safe::Hole; 2835our $safe_hole = new Safe::Hole;
2600 2836
2601$SIG{FPE} = 'IGNORE'; 2837$SIG{FPE} = 'IGNORE';
2602 2838
2603$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));
2604 2844
2605# here we export the classes and methods available to script code 2845# here we export the classes and methods available to script code
2606 2846
2607=pod 2847=pod
2608 2848
2609The following functions and methods are available within a safe environment: 2849The following functions and methods are available within a safe environment:
2610 2850
2611 cf::object 2851 cf::object
2612 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
2613 insert remove 2853 insert remove name archname title slaying race decrease_ob_nr
2614 2854
2615 cf::object::player 2855 cf::object::player
2616 player 2856 player
2617 2857
2618 cf::player 2858 cf::player
… …
2623 2863
2624=cut 2864=cut
2625 2865
2626for ( 2866for (
2627 ["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
2628 insert remove)], 2869 decrease_ob_nr)],
2629 ["cf::object::player" => qw(player)], 2870 ["cf::object::player" => qw(player)],
2630 ["cf::player" => qw(peaceful)], 2871 ["cf::player" => qw(peaceful)],
2631 ["cf::map" => qw(trigger)], 2872 ["cf::map" => qw(trigger)],
2632) { 2873) {
2633 no strict 'refs'; 2874 no strict 'refs';
… …
2709# the server's init and main functions 2950# the server's init and main functions
2710 2951
2711sub load_facedata($) { 2952sub load_facedata($) {
2712 my ($path) = @_; 2953 my ($path) = @_;
2713 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
2714 warn "loading facedata from $path\n"; 2961 warn "loading facedata from $path\n";
2715 2962
2716 my $facedata; 2963 my $facedata;
2717 0 < aio_load $path, $facedata 2964 0 < aio_load $path, $facedata
2718 or die "$path: $!"; 2965 or die "$path: $!";
2719 2966
2720 $facedata = Coro::Storable::thaw $facedata; 2967 $facedata = Coro::Storable::thaw $facedata;
2721 2968
2722 $facedata->{version} == 2 2969 $facedata->{version} == 2
2723 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;
2724 2978
2725 { 2979 {
2726 my $faces = $facedata->{faceinfo}; 2980 my $faces = $facedata->{faceinfo};
2727 2981
2728 while (my ($face, $info) = each %$faces) { 2982 while (my ($face, $info) = each %$faces) {
2729 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2983 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2730 cf::face::set_visibility $idx, $info->{visibility}; 2984 cf::face::set_visibility $idx, $info->{visibility};
2731 cf::face::set_magicmap $idx, $info->{magicmap}; 2985 cf::face::set_magicmap $idx, $info->{magicmap};
2732 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2733 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2987 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2734 2988
2735 cf::cede_to_tick; 2989 cf::cede_to_tick;
2736 } 2990 }
2737 2991
2738 while (my ($face, $info) = each %$faces) { 2992 while (my ($face, $info) = each %$faces) {
… …
2763 3017
2764 { 3018 {
2765 # TODO: for gcfclient pleasure, we should give resources 3019 # TODO: for gcfclient pleasure, we should give resources
2766 # that gcfclient doesn't grok a >10000 face index. 3020 # that gcfclient doesn't grok a >10000 face index.
2767 my $res = $facedata->{resource}; 3021 my $res = $facedata->{resource};
2768 my $enc = JSON::XS->new->utf8->canonical; 3022
3023 my $soundconf = delete $res->{"res/sound.conf"};
2769 3024
2770 while (my ($name, $info) = each %$res) { 3025 while (my ($name, $info) = each %$res) {
2771 my $meta = $enc->encode ({
2772 name => $name,
2773 type => $info->{type},
2774 copyright => $info->{copyright}, #TODO#
2775 });
2776
2777 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3026 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data;
2778 3028
2779 if ($name =~ /\.jpg$/) { 3029 if ($info->{type} & 1) {
2780 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3030 # prepend meta info
2781 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};
2782 } else { 3038 } else {
2783 my $data = pack "(w/a*)*", $meta, $info->{data}; 3039 $data = $info->{data};
2784 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2785
2786 cf::face::set_type $idx, 1;
2787 cf::face::set_data $idx, 0, $data, $chk;
2788 } 3040 }
2789 3041
3042 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3043 cf::face::set_type $idx, $info->{type};
3044
2790 cf::cede_to_tick; 3045 cf::cede_to_tick;
2791 } 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 }
2792 } 3065 }
2793 3066
2794 1 3067 1
2795} 3068}
2796 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
2797sub 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
2798 load_resource_file "$MAPDIR/regions" 3083 load_resource_file "$MAPDIR/regions"
2799 or die "unable to load regions file\n"; 3084 or die "unable to load regions file\n";
2800 3085
2801 for (cf::region::list) { 3086 for (cf::region::list) {
2802 $_->{match} = qr/$_->{match}/ 3087 $_->{match} = qr/$_->{match}/
… …
2838 3123
2839sub init { 3124sub init {
2840 reload_resources; 3125 reload_resources;
2841} 3126}
2842 3127
2843sub cfg_load { 3128sub reload_config {
2844 open my $fh, "<:utf8", "$CONFDIR/config" 3129 open my $fh, "<:utf8", "$CONFDIR/config"
2845 or return; 3130 or return;
2846 3131
2847 local $/; 3132 local $/;
2848 *CFG = YAML::Syck::Load <$fh>; 3133 *CFG = YAML::Syck::Load <$fh>;
… …
2868 (async { 3153 (async {
2869 Event::one_event; 3154 Event::one_event;
2870 })->prio (Coro::PRIO_MAX); 3155 })->prio (Coro::PRIO_MAX);
2871 }; 3156 };
2872 3157
2873 cfg_load; 3158 reload_config;
2874 db_init; 3159 db_init;
2875 load_extensions; 3160 load_extensions;
2876 3161
2877 $TICK_WATCHER->start; 3162 $TICK_WATCHER->start;
2878 Event::loop; 3163 Event::loop;
… …
3071 warn "reloading cf.pm"; 3356 warn "reloading cf.pm";
3072 require cf; 3357 require cf;
3073 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3358 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3074 3359
3075 warn "loading config and database again"; 3360 warn "loading config and database again";
3076 cf::cfg_load; 3361 cf::reload_config;
3077 3362
3078 warn "loading extensions"; 3363 warn "loading extensions";
3079 cf::load_extensions; 3364 cf::load_extensions;
3080 3365
3081 warn "reattaching attachments to objects/players"; 3366 warn "reattaching attachments to objects/players";
… …
3174 or die; 3459 or die;
3175 3460
3176 $map->width (50); 3461 $map->width (50);
3177 $map->height (50); 3462 $map->height (50);
3178 $map->alloc; 3463 $map->alloc;
3179 $map->_load_objects ("/tmp/x.map", 1); 3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3180 my $t = Event::time - $t; 3465 my $t = Event::time - $t;
3181 3466
3182 #next unless $t < 0.0013;#d# 3467 #next unless $t < 0.0013;#d#
3183 if ($t < $min) { 3468 if ($t < $min) {
3184 $min = $t; 3469 $min = $t;

Diff Legend

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