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.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.392 by root, Fri Oct 26 04:44:54 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
26use JSON::XS ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
49our %COMMAND = (); 52our %COMMAND = ();
50our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
51 54
52our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
56 60
57our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
58our @EVENT; 62our @EVENT;
76our $NEXT_TICK; 80our $NEXT_TICK;
77our $NOW; 81our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
79 83
80our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 88our $DB_ENV;
82 89
83our %CFG; 90our %CFG;
84 91
85our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 93our $RUNTIME;
87 94
88our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
91 98
92# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 101
164 171
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 173returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
181
169=back 182=back
170 183
171=cut 184=cut
172 185
173BEGIN { 186BEGIN {
177 $msg .= "\n" 190 $msg .= "\n"
178 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
179 192
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 194
182 utf8::encode $msg;
183 LOG llevError, $msg; 195 LOG llevError, $msg;
184 }; 196 };
185} 197}
186 198
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 249 $d
238 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
239} 251}
240 252
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 253=item $ref = cf::from_json $json
244 254
245Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
246 256
247=item $json = cf::to_json $ref 257=item $json = cf::to_json $ref
248 258
249Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
260
261=cut
262
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264
265sub to_json ($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) }
250 267
251=item cf::lock_wait $string 268=item cf::lock_wait $string
252 269
253Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
254 271
257Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
258a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
259for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
260returned. 277returned.
261 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
262Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
263uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
264 284
265=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
266 286
267Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
268 288
269=cut 289=cut
270 290
271our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
272 293
273sub lock_wait($) { 294sub lock_wait($) {
274 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
275 301
276 # wait for lock, if any 302 # wait for lock, if any
277 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule; 305 Coro::schedule;
285 311
286 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
287 lock_wait $key; 313 lock_wait $key;
288 314
289 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
290 317
291 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
292 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
294 } 322 }
295} 323}
296 324
308 }; 336 };
309 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
310 $guard 338 $guard
311} 339}
312 340
341=item cf::get_slot $time[, $priority[, $name]]
342
343Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
350Useful for short background jobs.
351
352=cut
353
354our @SLOT_QUEUE;
355our $SLOT_QUEUE;
356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
361 my $signal = new Coro::Signal;
362
363 while () {
364 next_job:
365 my $avail = cf::till_tick;
366 if ($avail > 0.01) {
367 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) {
369 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send;
371 Coro::cede;
372 goto next_job;
373 }
374 }
375 }
376
377 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait;
381 } else {
382 Coro::schedule;
383 }
384 }
385};
386
387sub get_slot($;$$) {
388 my ($time, $pri, $name) = @_;
389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready;
396 $sig->wait;
397}
398
313=item cf::async { BLOCK } 399=item cf::async { BLOCK }
314 400
315Currently the same as Coro::async_pool, meaning you cannot use 401Currently the same as Coro::async_pool, meaning you cannot use
316C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 402C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
317thing you are allowed to do is call C<prio> on it. 403thing you are allowed to do is call C<prio> on it.
341 my $time = Event::time; 427 my $time = Event::time;
342 428
343 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
345 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
346 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
347 # (but this is cancel-safe) 435 # (but this is cancel-safe)
348 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
349 437
350 my $busy = 1; 438 my $busy = 1;
351 my @res; 439 my @res;
352 440
353 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 443 @res = eval { $job->() };
355 warn $@ if $@; 444 warn $@ if $@;
356 undef $busy; 445 undef $busy;
357 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
358 447
359 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
360 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
361 } 454 }
362 455
363 $time = Event::time - $time; 456 $time = Event::time - $time;
364 457
365 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
405=cut 498=cut
406 499
407sub fork_call(&@) { 500sub fork_call(&@) {
408 my ($cb, @args) = @_; 501 my ($cb, @args) = @_;
409 502
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 503 # we seemingly have to make a local copy of the whole thing,
411# or die "socketpair: $!"; 504 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 505 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 506
415 if (my $pid = fork) { 507 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 508 reset_signals;
428 local $SIG{__WARN__}; 509 &$cb
429 local $SIG{__DIE__}; 510 }, @args;
430 eval {
431 close $fh1;
432 511
433 my @res = eval { $cb->(@args) }; 512 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435 };
436
437 warn $@ if $@;
438 _exit 0;
439 }
440} 513}
441 514
442=item $value = cf::db_get $family => $key 515=item $value = cf::db_get $family => $key
443 516
444Returns a single value from the environment database. 517Returns a single value from the environment database.
446=item cf::db_put $family => $key => $value 519=item cf::db_put $family => $key => $value
447 520
448Stores the given C<$value> in the family. It can currently store binary 521Stores the given C<$value> in the family. It can currently store binary
449data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 522data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450 523
524=item $db = cf::db_table "name"
525
526Create and/or open a new database table. The string must not be "db" and must be unique
527within each server.
528
451=cut 529=cut
530
531sub db_table($) {
532 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV;
534
535 eval {
536 $db->set_flags (BDB::CHKSUM);
537
538 utf8::encode $name;
539 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
540 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
541 cf::cleanup "db_open(db): $!" if $!;
542 };
543 cf::cleanup "db_open(db): $@" if $@;
544
545 $db
546}
452 547
453our $DB; 548our $DB;
454 549
455sub db_init { 550sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 551 cf::sync_job {
460 eval { 552 $DB ||= db_table "db";
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 } 553 };
470} 554}
471 555
472sub db_get($$) { 556sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 557 my $key = "$_[0]/$_[1]";
474 558
524 if (1) { 608 if (1) {
525 $md5 = 609 $md5 =
526 join "\x00", 610 join "\x00",
527 $processversion, 611 $processversion,
528 map { 612 map {
529 Coro::cede; 613 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 614 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 615 } 0.. $#$src;
532 616
533 617
534 my $dbmd5 = db_get cache => "$id/md5"; 618 my $dbmd5 = db_get cache => "$id/md5";
840 "; 924 ";
841 die if $@; 925 die if $@;
842} 926}
843 927
844our $override; 928our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 929our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 930
847sub override { 931sub override {
848 $override = 1; 932 $override = 1;
849 @invoke_results = (); 933 @INVOKE_RESULTS = (@_);
850} 934}
851 935
852sub do_invoke { 936sub do_invoke {
853 my $event = shift; 937 my $event = shift;
854 my $callbacks = shift; 938 my $callbacks = shift;
855 939
856 @invoke_results = (); 940 @INVOKE_RESULTS = ();
857 941
858 local $override; 942 local $override;
859 943
860 for (@$callbacks) { 944 for (@$callbacks) {
861 eval { &{$_->[1]} }; 945 eval { &{$_->[1]} };
878 962
879Generate an object-specific event with the given arguments. 963Generate an object-specific event with the given arguments.
880 964
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 965This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882removed in future versions), and there is no public API to access override 966removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 967results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 968
885=back 969=back
886 970
887=cut 971=cut
888 972
889############################################################################# 973#############################################################################
890# object support 974# object support
975
976sub _object_equal($$);
977sub _object_equal($$) {
978 my ($a, $b) = @_;
979
980 return 0 unless (ref $a) eq (ref $b);
981
982 if ("HASH" eq ref $a) {
983 my @ka = keys %$a;
984 my @kb = keys %$b;
985
986 return 0 if @ka != @kb;
987
988 for (0 .. $#ka) {
989 return 0 unless $ka[$_] eq $kb[$_];
990 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
991 }
992
993 } elsif ("ARRAY" eq ref $a) {
994
995 return 0 if @$a != @$b;
996
997 for (0 .. $#$a) {
998 return 0 unless _object_equal $a->[$_], $b->[$_];
999 }
1000
1001 } elsif ($a ne $b) {
1002 return 0;
1003 }
1004
1005 1
1006}
1007
1008our $SLOW_MERGES;#d#
1009sub _can_merge {
1010 my ($ob1, $ob2) = @_;
1011
1012 ++$SLOW_MERGES;#d#
1013
1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
1016}
891 1017
892sub reattach { 1018sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1020 my ($obj) = @_;
895 1021
942sub object_freezer_save { 1068sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
944 1070
945 sync_job { 1071 sync_job {
946 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
949 1076
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
954 close $fh; 1081 close $fh;
955 1082
956 if (@$objs) { 1083 if (@$objs) {
957 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1089 close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
964 } 1091 }
972 } 1099 }
973 } else { 1100 } else {
974 aio_unlink $filename; 1101 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
976 } 1103 }
977 } 1104 };
978} 1105}
979 1106
980sub object_freezer_as_string { 1107sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
982 1109
994 or return; 1121 or return;
995 1122
996 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
998 or return; 1125 or return;
1126
999 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1000 } 1129 }
1001 1130
1131 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
1134
1004 return ($data, $av); 1135 ($data, $av)
1005} 1136}
1006 1137
1007=head2 COMMAND CALLBACKS 1138=head2 COMMAND CALLBACKS
1008 1139
1009=over 4 1140=over 4
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1160 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1161}
1031 1162
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1163=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1164
1034Register a callback fro execution when the client sends an extcmd packet. 1165Register a callback for execution when the client sends an (synchronous)
1166extcmd packet. Ext commands will be processed in the order they are
1167received by the server, like other user commands. The first argument is
1168the logged-in player. Ext commands can only be processed after a player
1169has logged in successfully.
1035 1170
1036If the callback returns something, it is sent back as if reply was being 1171If the callback returns something, it is sent back as if reply was being
1037called. 1172called.
1038 1173
1174=item cf::register_exticmd $name => \&callback($ns,$packet);
1175
1176Register a callback for execution when the client sends an (asynchronous)
1177exticmd packet. Exti commands are processed by the server as soon as they
1178are received, i.e. out of order w.r.t. other commands. The first argument
1179is a client socket. Exti commands can be received anytime, even before
1180log-in.
1181
1182If the callback returns something, it is sent back as if reply was being
1183called.
1184
1039=cut 1185=cut
1040 1186
1041sub register_extcmd { 1187sub register_extcmd {
1042 my ($name, $cb) = @_; 1188 my ($name, $cb) = @_;
1043 1189
1044 $EXTCMD{$name} = $cb; 1190 $EXTCMD{$name} = $cb;
1191}
1192
1193sub register_exticmd {
1194 my ($name, $cb) = @_;
1195
1196 $EXTICMD{$name} = $cb;
1045} 1197}
1046 1198
1047cf::player->attach ( 1199cf::player->attach (
1048 on_command => sub { 1200 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1201 my ($pl, $name, $params) = @_;
1058 cf::override; 1210 cf::override;
1059 }, 1211 },
1060 on_extcmd => sub { 1212 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1213 my ($pl, $buf) = @_;
1062 1214
1063 my $msg = eval { from_json $buf }; 1215 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1216
1065 if (ref $msg) { 1217 if (ref $msg) {
1218 my ($type, $reply, @payload) =
1219 "ARRAY" eq ref $msg
1220 ? @$msg
1221 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1222
1223 my @reply;
1224
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1225 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1226 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1227 }
1228
1229 $pl->ext_reply ($reply, @reply)
1230 if $reply;
1231
1071 } else { 1232 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1234 }
1074 1235
1075 cf::override; 1236 cf::override;
1165 1326
1166=head3 cf::player 1327=head3 cf::player
1167 1328
1168=over 4 1329=over 4
1169 1330
1331=item cf::player::num_playing
1332
1333Returns the official number of playing players, as per the Crossfire metaserver rules.
1334
1335=cut
1336
1337sub num_playing {
1338 scalar grep
1339 $_->ob->map
1340 && !$_->hidden
1341 && !$_->ob->flag (cf::FLAG_WIZ),
1342 cf::player::list
1343}
1344
1170=item cf::player::find $login 1345=item cf::player::find $login
1171 1346
1172Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1173 1348
1174=cut 1349=cut
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1388
1214 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
1215 or return; 1390 or return;
1391
1392 my $pl = cf::player::load_pl $f
1393 or return;
1394 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs;
1216 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
1217 } 1397 }
1218 } 1398 }
1219} 1399}
1220 1400
1230 1410
1231 aio_mkdir playerdir $pl, 0770; 1411 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1412 $pl->{last_save} = $cf::RUNTIME;
1233 1413
1234 $pl->save_pl ($path); 1414 $pl->save_pl ($path);
1235 Coro::cede; 1415 cf::cede_to_tick;
1236} 1416}
1237 1417
1238sub new($) { 1418sub new($) {
1239 my ($login) = @_; 1419 my ($login) = @_;
1240 1420
1244 $self->{deny_save} = 1; 1424 $self->{deny_save} = 1;
1245 1425
1246 $cf::PLAYER{$login} = $self; 1426 $cf::PLAYER{$login} = $self;
1247 1427
1248 $self 1428 $self
1429}
1430
1431=item $player->send_msg ($channel, $msg, $color, [extra...])
1432
1433=cut
1434
1435sub send_msg {
1436 my $ns = shift->ns
1437 or return;
1438 $ns->send_msg (@_);
1249} 1439}
1250 1440
1251=item $pl->quit_character 1441=item $pl->quit_character
1252 1442
1253Nukes the player without looking back. If logged in, the connection will 1443Nukes the player without looking back. If logged in, the connection will
1308 or return []; 1498 or return [];
1309 1499
1310 my @logins; 1500 my @logins;
1311 1501
1312 for my $login (@$dirs) { 1502 for my $login (@$dirs) {
1503 my $path = path $login;
1504
1505 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1316 1511
1317 utf8::decode $login; 1512 utf8::decode $login;
1318 push @logins, $login; 1513 push @logins, $login;
1319 } 1514 }
1320 1515
1347 } 1542 }
1348 1543
1349 \@paths 1544 \@paths
1350} 1545}
1351 1546
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1548
1549Expand crossfire pod fragments into protocol xml.
1550
1551=cut
1552
1553 use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 (?:
1558 \ (.*?)\ (?{ $group = $^N })
1559 | < (??{$interior}) >
1560 )
1561}x;
1562
1563sub expand_cfpod {
1564 my ($self, $pod) = @_;
1565
1566 my $xml;
1567
1568 while () {
1569 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1570 $group = $1;
1571
1572 $group =~ s/&/&amp;/g;
1573 $group =~ s/</&lt;/g;
1574
1575 $xml .= $group;
1576 } elsif ($pod =~ m%\G
1577 ([BCGHITU])
1578 <
1579 (?:
1580 ([^<>]*) (?{ $group = $^N })
1581 | < $interior >
1582 )
1583 >
1584 %gcsx
1585 ) {
1586 my ($code, $data) = ($1, $group);
1587
1588 if ($code eq "B") {
1589 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1590 } elsif ($code eq "I") {
1591 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1592 } elsif ($code eq "U") {
1593 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1594 } elsif ($code eq "C") {
1595 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1596 } elsif ($code eq "T") {
1597 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1598 } elsif ($code eq "G") {
1599 my ($male, $female) = split /\|/, $data;
1600 $data = $self->gender ? $female : $male;
1601 $xml .= expand_cfpod ($self, $data);
1602 } elsif ($code eq "H") {
1603 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1604 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1605 "")
1606 [$self->{hintmode}];
1607 } else {
1608 $xml .= "error processing '$code($data)' directive";
1609 }
1610 } else {
1611 if ($pod =~ /\G(.+)/) {
1612 warn "parse error while expanding $pod (at $1)";
1613 }
1614 last;
1615 }
1616 }
1617
1618 for ($xml) {
1619 # create single paragraphs (very hackish)
1620 s/(?<=\S)\n(?=\w)/ /g;
1621
1622 # compress some whitespace
1623 s/\s+\n/\n/g; # ws line-ends
1624 s/\n\n+/\n/g; # double lines
1625 s/^\n+//; # beginning lines
1626 s/\n+$//; # ending lines
1627 }
1628
1629 $xml
1630}
1631
1632sub hintmode {
1633 $_[0]{hintmode} = $_[1] if @_ > 1;
1634 $_[0]{hintmode}
1635}
1636
1352=item $player->ext_reply ($msgid, %msg) 1637=item $player->ext_reply ($msgid, @msg)
1353 1638
1354Sends an ext reply to the player. 1639Sends an ext reply to the player.
1355 1640
1356=cut 1641=cut
1357 1642
1358sub ext_reply($$%) { 1643sub ext_reply($$@) {
1359 my ($self, $id, %msg) = @_; 1644 my ($self, $id, @msg) = @_;
1360 1645
1361 $msg{msgid} = $id; 1646 $self->ns->ext_reply ($id, @msg)
1362
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1647}
1365 1648
1366=item $player->ext_event ($type, %msg) 1649=item $player->ext_msg ($type, @msg)
1367 1650
1368Sends an ext event to the client. 1651Sends an ext event to the client.
1369 1652
1370=cut 1653=cut
1371 1654
1372sub ext_event($$%) { 1655sub ext_msg($$@) {
1373 my ($self, $type, %msg) = @_; 1656 my ($self, $type, @msg) = @_;
1374 1657
1375 $self->ns->ext_event ($type, %msg); 1658 $self->ns->ext_msg ($type, @msg);
1376} 1659}
1377 1660
1378=head3 cf::region 1661=head3 cf::region
1379 1662
1380=over 4 1663=over 4
1393 my ($path) = @_; 1676 my ($path) = @_;
1394 1677
1395 my ($match, $specificity); 1678 my ($match, $specificity);
1396 1679
1397 for my $region (list) { 1680 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1681 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1682 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1683 if $region->specificity > $specificity;
1401 } 1684 }
1402 } 1685 }
1403 1686
1523 $self->init; # pass $1 etc. 1806 $self->init; # pass $1 etc.
1524 return $self; 1807 return $self;
1525 } 1808 }
1526 } 1809 }
1527 1810
1528 Carp::carp "unable to resolve path '$path' (base '$base')."; 1811 Carp::cluck "unable to resolve path '$path' (base '$base').";
1529 () 1812 ()
1530} 1813}
1531 1814
1532sub init { 1815sub init {
1533 my ($self) = @_; 1816 my ($self) = @_;
1596 1879
1597sub load_header_from($) { 1880sub load_header_from($) {
1598 my ($self, $path) = @_; 1881 my ($self, $path) = @_;
1599 1882
1600 utf8::encode $path; 1883 utf8::encode $path;
1601 #aio_open $path, O_RDONLY, 0 1884 my $f = new_from_file cf::object::thawer $path
1602 # or return;
1603
1604 $self->_load_header ($path)
1605 or return; 1885 or return;
1886
1887 $self->_load_header ($f)
1888 or return;
1889
1890 local $MAP_LOADING{$self->{path}} = $self;
1891 $f->resolve_delayed_derefs;
1606 1892
1607 $self->{load_path} = $path; 1893 $self->{load_path} = $path;
1608 1894
1609 1 1895 1
1610} 1896}
1664sub find { 1950sub find {
1665 my ($path, $origin) = @_; 1951 my ($path, $origin) = @_;
1666 1952
1667 $path = normalise $path, $origin && $origin->path; 1953 $path = normalise $path, $origin && $origin->path;
1668 1954
1955 cf::lock_wait "map_data:$path";#d#remove
1669 cf::lock_wait "map_find:$path"; 1956 cf::lock_wait "map_find:$path";
1670 1957
1671 $cf::MAP{$path} || do { 1958 $cf::MAP{$path} || do {
1672 my $guard = cf::lock_acquire "map_find:$path"; 1959 my $guard1 = cf::lock_acquire "map_find:$path";
1960 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961
1673 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1674 or return; 1963 or return;
1675 1964
1676 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1677 1966
1679 or return; 1968 or return;
1680 1969
1681 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1682 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1683 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard1;
1974 undef $guard2;
1684 $map->reset; 1975 $map->reset;
1685 undef $guard;
1686 return find $path; 1976 return find $path;
1687 } 1977 }
1688 1978
1689 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1690 } 1980 }
1699 local $self->{deny_reset} = 1; # loading can take a long time 1989 local $self->{deny_reset} = 1; # loading can take a long time
1700 1990
1701 my $path = $self->{path}; 1991 my $path = $self->{path};
1702 1992
1703 { 1993 {
1704 my $guard = cf::lock_acquire "map_load:$path"; 1994 my $guard = cf::lock_acquire "map_data:$path";
1705 1995
1996 return unless $self->valid;
1706 return if $self->in_memory != cf::MAP_SWAPPED; 1997 return unless $self->in_memory == cf::MAP_SWAPPED;
1707 1998
1708 $self->in_memory (cf::MAP_LOADING); 1999 $self->in_memory (cf::MAP_LOADING);
1709 2000
1710 $self->alloc; 2001 $self->alloc;
1711 2002
1712 $self->pre_load; 2003 $self->pre_load;
1713 Coro::cede; 2004 cf::cede_to_tick;
1714 2005
2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block;
1715 $self->_load_objects ($self->{load_path}, 1) 2008 $self->_load_objects ($f)
1716 or return; 2009 or return;
1717 2010
1718 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1719 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1720 2013
1721 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1722 utf8::encode $uniq; 2015 utf8::encode $uniq;
1723 if (aio_open $uniq, O_RDONLY, 0) { 2016 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) {
1724 $self->clear_unique_items; 2018 $self->clear_unique_items;
1725 $self->_load_objects ($uniq, 0); 2019 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs;
2021 }
1726 } 2022 }
1727 } 2023 }
1728 2024
1729 Coro::cede; 2025 $f->resolve_delayed_derefs;
2026
2027 cf::cede_to_tick;
1730 # now do the right thing for maps 2028 # now do the right thing for maps
1731 $self->link_multipart_objects; 2029 $self->link_multipart_objects;
1732 $self->difficulty ($self->estimate_difficulty) 2030 $self->difficulty ($self->estimate_difficulty)
1733 unless $self->difficulty; 2031 unless $self->difficulty;
1734 Coro::cede; 2032 cf::cede_to_tick;
1735 2033
1736 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
1737 $self->decay_objects; 2035 $self->decay_objects;
1738 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
1739 $self->update_buttons; 2037 $self->update_buttons;
1740 Coro::cede; 2038 cf::cede_to_tick;
1741 $self->set_darkness_map; 2039 $self->set_darkness_map;
1742 Coro::cede; 2040 cf::cede_to_tick;
1743 $self->activate; 2041 $self->activate;
1744 } 2042 }
2043
2044 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME);
1745 2046
1746 $self->in_memory (cf::MAP_IN_MEMORY); 2047 $self->in_memory (cf::MAP_IN_MEMORY);
1747 } 2048 }
1748 2049
1749 $self->post_load; 2050 $self->post_load;
1760 2061
1761 $self 2062 $self
1762} 2063}
1763 2064
1764# find and load all maps in the 3x3 area around a map 2065# find and load all maps in the 3x3 area around a map
1765sub load_diag { 2066sub load_neighbours {
1766 my ($map) = @_; 2067 my ($map) = @_;
1767 2068
1768 my @diag; # diagonal neighbours 2069 my @neigh; # diagonal neighbours
1769 2070
1770 for (0 .. 3) { 2071 for (0 .. 3) {
1771 my $neigh = $map->tile_path ($_) 2072 my $neigh = $map->tile_path ($_)
1772 or next; 2073 or next;
1773 $neigh = find $neigh, $map 2074 $neigh = find $neigh, $map
1774 or next; 2075 or next;
1775 $neigh->load; 2076 $neigh->load;
1776 2077
2078 push @neigh,
1777 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2079 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1778 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2080 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1779 } 2081 }
1780 2082
1781 for (@diag) { 2083 for (grep defined $_->[0], @neigh) {
2084 my ($path, $origin) = @$_;
1782 my $neigh = find @$_ 2085 my $neigh = find $path, $origin
1783 or next; 2086 or next;
1784 $neigh->load; 2087 $neigh->load;
1785 } 2088 }
1786} 2089}
1787 2090
1792} 2095}
1793 2096
1794sub do_load_sync { 2097sub do_load_sync {
1795 my ($map) = @_; 2098 my ($map) = @_;
1796 2099
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main;
2102
1797 cf::sync_job { $map->load }; 2103 cf::sync_job { $map->load };
1798} 2104}
1799 2105
1800our %MAP_PREFETCH; 2106our %MAP_PREFETCH;
1801our $MAP_PREFETCHER = undef; 2107our $MAP_PREFETCHER = undef;
1802 2108
1803sub find_async { 2109sub find_async {
1804 my ($path, $origin) = @_; 2110 my ($path, $origin, $load) = @_;
1805 2111
1806 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
1807 2113
1808 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
1809 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1810 } 2116 }
1811 2117
1812 undef $MAP_PREFETCH{$path}; 2118 $MAP_PREFETCH{$path} |= $load;
2119
1813 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
2121 $Coro::current->{desc} = "map prefetcher";
2122
1814 while (%MAP_PREFETCH) { 2123 while (%MAP_PREFETCH) {
1815 for my $path (keys %MAP_PREFETCH) { 2124 while (my ($k, $v) = each %MAP_PREFETCH) {
1816 my $map = find $path 2125 if (my $map = find $k) {
1817 or next;
1818 $map->load; 2126 $map->load if $v;
2127 }
1819 2128
1820 delete $MAP_PREFETCH{$path}; 2129 delete $MAP_PREFETCH{$k};
1821 } 2130 }
1822 } 2131 }
1823 undef $MAP_PREFETCHER; 2132 undef $MAP_PREFETCHER;
1824 }; 2133 };
1825 $MAP_PREFETCHER->prio (6); 2134 $MAP_PREFETCHER->prio (6);
1828} 2137}
1829 2138
1830sub save { 2139sub save {
1831 my ($self) = @_; 2140 my ($self) = @_;
1832 2141
1833 my $lock = cf::lock_acquire "map_data:" . $self->path; 2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
1834 2143
1835 $self->{last_save} = $cf::RUNTIME; 2144 $self->{last_save} = $cf::RUNTIME;
1836 2145
1837 return unless $self->dirty; 2146 return unless $self->dirty;
1838 2147
1844 return if $self->{deny_save}; 2153 return if $self->{deny_save};
1845 2154
1846 local $self->{last_access} = $self->last_access;#d# 2155 local $self->{last_access} = $self->last_access;#d#
1847 2156
1848 cf::async { 2157 cf::async {
2158 $Coro::current->{desc} = "map player save";
1849 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
1850 }; 2160 };
1851 2161
1852 if ($uniq) { 2162 if ($uniq) {
1853 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1861 my ($self) = @_; 2171 my ($self) = @_;
1862 2172
1863 # save first because save cedes 2173 # save first because save cedes
1864 $self->save; 2174 $self->save;
1865 2175
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2176 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2177
1868 return if $self->players; 2178 return if $self->players;
1869 return if $self->in_memory != cf::MAP_IN_MEMORY; 2179 return if $self->in_memory != cf::MAP_IN_MEMORY;
1870 return if $self->{deny_save}; 2180 return if $self->{deny_save};
1871 2181
2182 $self->in_memory (cf::MAP_SWAPPED);
2183
2184 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP;
1872 $self->clear; 2186 $self->clear;
1873 $self->in_memory (cf::MAP_SWAPPED);
1874} 2187}
1875 2188
1876sub reset_at { 2189sub reset_at {
1877 my ($self) = @_; 2190 my ($self) = @_;
1878 2191
1910 if $uniq; 2223 if $uniq;
1911 } 2224 }
1912 2225
1913 delete $cf::MAP{$self->path}; 2226 delete $cf::MAP{$self->path};
1914 2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
1915 $self->clear; 2230 $self->clear;
1916
1917 $_->clear_links_to ($self) for values %cf::MAP;
1918 2231
1919 $self->unlink_save; 2232 $self->unlink_save;
1920 $self->destroy; 2233 $self->destroy;
1921} 2234}
1922 2235
1923my $nuke_counter = "aaaa"; 2236my $nuke_counter = "aaaa";
1924 2237
1925sub nuke { 2238sub nuke {
1926 my ($self) = @_; 2239 my ($self) = @_;
1927 2240
2241 {
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
1928 delete $cf::MAP{$self->path}; 2244 delete $cf::MAP{$self->path};
1929 2245
1930 $self->unlink_save; 2246 $self->unlink_save;
1931 2247
1932 bless $self, "cf::map"; 2248 bless $self, "cf::map";
1933 delete $self->{deny_reset}; 2249 delete $self->{deny_reset};
1934 $self->{deny_save} = 1; 2250 $self->{deny_save} = 1;
1935 $self->reset_timeout (1); 2251 $self->reset_timeout (1);
1936 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937 2253
1938 $cf::MAP{$self->path} = $self; 2254 $cf::MAP{$self->path} = $self;
2255 }
1939 2256
1940 $self->reset; # polite request, might not happen 2257 $self->reset; # polite request, might not happen
1941} 2258}
1942 2259
1943=item $maps = cf::map::tmp_maps 2260=item $maps = cf::map::tmp_maps
2019 2336
2020sub inv_recursive { 2337sub inv_recursive {
2021 inv_recursive_ inv $_[0] 2338 inv_recursive_ inv $_[0]
2022} 2339}
2023 2340
2341=item $ref = $ob->ref
2342
2343creates and returns a persistent reference to an objetc that can be stored as a string.
2344
2345=item $ob = cf::object::deref ($refstring)
2346
2347returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2348even if the object actually exists. May block.
2349
2350=cut
2351
2352sub deref {
2353 my ($ref) = @_;
2354
2355 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2356 my ($uuid, $name) = ($1, $2);
2357 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2358 or return;
2359 $pl->ob->uuid eq $uuid
2360 or return;
2361
2362 $pl->ob
2363 } else {
2364 warn "$ref: cannot resolve object reference\n";
2365 undef
2366 }
2367}
2368
2024package cf; 2369package cf;
2025 2370
2026=back 2371=back
2027 2372
2028=head3 cf::object::player 2373=head3 cf::object::player
2050 2395
2051 } else { 2396 } else {
2052 my $pl = $self->contr; 2397 my $pl = $self->contr;
2053 2398
2054 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2399 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055 my $diag = $pl->{npc_dialog}; 2400 my $dialog = $pl->{npc_dialog};
2056 $diag->{pl}->ext_reply ( 2401 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2057 $diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
2058 );
2059 2402
2060 } else { 2403 } else {
2061 $msg = $npc->name . " says: $msg" if $npc; 2404 $msg = $npc->name . " says: $msg" if $npc;
2062 $self->message ($msg, $flags); 2405 $self->message ($msg, $flags);
2063 } 2406 }
2064 } 2407 }
2408}
2409
2410=item $object->send_msg ($channel, $msg, $color, [extra...])
2411
2412=cut
2413
2414sub cf::object::send_msg {
2415 my $pl = shift->contr
2416 or return;
2417 $pl->send_msg (@_);
2065} 2418}
2066 2419
2067=item $player_object->may ("access") 2420=item $player_object->may ("access")
2068 2421
2069Returns wether the given player is authorized to access resource "access" 2422Returns wether the given player is authorized to access resource "access"
2148 # use -1 or undef as default coordinates, not 0, 0 2501 # use -1 or undef as default coordinates, not 0, 0
2149 ($x, $y) = ($map->enter_x, $map->enter_y) 2502 ($x, $y) = ($map->enter_x, $map->enter_y)
2150 if $x <=0 && $y <= 0; 2503 if $x <=0 && $y <= 0;
2151 2504
2152 $map->load; 2505 $map->load;
2153 $map->load_diag; 2506 $map->load_neighbours;
2154 2507
2155 return unless $self->contr->active; 2508 return unless $self->contr->active;
2156 $self->activate_recursive; 2509 $self->activate_recursive;
2157 2510
2158 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2511 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159 $self->enter_map ($map, $x, $y); 2512 $self->enter_map ($map, $x, $y);
2160} 2513}
2161 2514
2162=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2515=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2163 2516
2164Moves the player to the given map-path and coordinates by first freezing 2517Moves the player to the given map-path and coordinates by first freezing
2165her, loading and preparing them map, calling the provided $check callback 2518her, loading and preparing them map, calling the provided $check callback
2166that has to return the map if sucecssful, and then unfreezes the player on 2519that has to return the map if sucecssful, and then unfreezes the player on
2167the new (success) or old (failed) map position. 2520the new (success) or old (failed) map position. In either case, $done will
2521be called at the end of this process.
2168 2522
2169=cut 2523=cut
2170 2524
2171our $GOTOGEN; 2525our $GOTOGEN;
2172 2526
2173sub cf::object::player::goto { 2527sub cf::object::player::goto {
2174 my ($self, $path, $x, $y, $check) = @_; 2528 my ($self, $path, $x, $y, $check, $done) = @_;
2175 2529
2176 # do generation counting so two concurrent goto's will be executed in-order 2530 # do generation counting so two concurrent goto's will be executed in-order
2177 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2531 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178 2532
2179 $self->enter_link; 2533 $self->enter_link;
2180 2534
2181 (async { 2535 (async {
2536 $Coro::current->{desc} = "player::goto $path $x $y";
2537
2538 # *tag paths override both path and x|y
2539 if ($path =~ /^\*(.*)$/) {
2540 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2541 my $ob = $obs[rand @obs];
2542
2543 # see if we actually can go there
2544 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2545 $ob = $obs[rand @obs];
2546 } else {
2547 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2548 }
2549 # else put us there anyways for now #d#
2550
2551 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2552 } else {
2553 ($path, $x, $y) = (undef, undef, undef);
2554 }
2555 }
2556
2182 my $map = eval { 2557 my $map = eval {
2183 my $map = cf::map::find $path; 2558 my $map = defined $path ? cf::map::find $path : undef;
2184 2559
2185 if ($map) { 2560 if ($map) {
2186 $map = $map->customise_for ($self); 2561 $map = $map->customise_for ($self);
2187 $map = $check->($map) if $check && $map; 2562 $map = $check->($map) if $check && $map;
2188 } else { 2563 } else {
2189 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2564 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2190 } 2565 }
2191 2566
2192 $map 2567 $map
2193 }; 2568 };
2194 2569
2199 2574
2200 if ($gen == $self->{_goto_generation}) { 2575 if ($gen == $self->{_goto_generation}) {
2201 delete $self->{_goto_generation}; 2576 delete $self->{_goto_generation};
2202 $self->leave_link ($map, $x, $y); 2577 $self->leave_link ($map, $x, $y);
2203 } 2578 }
2579
2580 $done->() if $done;
2204 })->prio (1); 2581 })->prio (1);
2205} 2582}
2206 2583
2207=item $player_object->enter_exit ($exit_object) 2584=item $player_object->enter_exit ($exit_object)
2208 2585
2277 my $hp = $exit->stats->hp; 2654 my $hp = $exit->stats->hp;
2278 my $sp = $exit->stats->sp; 2655 my $sp = $exit->stats->sp;
2279 2656
2280 $self->enter_link; 2657 $self->enter_link;
2281 2658
2659 # if exit is damned, update players death & WoR home-position
2660 $self->contr->savebed ($slaying, $hp, $sp)
2661 if $exit->flag (FLAG_DAMNED);
2662
2282 (async { 2663 (async {
2664 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2665
2283 $self->deactivate_recursive; # just to be sure 2666 $self->deactivate_recursive; # just to be sure
2284 unless (eval { 2667 unless (eval {
2285 $self->goto ($slaying, $hp, $sp); 2668 $self->goto ($slaying, $hp, $sp);
2286 2669
2287 1; 2670 1;
2313 2696
2314 utf8::encode $text; 2697 utf8::encode $text;
2315 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2698 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2316} 2699}
2317 2700
2701=item $client->send_msg ($channel, $msg, $color, [extra...])
2702
2703Send a drawinfo or msg packet to the client, formatting the msg for the
2704client if neccessary. C<$type> should be a string identifying the type of
2705the message, with C<log> being the default. If C<$color> is negative, suppress
2706the message unless the client supports the msg packet.
2707
2708=cut
2709
2710# non-persistent channels (usually the info channel)
2711our %CHANNEL = (
2712 "c/identify" => {
2713 id => "infobox",
2714 title => "Identify",
2715 reply => undef,
2716 tooltip => "Items recently identified",
2717 },
2718 "c/examine" => {
2719 id => "infobox",
2720 title => "Examine",
2721 reply => undef,
2722 tooltip => "Signs and other items you examined",
2723 },
2724 "c/book" => {
2725 id => "infobox",
2726 title => "Book",
2727 reply => undef,
2728 tooltip => "The contents of a note or book",
2729 },
2730 "c/lookat" => {
2731 id => "infobox",
2732 title => "Look",
2733 reply => undef,
2734 tooltip => "What you saw there",
2735 },
2736 "c/who" => {
2737 id => "infobox",
2738 title => "Players",
2739 reply => undef,
2740 tooltip => "Shows players who are currently online",
2741 },
2742 "c/body" => {
2743 id => "infobox",
2744 title => "Body Parts",
2745 reply => undef,
2746 tooltip => "Shows which body parts you posess and are available",
2747 },
2748 "c/uptime" => {
2749 id => "infobox",
2750 title => "Uptime",
2751 reply => undef,
2752 tooltip => "How long the server has been running since last restart",
2753 },
2754 "c/mapinfo" => {
2755 id => "infobox",
2756 title => "Map Info",
2757 reply => undef,
2758 tooltip => "Information related to the maps",
2759 },
2760);
2761
2762sub cf::client::send_msg {
2763 my ($self, $channel, $msg, $color, @extra) = @_;
2764
2765 $msg = $self->pl->expand_cfpod ($msg);
2766
2767 $color &= cf::NDI_CLIENT_MASK; # just in case...
2768
2769 # check predefined channels, for the benefit of C
2770 if ($CHANNEL{$channel}) {
2771 $channel = $CHANNEL{$channel};
2772
2773 $self->ext_msg (channel_info => $channel)
2774 if $self->can_msg;
2775
2776 $channel = $channel->{id};
2777
2778 } elsif (ref $channel) {
2779 # send meta info to client, if not yet sent
2780 unless (exists $self->{channel}{$channel->{id}}) {
2781 $self->{channel}{$channel->{id}} = $channel;
2782 $self->ext_msg (channel_info => $channel)
2783 if $self->can_msg;
2784 }
2785
2786 $channel = $channel->{id};
2787 }
2788
2789 return unless @extra || length $msg;
2790
2791 if ($self->can_msg) {
2792 # default colour, mask it out
2793 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2794 if $color & cf::NDI_DEF;
2795
2796 $self->send_packet ("msg " . $self->{json_coder}->encode (
2797 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2798 } else {
2799 if ($color >= 0) {
2800 # replace some tags by gcfclient-compatible ones
2801 for ($msg) {
2802 1 while
2803 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2804 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2805 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2806 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2807 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2808 }
2809
2810 $color &= cf::NDI_COLOR_MASK;
2811
2812 utf8::encode $msg;
2813
2814 if (0 && $msg =~ /\[/) {
2815 # COMMAND/INFO
2816 $self->send_packet ("drawextinfo $color 10 8 $msg")
2817 } else {
2818 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2819 $self->send_packet ("drawinfo $color $msg")
2820 }
2821 }
2822 }
2823}
2824
2318=item $client->ext_event ($type, %msg) 2825=item $client->ext_msg ($type, @msg)
2319 2826
2320Sends an exti event to the client. 2827Sends an ext event to the client.
2321 2828
2322=cut 2829=cut
2323 2830
2324sub cf::client::ext_event($$%) { 2831sub cf::client::ext_msg($$@) {
2325 my ($self, $type, %msg) = @_; 2832 my ($self, $type, @msg) = @_;
2326 2833
2834 if ($self->extcmd == 2) {
2835 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2836 } elsif ($self->extcmd == 1) { # TODO: remove
2327 $msg{msgtype} = "event_$type"; 2837 push @msg, msgtype => "event_$type";
2328 $self->send_packet ("ext " . cf::to_json \%msg); 2838 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2839 }
2840}
2841
2842=item $client->ext_reply ($msgid, @msg)
2843
2844Sends an ext reply to the client.
2845
2846=cut
2847
2848sub cf::client::ext_reply($$@) {
2849 my ($self, $id, @msg) = @_;
2850
2851 if ($self->extcmd == 2) {
2852 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2853 } elsif ($self->extcmd == 1) {
2854 #TODO: version 1, remove
2855 unshift @msg, msgtype => "reply", msgid => $id;
2856 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2857 }
2329} 2858}
2330 2859
2331=item $success = $client->query ($flags, "text", \&cb) 2860=item $success = $client->query ($flags, "text", \&cb)
2332 2861
2333Queues a query to the client, calling the given callback with 2862Queues a query to the client, calling the given callback with
2334the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2863the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2335C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2864C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336 2865
2337Queries can fail, so check the return code. Or don't, as queries will become 2866Queries can fail, so check the return code. Or don't, as queries will
2338reliable at some point in the future. 2867become reliable at some point in the future.
2339 2868
2340=cut 2869=cut
2341 2870
2342sub cf::client::query { 2871sub cf::client::query {
2343 my ($self, $flags, $text, $cb) = @_; 2872 my ($self, $flags, $text, $cb) = @_;
2351 utf8::encode $text; 2880 utf8::encode $text;
2352 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2881 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353 2882
2354 $self->send_packet ($self->{query_queue}[0][0]) 2883 $self->send_packet ($self->{query_queue}[0][0])
2355 if @{ $self->{query_queue} } == 1; 2884 if @{ $self->{query_queue} } == 1;
2885
2886 1
2356} 2887}
2357 2888
2358cf::client->attach ( 2889cf::client->attach (
2890 on_connect => sub {
2891 my ($ns) = @_;
2892
2893 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2894 },
2359 on_reply => sub { 2895 on_reply => sub {
2360 my ($ns, $msg) = @_; 2896 my ($ns, $msg) = @_;
2361 2897
2362 # this weird shuffling is so that direct followup queries 2898 # this weird shuffling is so that direct followup queries
2363 # get handled first 2899 # get handled first
2375 } else { 2911 } else {
2376 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2912 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377 } 2913 }
2378 } 2914 }
2379 }, 2915 },
2916 on_exticmd => sub {
2917 my ($ns, $buf) = @_;
2918
2919 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2920
2921 if (ref $msg) {
2922 my ($type, $reply, @payload) =
2923 "ARRAY" eq ref $msg
2924 ? @$msg
2925 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2926
2927 my @reply;
2928
2929 if (my $cb = $EXTICMD{$type}) {
2930 @reply = $cb->($ns, @payload);
2931 }
2932
2933 $ns->ext_reply ($reply, @reply)
2934 if $reply;
2935
2936 } else {
2937 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2938 }
2939
2940 cf::override;
2941 },
2380); 2942);
2381 2943
2382=item $client->async (\&cb) 2944=item $client->async (\&cb)
2383 2945
2384Create a new coroutine, running the specified callback. The coroutine will 2946Create a new coroutine, running the specified callback. The coroutine will
2425our $safe = new Safe "safe"; 2987our $safe = new Safe "safe";
2426our $safe_hole = new Safe::Hole; 2988our $safe_hole = new Safe::Hole;
2427 2989
2428$SIG{FPE} = 'IGNORE'; 2990$SIG{FPE} = 'IGNORE';
2429 2991
2430$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2992$safe->permit_only (Opcode::opset qw(
2993 :base_core :base_mem :base_orig :base_math
2994 grepstart grepwhile mapstart mapwhile
2995 sort time
2996));
2431 2997
2432# here we export the classes and methods available to script code 2998# here we export the classes and methods available to script code
2433 2999
2434=pod 3000=pod
2435 3001
2436The following functions and methods are available within a safe environment: 3002The following functions and methods are available within a safe environment:
2437 3003
2438 cf::object contr pay_amount pay_player map 3004 cf::object
3005 contr pay_amount pay_player map x y force_find force_add destroy
3006 insert remove name archname title slaying race decrease_ob_nr
3007
2439 cf::object::player player 3008 cf::object::player
2440 cf::player peaceful 3009 player
2441 cf::map trigger 3010
3011 cf::player
3012 peaceful
3013
3014 cf::map
3015 trigger
2442 3016
2443=cut 3017=cut
2444 3018
2445for ( 3019for (
2446 ["cf::object" => qw(contr pay_amount pay_player map)], 3020 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3021 insert remove inv name archname title slaying race
3022 decrease_ob_nr destroy)],
2447 ["cf::object::player" => qw(player)], 3023 ["cf::object::player" => qw(player)],
2448 ["cf::player" => qw(peaceful)], 3024 ["cf::player" => qw(peaceful)],
2449 ["cf::map" => qw(trigger)], 3025 ["cf::map" => qw(trigger)],
2450) { 3026) {
2451 no strict 'refs'; 3027 no strict 'refs';
2527# the server's init and main functions 3103# the server's init and main functions
2528 3104
2529sub load_facedata($) { 3105sub load_facedata($) {
2530 my ($path) = @_; 3106 my ($path) = @_;
2531 3107
3108 # HACK to clear player env face cache, we need some signal framework
3109 # for this (global event?)
3110 %ext::player_env::MUSIC_FACE_CACHE = ();
3111
3112 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3113
2532 warn "loading facedata from $path\n"; 3114 warn "loading facedata from $path\n";
2533 3115
2534 my $facedata; 3116 my $facedata;
2535 0 < aio_load $path, $facedata 3117 0 < aio_load $path, $facedata
2536 or die "$path: $!"; 3118 or die "$path: $!";
2538 $facedata = Coro::Storable::thaw $facedata; 3120 $facedata = Coro::Storable::thaw $facedata;
2539 3121
2540 $facedata->{version} == 2 3122 $facedata->{version} == 2
2541 or cf::cleanup "$path: version mismatch, cannot proceed."; 3123 or cf::cleanup "$path: version mismatch, cannot proceed.";
2542 3124
3125 # patch in the exptable
3126 $facedata->{resource}{"res/exp_table"} = {
3127 type => FT_RSRC,
3128 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3129 };
3130 cf::cede_to_tick;
3131
2543 { 3132 {
2544 my $faces = $facedata->{faceinfo}; 3133 my $faces = $facedata->{faceinfo};
2545 3134
2546 while (my ($face, $info) = each %$faces) { 3135 while (my ($face, $info) = each %$faces) {
2547 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3136 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2548 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3137 cf::face::set_visibility $idx, $info->{visibility};
3138 cf::face::set_magicmap $idx, $info->{magicmap};
2549 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3139 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2550 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3140 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2551 Coro::cede; 3141
3142 cf::cede_to_tick;
2552 } 3143 }
2553 3144
2554 while (my ($face, $info) = each %$faces) { 3145 while (my ($face, $info) = each %$faces) {
2555 next unless $info->{smooth}; 3146 next unless $info->{smooth};
2556 my $idx = cf::face::find $face 3147 my $idx = cf::face::find $face
2557 or next; 3148 or next;
2558 if (my $smooth = cf::face::find $info->{smooth}) { 3149 if (my $smooth = cf::face::find $info->{smooth}) {
3150 cf::face::set_smooth $idx, $smooth;
2559 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3151 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560 } else { 3152 } else {
2561 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3153 warn "smooth face '$info->{smooth}' not found for face '$face'";
2562 } 3154 }
2563 Coro::cede; 3155
3156 cf::cede_to_tick;
2564 } 3157 }
2565 } 3158 }
2566 3159
2567 { 3160 {
2568 my $anims = $facedata->{animinfo}; 3161 my $anims = $facedata->{animinfo};
2569 3162
2570 while (my ($anim, $info) = each %$anims) { 3163 while (my ($anim, $info) = each %$anims) {
2571 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3164 cf::anim::set $anim, $info->{frames}, $info->{facings};
2572 Coro::cede; 3165 cf::cede_to_tick;
2573 } 3166 }
2574 3167
2575 cf::anim::invalidate_all; # d'oh 3168 cf::anim::invalidate_all; # d'oh
2576 } 3169 }
2577 3170
3171 {
3172 # TODO: for gcfclient pleasure, we should give resources
3173 # that gcfclient doesn't grok a >10000 face index.
3174 my $res = $facedata->{resource};
3175
3176 my $soundconf = delete $res->{"res/sound.conf"};
3177
3178 while (my ($name, $info) = each %$res) {
3179 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3180 my $data;
3181
3182 if ($info->{type} & 1) {
3183 # prepend meta info
3184
3185 my $meta = $enc->encode ({
3186 name => $name,
3187 %{ $info->{meta} || {} },
3188 });
3189
3190 $data = pack "(w/a*)*", $meta, $info->{data};
3191 } else {
3192 $data = $info->{data};
3193 }
3194
3195 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3196 cf::face::set_type $idx, $info->{type};
3197
3198 cf::cede_to_tick;
3199 }
3200
3201 if ($soundconf) {
3202 $soundconf = $enc->decode (delete $soundconf->{data});
3203
3204 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3205 my $sound = $soundconf->{compat}[$_]
3206 or next;
3207
3208 my $face = cf::face::find "sound/$sound->[1]";
3209 cf::sound::set $sound->[0] => $face;
3210 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3211 }
3212
3213 while (my ($k, $v) = each %{$soundconf->{event}}) {
3214 my $face = cf::face::find "sound/$v";
3215 cf::sound::set $k => $face;
3216 }
3217 }
3218 }
3219
2578 1 3220 1
2579} 3221}
2580 3222
3223register_exticmd fx_want => sub {
3224 my ($ns, $want) = @_;
3225
3226 while (my ($k, $v) = each %$want) {
3227 $ns->fx_want ($k, $v);
3228 }
3229};
3230
2581sub reload_regions { 3231sub reload_regions {
3232 # HACK to clear player env face cache, we need some signal framework
3233 # for this (global event?)
3234 %ext::player_env::MUSIC_FACE_CACHE = ();
3235
2582 load_resource_file "$MAPDIR/regions" 3236 load_resource_file "$MAPDIR/regions"
2583 or die "unable to load regions file\n"; 3237 or die "unable to load regions file\n";
3238
3239 for (cf::region::list) {
3240 $_->{match} = qr/$_->{match}/
3241 if exists $_->{match};
3242 }
2584} 3243}
2585 3244
2586sub reload_facedata { 3245sub reload_facedata {
2587 load_facedata "$DATADIR/facedata" 3246 load_facedata "$DATADIR/facedata"
2588 or die "unable to load facedata\n"; 3247 or die "unable to load facedata\n";
2589} 3248}
2590 3249
2591sub reload_archetypes { 3250sub reload_archetypes {
3251 load_resource_file "$DATADIR/archetypes"
3252 or die "unable to load archetypes\n";
3253 #d# NEED to laod twice to resolve forward references
3254 # this really needs to be done in an extra post-pass
3255 # (which needs to be synchronous, so solve it differently)
2592 load_resource_file "$DATADIR/archetypes" 3256 load_resource_file "$DATADIR/archetypes"
2593 or die "unable to load archetypes\n"; 3257 or die "unable to load archetypes\n";
2594} 3258}
2595 3259
2596sub reload_treasures { 3260sub reload_treasures {
2612 3276
2613sub init { 3277sub init {
2614 reload_resources; 3278 reload_resources;
2615} 3279}
2616 3280
2617sub cfg_load { 3281sub reload_config {
2618 open my $fh, "<:utf8", "$CONFDIR/config" 3282 open my $fh, "<:utf8", "$CONFDIR/config"
2619 or return; 3283 or return;
2620 3284
2621 local $/; 3285 local $/;
2622 *CFG = YAML::Syck::Load <$fh>; 3286 *CFG = YAML::Syck::Load <$fh>;
2638sub main { 3302sub main {
2639 # we must not ever block the main coroutine 3303 # we must not ever block the main coroutine
2640 local $Coro::idle = sub { 3304 local $Coro::idle = sub {
2641 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3305 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2642 (async { 3306 (async {
3307 $Coro::current->{desc} = "IDLE BUG HANDLER";
2643 Event::one_event; 3308 Event::one_event;
2644 })->prio (Coro::PRIO_MAX); 3309 })->prio (Coro::PRIO_MAX);
2645 }; 3310 };
2646 3311
2647 cfg_load; 3312 reload_config;
2648 db_init; 3313 db_init;
2649 load_extensions; 3314 load_extensions;
2650 3315
2651 $TICK_WATCHER->start; 3316 $TICK_WATCHER->start;
2652 Event::loop; 3317 Event::loop;
2719 # and maps saved/destroyed asynchronously. 3384 # and maps saved/destroyed asynchronously.
2720 warn "begin emergency player save\n"; 3385 warn "begin emergency player save\n";
2721 for my $login (keys %cf::PLAYER) { 3386 for my $login (keys %cf::PLAYER) {
2722 my $pl = $cf::PLAYER{$login} or next; 3387 my $pl = $cf::PLAYER{$login} or next;
2723 $pl->valid or next; 3388 $pl->valid or next;
3389 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2724 $pl->save; 3390 $pl->save;
2725 } 3391 }
2726 warn "end emergency player save\n"; 3392 warn "end emergency player save\n";
2727 3393
2728 warn "begin emergency map save\n"; 3394 warn "begin emergency map save\n";
2776 3442
2777 warn "flushing outstanding aio requests"; 3443 warn "flushing outstanding aio requests";
2778 for (;;) { 3444 for (;;) {
2779 BDB::flush; 3445 BDB::flush;
2780 IO::AIO::flush; 3446 IO::AIO::flush;
2781 Coro::cede; 3447 Coro::cede_notself;
2782 last unless IO::AIO::nreqs || BDB::nreqs; 3448 last unless IO::AIO::nreqs || BDB::nreqs;
2783 warn "iterate..."; 3449 warn "iterate...";
2784 } 3450 }
2785 3451
2786 ++$RELOAD; 3452 ++$RELOAD;
2790 %EXT_CORO = (); 3456 %EXT_CORO = ();
2791 3457
2792 warn "removing commands"; 3458 warn "removing commands";
2793 %COMMAND = (); 3459 %COMMAND = ();
2794 3460
2795 warn "removing ext commands"; 3461 warn "removing ext/exti commands";
2796 %EXTCMD = (); 3462 %EXTCMD = ();
3463 %EXTICMD = ();
2797 3464
2798 warn "unloading/nuking all extensions"; 3465 warn "unloading/nuking all extensions";
2799 for my $pkg (@EXTS) { 3466 for my $pkg (@EXTS) {
2800 warn "... unloading $pkg"; 3467 warn "... unloading $pkg";
2801 3468
2844 warn "reloading cf.pm"; 3511 warn "reloading cf.pm";
2845 require cf; 3512 require cf;
2846 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3513 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2847 3514
2848 warn "loading config and database again"; 3515 warn "loading config and database again";
2849 cf::cfg_load; 3516 cf::reload_config;
2850 3517
2851 warn "loading extensions"; 3518 warn "loading extensions";
2852 cf::load_extensions; 3519 cf::load_extensions;
2853 3520
2854 warn "reattaching attachments to objects/players"; 3521 warn "reattaching attachments to objects/players";
2890register_command "reload" => sub { 3557register_command "reload" => sub {
2891 my ($who, $arg) = @_; 3558 my ($who, $arg) = @_;
2892 3559
2893 if ($who->flag (FLAG_WIZ)) { 3560 if ($who->flag (FLAG_WIZ)) {
2894 $who->message ("reloading server."); 3561 $who->message ("reloading server.");
3562 async {
3563 $Coro::current->{desc} = "perl_reload";
2895 async { reload_perl }; 3564 reload_perl;
3565 };
2896 } 3566 }
2897}; 3567};
2898 3568
2899unshift @INC, $LIBDIR; 3569unshift @INC, $LIBDIR;
2900 3570
2919 my $signal = new Coro::Signal; 3589 my $signal = new Coro::Signal;
2920 push @WAIT_FOR_TICK_BEGIN, $signal; 3590 push @WAIT_FOR_TICK_BEGIN, $signal;
2921 $signal->wait; 3591 $signal->wait;
2922} 3592}
2923 3593
2924 my $min = 1e6;#d#
2925 my $avg = 10;
2926$TICK_WATCHER = Event->timer ( 3594$TICK_WATCHER = Event->timer (
2927 reentrant => 0, 3595 reentrant => 0,
2928 parked => 1, 3596 parked => 1,
2929 prio => 0, 3597 prio => 0,
2930 at => $NEXT_TICK || $TICK, 3598 at => $NEXT_TICK || $TICK,
2938 3606
2939 $NOW = $tick_start = Event::time; 3607 $NOW = $tick_start = Event::time;
2940 3608
2941 cf::server_tick; # one server iteration 3609 cf::server_tick; # one server iteration
2942 3610
2943 0 && sync_job {#d#
2944 for(1..10) {
2945 my $t = Event::time;
2946 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2947 or die;
2948
2949 $map->width (50);
2950 $map->height (50);
2951 $map->alloc;
2952 $map->_load_objects ("/tmp/x.map", 1);
2953 my $t = Event::time - $t;
2954
2955 #next unless $t < 0.0013;#d#
2956 if ($t < $min) {
2957 $min = $t;
2958 }
2959 $avg = $avg * 0.99 + $t * 0.01;
2960 }
2961 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2962 exit 0;
2963 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2964 };
2965
2966 $RUNTIME += $TICK; 3611 $RUNTIME += $TICK;
2967 $NEXT_TICK += $TICK; 3612 $NEXT_TICK += $TICK;
2968 3613
2969 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3614 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2970 $NEXT_RUNTIME_WRITE = $NOW + 10; 3615 $NEXT_RUNTIME_WRITE = $NOW + 10;
2971 Coro::async_pool { 3616 Coro::async_pool {
3617 $Coro::current->{desc} = "runtime saver";
2972 write_runtime 3618 write_runtime
2973 or warn "ERROR: unable to write runtime file: $!"; 3619 or warn "ERROR: unable to write runtime file: $!";
2974 }; 3620 };
2975 } 3621 }
2976 3622
2977# my $AFTER = Event::time;
2978# warn $AFTER - $NOW;#d#
2979
2980 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3623 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2981 $sig->send; 3624 $sig->send;
2982 } 3625 }
2983 while (my $sig = shift @WAIT_FOR_TICK) { 3626 while (my $sig = shift @WAIT_FOR_TICK) {
2984 $sig->send; 3627 $sig->send;
2994 3637
2995 $LOAD = ($NOW - $tick_start) / $TICK; 3638 $LOAD = ($NOW - $tick_start) / $TICK;
2996 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3639 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2997 3640
2998 _post_tick; 3641 _post_tick;
2999
3000
3001 }, 3642 },
3002); 3643);
3003 3644
3004{ 3645{
3646 BDB::min_parallel 8;
3005 BDB::max_poll_time $TICK * 0.1; 3647 BDB::max_poll_time $TICK * 0.1;
3006 $BDB_POLL_WATCHER = Event->io ( 3648 $BDB_POLL_WATCHER = Event->io (
3007 reentrant => 0, 3649 reentrant => 0,
3008 fd => BDB::poll_fileno, 3650 fd => BDB::poll_fileno,
3009 poll => 'r', 3651 poll => 'r',
3010 prio => 0, 3652 prio => 0,
3011 data => WF_AUTOCANCEL, 3653 data => WF_AUTOCANCEL,
3012 cb => \&BDB::poll_cb, 3654 cb => \&BDB::poll_cb,
3013 ); 3655 );
3014 BDB::min_parallel 8;
3015 3656
3016 BDB::set_sync_prepare { 3657 BDB::set_sync_prepare {
3017 my $status; 3658 my $status;
3018 my $current = $Coro::current; 3659 my $current = $Coro::current;
3019 ( 3660 (
3028 ) 3669 )
3029 }; 3670 };
3030 3671
3031 unless ($DB_ENV) { 3672 unless ($DB_ENV) {
3032 $DB_ENV = BDB::db_env_create; 3673 $DB_ENV = BDB::db_env_create;
3674 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3675 | BDB::LOG_AUTOREMOVE, 1);
3676 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3677 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3033 3678
3034 cf::sync_job { 3679 cf::sync_job {
3035 eval { 3680 eval {
3036 BDB::db_env_open 3681 BDB::db_env_open
3037 $DB_ENV, 3682 $DB_ENV,
3039 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3684 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3040 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3685 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3041 0666; 3686 0666;
3042 3687
3043 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3688 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3044
3045 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3046 $DB_ENV->set_lk_detect;
3047 }; 3689 };
3048 3690
3049 cf::cleanup "db_env_open(db): $@" if $@; 3691 cf::cleanup "db_env_open(db): $@" if $@;
3050 }; 3692 };
3051 } 3693 }
3694
3695 $BDB_DEADLOCK_WATCHER = Event->timer (
3696 after => 3,
3697 interval => 1,
3698 hard => 1,
3699 prio => 0,
3700 data => WF_AUTOCANCEL,
3701 cb => sub {
3702 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3703 },
3704 );
3705 $BDB_CHECKPOINT_WATCHER = Event->timer (
3706 after => 11,
3707 interval => 60,
3708 hard => 1,
3709 prio => 0,
3710 data => WF_AUTOCANCEL,
3711 cb => sub {
3712 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3713 },
3714 );
3715 $BDB_TRICKLE_WATCHER = Event->timer (
3716 after => 5,
3717 interval => 10,
3718 hard => 1,
3719 prio => 0,
3720 data => WF_AUTOCANCEL,
3721 cb => sub {
3722 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3723 },
3724 );
3052} 3725}
3053 3726
3054{ 3727{
3055 IO::AIO::min_parallel 8; 3728 IO::AIO::min_parallel 8;
3056 3729
3059 $AIO_POLL_WATCHER = Event->io ( 3732 $AIO_POLL_WATCHER = Event->io (
3060 reentrant => 0, 3733 reentrant => 0,
3061 data => WF_AUTOCANCEL, 3734 data => WF_AUTOCANCEL,
3062 fd => IO::AIO::poll_fileno, 3735 fd => IO::AIO::poll_fileno,
3063 poll => 'r', 3736 poll => 'r',
3064 prio => 6, 3737 prio => 0,
3065 cb => \&IO::AIO::poll_cb, 3738 cb => \&IO::AIO::poll_cb,
3066 ); 3739 );
3067} 3740}
3068 3741
3069my $_log_backtrace; 3742my $_log_backtrace;
3075 3748
3076 # limit the # of concurrent backtraces 3749 # limit the # of concurrent backtraces
3077 if ($_log_backtrace < 2) { 3750 if ($_log_backtrace < 2) {
3078 ++$_log_backtrace; 3751 ++$_log_backtrace;
3079 async { 3752 async {
3753 $Coro::current->{desc} = "abt $msg";
3754
3080 my @bt = fork_call { 3755 my @bt = fork_call {
3081 @addr = map { sprintf "%x", $_ } @addr; 3756 @addr = map { sprintf "%x", $_ } @addr;
3082 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3757 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3083 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3758 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3084 or die "addr2line: $!"; 3759 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines