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.292 by root, Tue Jul 3 00:54:57 2007 UTC vs.
Revision 1.385 by root, Fri Oct 12 19:13:26 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
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 ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
34 36
35# configure various modules to our taste 37# configure various modules to our taste
36# 38#
37$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
38Coro::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
78our $NEXT_TICK; 80our $NEXT_TICK;
79our $NOW; 81our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
81 83
82our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 88our $DB_ENV;
84 89
85our %CFG; 90our %CFG;
86 91
87our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 93our $RUNTIME;
89 94
90our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
93 98
94# 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 ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 101
166 171
167These 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
168returns 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
169per 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.
170 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
171=back 182=back
172 183
173=cut 184=cut
174 185
175BEGIN { 186BEGIN {
179 $msg .= "\n" 190 $msg .= "\n"
180 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
181 192
182 $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;
183 194
184 utf8::encode $msg;
185 LOG llevError, $msg; 195 LOG llevError, $msg;
186 }; 196 };
187} 197}
188 198
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
267returned. 277returned.
268 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
269Lock 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
270uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
271 284
272=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
273 286
274Return 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.
275 288
276=cut 289=cut
277 290
278our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
279 293
280sub lock_wait($) { 294sub lock_wait($) {
281 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#
282 301
283 # wait for lock, if any 302 # wait for lock, if any
284 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 305 Coro::schedule;
292 311
293 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
294 lock_wait $key; 313 lock_wait $key;
295 314
296 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
297 317
298 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
301 } 322 }
302} 323}
303 324
315 }; 336 };
316 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
317 $guard 338 $guard
318} 339}
319 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
320=item cf::async { BLOCK } 399=item cf::async { BLOCK }
321 400
322Currently the same as Coro::async_pool, meaning you cannot use 401Currently the same as Coro::async_pool, meaning you cannot use
323C<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
324thing you are allowed to do is call C<prio> on it. 403thing you are allowed to do is call C<prio> on it.
348 my $time = Event::time; 427 my $time = Event::time;
349 428
350 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
352 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
353 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
354 # (but this is cancel-safe) 435 # (but this is cancel-safe)
355 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
356 437
357 my $busy = 1; 438 my $busy = 1;
358 my @res; 439 my @res;
359 440
360 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 443 @res = eval { $job->() };
362 warn $@ if $@; 444 warn $@ if $@;
363 undef $busy; 445 undef $busy;
364 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
365 447
412=cut 494=cut
413 495
414sub fork_call(&@) { 496sub fork_call(&@) {
415 my ($cb, @args) = @_; 497 my ($cb, @args) = @_;
416 498
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 499 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 500 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 501 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 502
422 if (my $pid = fork) { 503 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 504 reset_signals;
435 local $SIG{__WARN__}; 505 &$cb
436 local $SIG{__DIE__}; 506 }, @args;
437 eval {
438 close $fh1;
439 507
440 my @res = eval { $cb->(@args) }; 508 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442 };
443
444 warn $@ if $@;
445 _exit 0;
446 }
447} 509}
448 510
449=item $value = cf::db_get $family => $key 511=item $value = cf::db_get $family => $key
450 512
451Returns a single value from the environment database. 513Returns a single value from the environment database.
453=item cf::db_put $family => $key => $value 515=item cf::db_put $family => $key => $value
454 516
455Stores the given C<$value> in the family. It can currently store binary 517Stores the given C<$value> in the family. It can currently store binary
456data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 518data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457 519
520=item $db = cf::db_table "name"
521
522Create and/or open a new database table. The string must not be "db" and must be unique
523within each server.
524
458=cut 525=cut
526
527sub db_table($) {
528 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV;
530
531 eval {
532 $db->set_flags (BDB::CHKSUM);
533
534 utf8::encode $name;
535 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
536 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
537 cf::cleanup "db_open(db): $!" if $!;
538 };
539 cf::cleanup "db_open(db): $@" if $@;
540
541 $db
542}
459 543
460our $DB; 544our $DB;
461 545
462sub db_init { 546sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job { 547 cf::sync_job {
467 eval { 548 $DB ||= db_table "db";
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 } 549 };
477} 550}
478 551
479sub db_get($$) { 552sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
481 554
531 if (1) { 604 if (1) {
532 $md5 = 605 $md5 =
533 join "\x00", 606 join "\x00",
534 $processversion, 607 $processversion,
535 map { 608 map {
536 Coro::cede; 609 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 610 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 611 } 0.. $#$src;
539 612
540 613
541 my $dbmd5 = db_get cache => "$id/md5"; 614 my $dbmd5 = db_get cache => "$id/md5";
847 "; 920 ";
848 die if $@; 921 die if $@;
849} 922}
850 923
851our $override; 924our $override;
852our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 925our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853 926
854sub override { 927sub override {
855 $override = 1; 928 $override = 1;
856 @invoke_results = (); 929 @INVOKE_RESULTS = (@_);
857} 930}
858 931
859sub do_invoke { 932sub do_invoke {
860 my $event = shift; 933 my $event = shift;
861 my $callbacks = shift; 934 my $callbacks = shift;
862 935
863 @invoke_results = (); 936 @INVOKE_RESULTS = ();
864 937
865 local $override; 938 local $override;
866 939
867 for (@$callbacks) { 940 for (@$callbacks) {
868 eval { &{$_->[1]} }; 941 eval { &{$_->[1]} };
885 958
886Generate an object-specific event with the given arguments. 959Generate an object-specific event with the given arguments.
887 960
888This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 961This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
889removed in future versions), and there is no public API to access override 962removed in future versions), and there is no public API to access override
890results (if you must, access C<@cf::invoke_results> directly). 963results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 964
892=back 965=back
893 966
894=cut 967=cut
895 968
896############################################################################# 969#############################################################################
897# object support 970# object support
971#
972
973sub _can_merge {
974 my ($ob1, $ob2) = @_;
975
976 return 1;#d#
977
978 #todo#d# kill yourself and do some recursive checking manually without storable
979 sync_job {
980 my $guard = Coro::Storable::guard;
981 local $Storable::canonical = 1;
982 my $fob1 = Storable::freeze $ob1;
983 my $fob2 = Storable::freeze $ob2;
984 $fob1 eq $fob2
985 }
986}
898 987
899sub reattach { 988sub reattach {
900 # basically do the same as instantiate, without calling instantiate 989 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 990 my ($obj) = @_;
902 991
949sub object_freezer_save { 1038sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1039 my ($filename, $rdata, $objs) = @_;
951 1040
952 sync_job { 1041 sync_job {
953 if (length $$rdata) { 1042 if (length $$rdata) {
1043 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1044 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1045 $decname, length $$rdata, scalar @$objs;
956 1046
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1047 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1048 chmod SAVE_MODE, $fh;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1049 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 aio_fsync $fh if $cf::USE_FSYNC; 1050 aio_fsync $fh if $cf::USE_FSYNC;
961 close $fh; 1051 close $fh;
962 1052
963 if (@$objs) { 1053 if (@$objs) {
964 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1054 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
965 chmod SAVE_MODE, $fh; 1055 chmod SAVE_MODE, $fh;
966 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1056 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
967 aio_write $fh, 0, (length $data), $data, 0; 1057 aio_write $fh, 0, (length $data), $data, 0;
968 aio_fsync $fh if $cf::USE_FSYNC; 1058 aio_fsync $fh if $cf::USE_FSYNC;
969 close $fh; 1059 close $fh;
970 aio_rename "$filename.pst~", "$filename.pst"; 1060 aio_rename "$filename.pst~", "$filename.pst";
971 } 1061 }
979 } 1069 }
980 } else { 1070 } else {
981 aio_unlink $filename; 1071 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1072 aio_unlink "$filename.pst";
983 } 1073 }
984 } 1074 };
985} 1075}
986 1076
987sub object_freezer_as_string { 1077sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1078 my ($rdata, $objs) = @_;
989 1079
1001 or return; 1091 or return;
1002 1092
1003 unless (aio_stat "$filename.pst") { 1093 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1094 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1095 or return;
1006 $av = eval { (Storable::thaw $av)->{objs} };
1007 }
1008 1096
1097 my $st = eval { Coro::Storable::thaw $av }
1098 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1099 $av = $st->{objs};
1100 }
1101
1102 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1103 warn sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1104 $decname, length $data, scalar @{$av || []};
1105
1011 return ($data, $av); 1106 ($data, $av)
1012} 1107}
1013 1108
1014=head2 COMMAND CALLBACKS 1109=head2 COMMAND CALLBACKS
1015 1110
1016=over 4 1111=over 4
1089 my ($pl, $buf) = @_; 1184 my ($pl, $buf) = @_;
1090 1185
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1186 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1187
1093 if (ref $msg) { 1188 if (ref $msg) {
1189 my ($type, $reply, @payload) =
1190 "ARRAY" eq ref $msg
1191 ? @$msg
1192 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1193
1194 my @reply;
1195
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1196 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1197 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1198 }
1199
1200 $pl->ext_reply ($reply, @reply)
1201 if $reply;
1202
1099 } else { 1203 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1204 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1205 }
1102 1206
1103 cf::override; 1207 cf::override;
1193 1297
1194=head3 cf::player 1298=head3 cf::player
1195 1299
1196=over 4 1300=over 4
1197 1301
1302=item cf::player::num_playing
1303
1304Returns the official number of playing players, as per the Crossfire metaserver rules.
1305
1306=cut
1307
1308sub num_playing {
1309 scalar grep
1310 $_->ob->map
1311 && !$_->hidden
1312 && !$_->ob->flag (cf::FLAG_WIZ),
1313 cf::player::list
1314}
1315
1198=item cf::player::find $login 1316=item cf::player::find $login
1199 1317
1200Returns the given player object, loading it if necessary (might block). 1318Returns the given player object, loading it if necessary (might block).
1201 1319
1202=cut 1320=cut
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1355 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1356 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1357 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1358 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1359
1242 my $pl = load_pl path $login 1360 my $f = new_from_file cf::object::thawer path $login
1243 or return; 1361 or return;
1362
1363 my $pl = cf::player::load_pl $f
1364 or return;
1365 local $cf::PLAYER_LOADING{$login} = $pl;
1366 $f->resolve_delayed_derefs;
1244 $cf::PLAYER{$login} = $pl 1367 $cf::PLAYER{$login} = $pl
1245 } 1368 }
1246 } 1369 }
1247} 1370}
1248 1371
1258 1381
1259 aio_mkdir playerdir $pl, 0770; 1382 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1383 $pl->{last_save} = $cf::RUNTIME;
1261 1384
1262 $pl->save_pl ($path); 1385 $pl->save_pl ($path);
1263 Coro::cede; 1386 cf::cede_to_tick;
1264} 1387}
1265 1388
1266sub new($) { 1389sub new($) {
1267 my ($login) = @_; 1390 my ($login) = @_;
1268 1391
1272 $self->{deny_save} = 1; 1395 $self->{deny_save} = 1;
1273 1396
1274 $cf::PLAYER{$login} = $self; 1397 $cf::PLAYER{$login} = $self;
1275 1398
1276 $self 1399 $self
1400}
1401
1402=item $player->send_msg ($channel, $msg, $color, [extra...])
1403
1404=cut
1405
1406sub send_msg {
1407 my $ns = shift->ns
1408 or return;
1409 $ns->send_msg (@_);
1277} 1410}
1278 1411
1279=item $pl->quit_character 1412=item $pl->quit_character
1280 1413
1281Nukes the player without looking back. If logged in, the connection will 1414Nukes the player without looking back. If logged in, the connection will
1336 or return []; 1469 or return [];
1337 1470
1338 my @logins; 1471 my @logins;
1339 1472
1340 for my $login (@$dirs) { 1473 for my $login (@$dirs) {
1474 my $path = path $login;
1475
1476 # a .pst is a dead give-away for a valid player
1477 unless (-e "$path.pst") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1478 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1479 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1480 $buf !~ /^password -------------$/m or next; # official not-valid tag
1481 }
1344 1482
1345 utf8::decode $login; 1483 utf8::decode $login;
1346 push @logins, $login; 1484 push @logins, $login;
1347 } 1485 }
1348 1486
1386sub expand_cfpod { 1524sub expand_cfpod {
1387 ((my $self), (local $_)) = @_; 1525 ((my $self), (local $_)) = @_;
1388 1526
1389 # escape & and < 1527 # escape & and <
1390 s/&/&amp;/g; 1528 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g; 1529 s/(?<![BIUGHT])</&lt;/g;
1392 1530
1393 # this is buggy, it needs to properly take care of nested <'s 1531 # this is buggy, it needs to properly take care of nested <'s
1394 1532
1395 1 while 1533 1 while
1396 # replace B<>, I<>, U<> etc. 1534 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/ 1535 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/ 1536 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/ 1537 || s/U<([^\>]*)>/<u>$1<\/u>/
1538 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1400 # replace G<male|female> tags 1539 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1540 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1 1541 $self->gender ? $2 : $1
1403 }ge 1542 }ge
1404 # replace H<hint text> 1543 # replace H<hint text>
1412 1551
1413 # create single paragraphs (very hackish) 1552 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1553 s/(?<=\S)\n(?=\w)/ /g;
1415 1554
1416 # compress some whitespace 1555 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 1556 s/\s+\n/\n/g; # ws line-ends
1557 s/\n\n+/\n/g; # double lines
1558 s/^\n+//; # beginning lines
1559 s/\n+$//; # ending lines
1418 1560
1419 $_ 1561 $_
1420} 1562}
1421 1563
1422sub hintmode { 1564sub hintmode {
1423 $_[0]{hintmode} = $_[1] if @_ > 1; 1565 $_[0]{hintmode} = $_[1] if @_ > 1;
1424 $_[0]{hintmode} 1566 $_[0]{hintmode}
1425} 1567}
1426 1568
1427=item $player->ext_reply ($msgid, %msg) 1569=item $player->ext_reply ($msgid, @msg)
1428 1570
1429Sends an ext reply to the player. 1571Sends an ext reply to the player.
1430 1572
1431=cut 1573=cut
1432 1574
1433sub ext_reply($$%) { 1575sub ext_reply($$@) {
1434 my ($self, $id, %msg) = @_; 1576 my ($self, $id, @msg) = @_;
1435 1577
1436 $msg{msgid} = $id; 1578 $self->ns->ext_reply ($id, @msg)
1437 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1438} 1579}
1439 1580
1440=item $player->ext_event ($type, %msg) 1581=item $player->ext_msg ($type, @msg)
1441 1582
1442Sends an ext event to the client. 1583Sends an ext event to the client.
1443 1584
1444=cut 1585=cut
1445 1586
1446sub ext_event($$%) { 1587sub ext_msg($$@) {
1447 my ($self, $type, %msg) = @_; 1588 my ($self, $type, @msg) = @_;
1448 1589
1449 $self->ns->ext_event ($type, %msg); 1590 $self->ns->ext_msg ($type, @msg);
1450} 1591}
1451 1592
1452=head3 cf::region 1593=head3 cf::region
1453 1594
1454=over 4 1595=over 4
1467 my ($path) = @_; 1608 my ($path) = @_;
1468 1609
1469 my ($match, $specificity); 1610 my ($match, $specificity);
1470 1611
1471 for my $region (list) { 1612 for my $region (list) {
1472 if ($region->match && $path =~ $region->match) { 1613 if ($region->{match} && $path =~ $region->{match}) {
1473 ($match, $specificity) = ($region, $region->specificity) 1614 ($match, $specificity) = ($region, $region->specificity)
1474 if $region->specificity > $specificity; 1615 if $region->specificity > $specificity;
1475 } 1616 }
1476 } 1617 }
1477 1618
1597 $self->init; # pass $1 etc. 1738 $self->init; # pass $1 etc.
1598 return $self; 1739 return $self;
1599 } 1740 }
1600 } 1741 }
1601 1742
1602 Carp::carp "unable to resolve path '$path' (base '$base')."; 1743 Carp::cluck "unable to resolve path '$path' (base '$base').";
1603 () 1744 ()
1604} 1745}
1605 1746
1606sub init { 1747sub init {
1607 my ($self) = @_; 1748 my ($self) = @_;
1670 1811
1671sub load_header_from($) { 1812sub load_header_from($) {
1672 my ($self, $path) = @_; 1813 my ($self, $path) = @_;
1673 1814
1674 utf8::encode $path; 1815 utf8::encode $path;
1675 #aio_open $path, O_RDONLY, 0 1816 my $f = new_from_file cf::object::thawer $path
1676 # or return;
1677
1678 $self->_load_header ($path)
1679 or return; 1817 or return;
1818
1819 $self->_load_header ($f)
1820 or return;
1821
1822 local $MAP_LOADING{$self->{path}} = $self;
1823 $f->resolve_delayed_derefs;
1680 1824
1681 $self->{load_path} = $path; 1825 $self->{load_path} = $path;
1682 1826
1683 1 1827 1
1684} 1828}
1738sub find { 1882sub find {
1739 my ($path, $origin) = @_; 1883 my ($path, $origin) = @_;
1740 1884
1741 $path = normalise $path, $origin && $origin->path; 1885 $path = normalise $path, $origin && $origin->path;
1742 1886
1887 cf::lock_wait "map_data:$path";#d#remove
1743 cf::lock_wait "map_find:$path"; 1888 cf::lock_wait "map_find:$path";
1744 1889
1745 $cf::MAP{$path} || do { 1890 $cf::MAP{$path} || do {
1746 my $guard = cf::lock_acquire "map_find:$path"; 1891 my $guard1 = cf::lock_acquire "map_find:$path";
1892 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1893
1747 my $map = new_from_path cf::map $path 1894 my $map = new_from_path cf::map $path
1748 or return; 1895 or return;
1749 1896
1750 $map->{last_save} = $cf::RUNTIME; 1897 $map->{last_save} = $cf::RUNTIME;
1751 1898
1753 or return; 1900 or return;
1754 1901
1755 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1902 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1756 # doing this can freeze the server in a sync job, obviously 1903 # doing this can freeze the server in a sync job, obviously
1757 #$cf::WAIT_FOR_TICK->wait; 1904 #$cf::WAIT_FOR_TICK->wait;
1905 undef $guard1;
1906 undef $guard2;
1758 $map->reset; 1907 $map->reset;
1759 undef $guard;
1760 return find $path; 1908 return find $path;
1761 } 1909 }
1762 1910
1763 $cf::MAP{$path} = $map 1911 $cf::MAP{$path} = $map
1764 } 1912 }
1773 local $self->{deny_reset} = 1; # loading can take a long time 1921 local $self->{deny_reset} = 1; # loading can take a long time
1774 1922
1775 my $path = $self->{path}; 1923 my $path = $self->{path};
1776 1924
1777 { 1925 {
1778 my $guard = cf::lock_acquire "map_load:$path"; 1926 my $guard = cf::lock_acquire "map_data:$path";
1779 1927
1928 return unless $self->valid;
1780 return if $self->in_memory != cf::MAP_SWAPPED; 1929 return unless $self->in_memory == cf::MAP_SWAPPED;
1781 1930
1782 $self->in_memory (cf::MAP_LOADING); 1931 $self->in_memory (cf::MAP_LOADING);
1783 1932
1784 $self->alloc; 1933 $self->alloc;
1785 1934
1786 $self->pre_load; 1935 $self->pre_load;
1787 Coro::cede; 1936 cf::cede_to_tick;
1788 1937
1938 my $f = new_from_file cf::object::thawer $self->{load_path};
1939 $f->skip_block;
1789 $self->_load_objects ($self->{load_path}, 1) 1940 $self->_load_objects ($f)
1790 or return; 1941 or return;
1791 1942
1792 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1943 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1793 if delete $self->{load_original}; 1944 if delete $self->{load_original};
1794 1945
1795 if (my $uniq = $self->uniq_path) { 1946 if (my $uniq = $self->uniq_path) {
1796 utf8::encode $uniq; 1947 utf8::encode $uniq;
1797 if (aio_open $uniq, O_RDONLY, 0) { 1948 unless (aio_stat $uniq) {
1949 if (my $f = new_from_file cf::object::thawer $uniq) {
1798 $self->clear_unique_items; 1950 $self->clear_unique_items;
1799 $self->_load_objects ($uniq, 0); 1951 $self->_load_objects ($f);
1952 $f->resolve_delayed_derefs;
1953 }
1800 } 1954 }
1801 } 1955 }
1802 1956
1803 Coro::cede; 1957 $f->resolve_delayed_derefs;
1958
1959 cf::cede_to_tick;
1804 # now do the right thing for maps 1960 # now do the right thing for maps
1805 $self->link_multipart_objects; 1961 $self->link_multipart_objects;
1806 $self->difficulty ($self->estimate_difficulty) 1962 $self->difficulty ($self->estimate_difficulty)
1807 unless $self->difficulty; 1963 unless $self->difficulty;
1808 Coro::cede; 1964 cf::cede_to_tick;
1809 1965
1810 unless ($self->{deny_activate}) { 1966 unless ($self->{deny_activate}) {
1811 $self->decay_objects; 1967 $self->decay_objects;
1812 $self->fix_auto_apply; 1968 $self->fix_auto_apply;
1813 $self->update_buttons; 1969 $self->update_buttons;
1814 Coro::cede; 1970 cf::cede_to_tick;
1815 $self->set_darkness_map; 1971 $self->set_darkness_map;
1816 Coro::cede; 1972 cf::cede_to_tick;
1817 $self->activate; 1973 $self->activate;
1818 } 1974 }
1975
1976 $self->{last_save} = $cf::RUNTIME;
1977 $self->last_access ($cf::RUNTIME);
1819 1978
1820 $self->in_memory (cf::MAP_IN_MEMORY); 1979 $self->in_memory (cf::MAP_IN_MEMORY);
1821 } 1980 }
1822 1981
1823 $self->post_load; 1982 $self->post_load;
1834 1993
1835 $self 1994 $self
1836} 1995}
1837 1996
1838# find and load all maps in the 3x3 area around a map 1997# find and load all maps in the 3x3 area around a map
1839sub load_diag { 1998sub load_neighbours {
1840 my ($map) = @_; 1999 my ($map) = @_;
1841 2000
1842 my @diag; # diagonal neighbours 2001 my @neigh; # diagonal neighbours
1843 2002
1844 for (0 .. 3) { 2003 for (0 .. 3) {
1845 my $neigh = $map->tile_path ($_) 2004 my $neigh = $map->tile_path ($_)
1846 or next; 2005 or next;
1847 $neigh = find $neigh, $map 2006 $neigh = find $neigh, $map
1848 or next; 2007 or next;
1849 $neigh->load; 2008 $neigh->load;
1850 2009
2010 push @neigh,
1851 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2011 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1852 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2012 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1853 } 2013 }
1854 2014
1855 for (@diag) { 2015 for (grep defined $_->[0], @neigh) {
2016 my ($path, $origin) = @$_;
1856 my $neigh = find @$_ 2017 my $neigh = find $path, $origin
1857 or next; 2018 or next;
1858 $neigh->load; 2019 $neigh->load;
1859 } 2020 }
1860} 2021}
1861 2022
1866} 2027}
1867 2028
1868sub do_load_sync { 2029sub do_load_sync {
1869 my ($map) = @_; 2030 my ($map) = @_;
1870 2031
2032 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2033 if $Coro::current == $Coro::main;
2034
1871 cf::sync_job { $map->load }; 2035 cf::sync_job { $map->load };
1872} 2036}
1873 2037
1874our %MAP_PREFETCH; 2038our %MAP_PREFETCH;
1875our $MAP_PREFETCHER = undef; 2039our $MAP_PREFETCHER = undef;
1876 2040
1877sub find_async { 2041sub find_async {
1878 my ($path, $origin) = @_; 2042 my ($path, $origin, $load) = @_;
1879 2043
1880 $path = normalise $path, $origin && $origin->{path}; 2044 $path = normalise $path, $origin && $origin->{path};
1881 2045
1882 if (my $map = $cf::MAP{$path}) { 2046 if (my $map = $cf::MAP{$path}) {
1883 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2047 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1884 } 2048 }
1885 2049
1886 undef $MAP_PREFETCH{$path}; 2050 $MAP_PREFETCH{$path} |= $load;
2051
1887 $MAP_PREFETCHER ||= cf::async { 2052 $MAP_PREFETCHER ||= cf::async {
2053 $Coro::current->{desc} = "map prefetcher";
2054
1888 while (%MAP_PREFETCH) { 2055 while (%MAP_PREFETCH) {
1889 for my $path (keys %MAP_PREFETCH) { 2056 while (my ($k, $v) = each %MAP_PREFETCH) {
1890 my $map = find $path 2057 if (my $map = find $k) {
1891 or next;
1892 $map->load; 2058 $map->load if $v;
2059 }
1893 2060
1894 delete $MAP_PREFETCH{$path}; 2061 delete $MAP_PREFETCH{$k};
1895 } 2062 }
1896 } 2063 }
1897 undef $MAP_PREFETCHER; 2064 undef $MAP_PREFETCHER;
1898 }; 2065 };
1899 $MAP_PREFETCHER->prio (6); 2066 $MAP_PREFETCHER->prio (6);
1902} 2069}
1903 2070
1904sub save { 2071sub save {
1905 my ($self) = @_; 2072 my ($self) = @_;
1906 2073
1907 my $lock = cf::lock_acquire "map_data:" . $self->path; 2074 my $lock = cf::lock_acquire "map_data:$self->{path}";
1908 2075
1909 $self->{last_save} = $cf::RUNTIME; 2076 $self->{last_save} = $cf::RUNTIME;
1910 2077
1911 return unless $self->dirty; 2078 return unless $self->dirty;
1912 2079
1918 return if $self->{deny_save}; 2085 return if $self->{deny_save};
1919 2086
1920 local $self->{last_access} = $self->last_access;#d# 2087 local $self->{last_access} = $self->last_access;#d#
1921 2088
1922 cf::async { 2089 cf::async {
2090 $Coro::current->{desc} = "map player save";
1923 $_->contr->save for $self->players; 2091 $_->contr->save for $self->players;
1924 }; 2092 };
1925 2093
1926 if ($uniq) { 2094 if ($uniq) {
1927 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2095 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1935 my ($self) = @_; 2103 my ($self) = @_;
1936 2104
1937 # save first because save cedes 2105 # save first because save cedes
1938 $self->save; 2106 $self->save;
1939 2107
1940 my $lock = cf::lock_acquire "map_data:" . $self->path; 2108 my $lock = cf::lock_acquire "map_data:$self->{path}";
1941 2109
1942 return if $self->players; 2110 return if $self->players;
1943 return if $self->in_memory != cf::MAP_IN_MEMORY; 2111 return if $self->in_memory != cf::MAP_IN_MEMORY;
1944 return if $self->{deny_save}; 2112 return if $self->{deny_save};
1945 2113
2114 $self->in_memory (cf::MAP_SWAPPED);
2115
2116 $self->deactivate;
2117 $_->clear_links_to ($self) for values %cf::MAP;
1946 $self->clear; 2118 $self->clear;
1947 $self->in_memory (cf::MAP_SWAPPED);
1948} 2119}
1949 2120
1950sub reset_at { 2121sub reset_at {
1951 my ($self) = @_; 2122 my ($self) = @_;
1952 2123
1984 if $uniq; 2155 if $uniq;
1985 } 2156 }
1986 2157
1987 delete $cf::MAP{$self->path}; 2158 delete $cf::MAP{$self->path};
1988 2159
2160 $self->deactivate;
2161 $_->clear_links_to ($self) for values %cf::MAP;
1989 $self->clear; 2162 $self->clear;
1990
1991 $_->clear_links_to ($self) for values %cf::MAP;
1992 2163
1993 $self->unlink_save; 2164 $self->unlink_save;
1994 $self->destroy; 2165 $self->destroy;
1995} 2166}
1996 2167
1997my $nuke_counter = "aaaa"; 2168my $nuke_counter = "aaaa";
1998 2169
1999sub nuke { 2170sub nuke {
2000 my ($self) = @_; 2171 my ($self) = @_;
2001 2172
2173 {
2174 my $lock = cf::lock_acquire "map_data:$self->{path}";
2175
2002 delete $cf::MAP{$self->path}; 2176 delete $cf::MAP{$self->path};
2003 2177
2004 $self->unlink_save; 2178 $self->unlink_save;
2005 2179
2006 bless $self, "cf::map"; 2180 bless $self, "cf::map";
2007 delete $self->{deny_reset}; 2181 delete $self->{deny_reset};
2008 $self->{deny_save} = 1; 2182 $self->{deny_save} = 1;
2009 $self->reset_timeout (1); 2183 $self->reset_timeout (1);
2010 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2184 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2011 2185
2012 $cf::MAP{$self->path} = $self; 2186 $cf::MAP{$self->path} = $self;
2187 }
2013 2188
2014 $self->reset; # polite request, might not happen 2189 $self->reset; # polite request, might not happen
2015} 2190}
2016 2191
2017=item $maps = cf::map::tmp_maps 2192=item $maps = cf::map::tmp_maps
2093 2268
2094sub inv_recursive { 2269sub inv_recursive {
2095 inv_recursive_ inv $_[0] 2270 inv_recursive_ inv $_[0]
2096} 2271}
2097 2272
2273=item $ref = $ob->ref
2274
2275creates and returns a persistent reference to an objetc that can be stored as a string.
2276
2277=item $ob = cf::object::deref ($refstring)
2278
2279returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2280even if the object actually exists. May block.
2281
2282=cut
2283
2284sub deref {
2285 my ($ref) = @_;
2286
2287 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2288 my ($uuid, $name) = ($1, $2);
2289 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2290 or return;
2291 $pl->ob->uuid eq $uuid
2292 or return;
2293
2294 $pl->ob
2295 } else {
2296 warn "$ref: cannot resolve object reference\n";
2297 undef
2298 }
2299}
2300
2098package cf; 2301package cf;
2099 2302
2100=back 2303=back
2101 2304
2102=head3 cf::object::player 2305=head3 cf::object::player
2124 2327
2125 } else { 2328 } else {
2126 my $pl = $self->contr; 2329 my $pl = $self->contr;
2127 2330
2128 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2331 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2129 my $diag = $pl->{npc_dialog}; 2332 my $dialog = $pl->{npc_dialog};
2130 $diag->{pl}->ext_reply ( 2333 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2131 $diag->{id},
2132 msgtype => "reply",
2133 msg => $diag->{pl}->expand_cfpod ($msg),
2134 add_topics => []
2135 );
2136 2334
2137 } else { 2335 } else {
2138 $msg = $npc->name . " says: $msg" if $npc; 2336 $msg = $npc->name . " says: $msg" if $npc;
2139 $self->message ($msg, $flags); 2337 $self->message ($msg, $flags);
2140 } 2338 }
2141 } 2339 }
2340}
2341
2342=item $object->send_msg ($channel, $msg, $color, [extra...])
2343
2344=cut
2345
2346sub cf::object::send_msg {
2347 my $pl = shift->contr
2348 or return;
2349 $pl->send_msg (@_);
2142} 2350}
2143 2351
2144=item $player_object->may ("access") 2352=item $player_object->may ("access")
2145 2353
2146Returns wether the given player is authorized to access resource "access" 2354Returns wether the given player is authorized to access resource "access"
2225 # use -1 or undef as default coordinates, not 0, 0 2433 # use -1 or undef as default coordinates, not 0, 0
2226 ($x, $y) = ($map->enter_x, $map->enter_y) 2434 ($x, $y) = ($map->enter_x, $map->enter_y)
2227 if $x <=0 && $y <= 0; 2435 if $x <=0 && $y <= 0;
2228 2436
2229 $map->load; 2437 $map->load;
2230 $map->load_diag; 2438 $map->load_neighbours;
2231 2439
2232 return unless $self->contr->active; 2440 return unless $self->contr->active;
2233 $self->activate_recursive; 2441 $self->activate_recursive;
2234 2442
2235 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2443 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2236 $self->enter_map ($map, $x, $y); 2444 $self->enter_map ($map, $x, $y);
2237} 2445}
2238 2446
2239=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2447=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2240 2448
2241Moves the player to the given map-path and coordinates by first freezing 2449Moves the player to the given map-path and coordinates by first freezing
2242her, loading and preparing them map, calling the provided $check callback 2450her, loading and preparing them map, calling the provided $check callback
2243that has to return the map if sucecssful, and then unfreezes the player on 2451that has to return the map if sucecssful, and then unfreezes the player on
2244the new (success) or old (failed) map position. 2452the new (success) or old (failed) map position. In either case, $done will
2453be called at the end of this process.
2245 2454
2246=cut 2455=cut
2247 2456
2248our $GOTOGEN; 2457our $GOTOGEN;
2249 2458
2250sub cf::object::player::goto { 2459sub cf::object::player::goto {
2251 my ($self, $path, $x, $y, $check) = @_; 2460 my ($self, $path, $x, $y, $check, $done) = @_;
2252 2461
2253 # do generation counting so two concurrent goto's will be executed in-order 2462 # do generation counting so two concurrent goto's will be executed in-order
2254 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2463 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2255 2464
2256 $self->enter_link; 2465 $self->enter_link;
2257 2466
2258 (async { 2467 (async {
2468 $Coro::current->{desc} = "player::goto $path $x $y";
2469
2470 # *tag paths override both path and x|y
2471 if ($path =~ /^\*(.*)$/) {
2472 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2473 my $ob = $obs[rand @obs];
2474
2475 # see if we actually can go there
2476 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2477 $ob = $obs[rand @obs];
2478 } else {
2479 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2480 }
2481 # else put us there anyways for now #d#
2482
2483 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2484 } else {
2485 ($path, $x, $y) = (undef, undef, undef);
2486 }
2487 }
2488
2259 my $map = eval { 2489 my $map = eval {
2260 my $map = cf::map::find $path; 2490 my $map = defined $path ? cf::map::find $path : undef;
2261 2491
2262 if ($map) { 2492 if ($map) {
2263 $map = $map->customise_for ($self); 2493 $map = $map->customise_for ($self);
2264 $map = $check->($map) if $check && $map; 2494 $map = $check->($map) if $check && $map;
2265 } else { 2495 } else {
2266 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2496 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2267 } 2497 }
2268 2498
2269 $map 2499 $map
2270 }; 2500 };
2271 2501
2276 2506
2277 if ($gen == $self->{_goto_generation}) { 2507 if ($gen == $self->{_goto_generation}) {
2278 delete $self->{_goto_generation}; 2508 delete $self->{_goto_generation};
2279 $self->leave_link ($map, $x, $y); 2509 $self->leave_link ($map, $x, $y);
2280 } 2510 }
2511
2512 $done->() if $done;
2281 })->prio (1); 2513 })->prio (1);
2282} 2514}
2283 2515
2284=item $player_object->enter_exit ($exit_object) 2516=item $player_object->enter_exit ($exit_object)
2285 2517
2354 my $hp = $exit->stats->hp; 2586 my $hp = $exit->stats->hp;
2355 my $sp = $exit->stats->sp; 2587 my $sp = $exit->stats->sp;
2356 2588
2357 $self->enter_link; 2589 $self->enter_link;
2358 2590
2591 # if exit is damned, update players death & WoR home-position
2592 $self->contr->savebed ($slaying, $hp, $sp)
2593 if $exit->flag (FLAG_DAMNED);
2594
2359 (async { 2595 (async {
2596 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2597
2360 $self->deactivate_recursive; # just to be sure 2598 $self->deactivate_recursive; # just to be sure
2361 unless (eval { 2599 unless (eval {
2362 $self->goto ($slaying, $hp, $sp); 2600 $self->goto ($slaying, $hp, $sp);
2363 2601
2364 1; 2602 1;
2390 2628
2391 utf8::encode $text; 2629 utf8::encode $text;
2392 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2630 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2393} 2631}
2394 2632
2395=item $client->send_msg ($color, $type, $msg, [extra...]) 2633=item $client->send_msg ($channel, $msg, $color, [extra...])
2396 2634
2397Send a drawinfo or msg packet to the client, formatting the msg for the 2635Send a drawinfo or msg packet to the client, formatting the msg for the
2398client if neccessary. C<$type> should be a string identifying the type of 2636client if neccessary. C<$type> should be a string identifying the type of
2399the message, with C<log> being the default. If C<$color> is negative, suppress 2637the message, with C<log> being the default. If C<$color> is negative, suppress
2400the message unless the client supports the msg packet. 2638the message unless the client supports the msg packet.
2401 2639
2402=cut 2640=cut
2403 2641
2642our %CHANNEL = (
2643 "c/identify" => {
2644 id => "infobox",
2645 title => "Identify",
2646 reply => undef,
2647 tooltip => "Items recently identified",
2648 },
2649 "c/examine" => {
2650 id => "infobox",
2651 title => "Examine",
2652 reply => undef,
2653 tooltip => "Signs and other items you examined",
2654 },
2655 "c/lookat" => {
2656 id => "infobox",
2657 title => "Look",
2658 reply => undef,
2659 tooltip => "What you saw there",
2660 },
2661);
2662
2404sub cf::client::send_msg { 2663sub cf::client::send_msg {
2405 my ($self, $color, $type, $msg, @extra) = @_; 2664 my ($self, $channel, $msg, $color, @extra) = @_;
2406 2665
2407 $msg = $self->pl->expand_cfpod ($msg); 2666 $msg = $self->pl->expand_cfpod ($msg);
2408 2667
2668 $color &= cf::NDI_CLIENT_MASK; # just in case...
2669
2670 # check predefined channels, for the benefit of C
2671 if ($CHANNEL{$channel}) {
2672 $channel = $CHANNEL{$channel};
2673
2674 $self->ext_msg (channel_info => $channel)
2675 if $self->can_msg;
2676
2677 $channel = $channel->{id};
2678
2679 } elsif (ref $channel) {
2680 # send meta info to client, if not yet sent
2681 unless (exists $self->{channel}{$channel->{id}}) {
2682 $self->{channel}{$channel->{id}} = $channel;
2683 $self->ext_msg (channel_info => $channel)
2684 if $self->can_msg;
2685 }
2686
2687 $channel = $channel->{id};
2688 }
2689
2690 return unless @extra || length $msg;
2691
2409 if ($self->can_msg) { 2692 if ($self->can_msg) {
2693 # default colour, mask it out
2694 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2695 if $color & cf::NDI_DEF;
2696
2410 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2697 $self->send_packet ("msg " . $self->{json_coder}->encode (
2698 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2411 } else { 2699 } else {
2412 # replace some tags by gcfclient-compatible ones
2413 for ($msg) {
2414 1 while
2415 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2416 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2417 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2418 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2419 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2420 }
2421
2422 if ($color >= 0) { 2700 if ($color >= 0) {
2701 # replace some tags by gcfclient-compatible ones
2702 for ($msg) {
2703 1 while
2704 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2705 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2706 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2707 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2708 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2709 }
2710
2711 $color &= cf::NDI_COLOR_MASK;
2712
2713 utf8::encode $msg;
2714
2423 if (0 && $msg =~ /\[/) { 2715 if (0 && $msg =~ /\[/) {
2716 # COMMAND/INFO
2424 $self->send_packet ("drawextinfo $color 4 0 $msg") 2717 $self->send_packet ("drawextinfo $color 10 8 $msg")
2425 } else { 2718 } else {
2426 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2719 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2427 $self->send_packet ("drawinfo $color $msg") 2720 $self->send_packet ("drawinfo $color $msg")
2428 } 2721 }
2429 } 2722 }
2430 } 2723 }
2431} 2724}
2432 2725
2433=item $client->ext_event ($type, %msg) 2726=item $client->ext_msg ($type, @msg)
2434 2727
2435Sends an ext event to the client. 2728Sends an ext event to the client.
2436 2729
2437=cut 2730=cut
2438 2731
2439sub cf::client::ext_event($$%) { 2732sub cf::client::ext_msg($$@) {
2440 my ($self, $type, %msg) = @_; 2733 my ($self, $type, @msg) = @_;
2441 2734
2735 if ($self->extcmd == 2) {
2736 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2737 } elsif ($self->extcmd == 1) { # TODO: remove
2442 $msg{msgtype} = "event_$type"; 2738 push @msg, msgtype => "event_$type";
2443 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2739 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2740 }
2741}
2742
2743=item $client->ext_reply ($msgid, @msg)
2744
2745Sends an ext reply to the client.
2746
2747=cut
2748
2749sub cf::client::ext_reply($$@) {
2750 my ($self, $id, @msg) = @_;
2751
2752 if ($self->extcmd == 2) {
2753 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2754 } elsif ($self->extcmd == 1) {
2755 #TODO: version 1, remove
2756 unshift @msg, msgtype => "reply", msgid => $id;
2757 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2758 }
2444} 2759}
2445 2760
2446=item $success = $client->query ($flags, "text", \&cb) 2761=item $success = $client->query ($flags, "text", \&cb)
2447 2762
2448Queues a query to the client, calling the given callback with 2763Queues a query to the client, calling the given callback with
2503 my ($ns, $buf) = @_; 2818 my ($ns, $buf) = @_;
2504 2819
2505 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2820 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2506 2821
2507 if (ref $msg) { 2822 if (ref $msg) {
2823 my ($type, $reply, @payload) =
2824 "ARRAY" eq ref $msg
2825 ? @$msg
2826 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2827
2828 my @reply;
2829
2508 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2830 if (my $cb = $EXTICMD{$type}) {
2509 if (my %reply = $cb->($ns, $msg)) { 2831 @reply = $cb->($ns, @payload);
2510 $reply{msgid} = $msg->{msgid};
2511 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2512 }
2513 } 2832 }
2833
2834 $ns->ext_reply ($reply, @reply)
2835 if $reply;
2836
2514 } else { 2837 } else {
2515 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2838 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2516 } 2839 }
2517 2840
2518 cf::override; 2841 cf::override;
2565our $safe = new Safe "safe"; 2888our $safe = new Safe "safe";
2566our $safe_hole = new Safe::Hole; 2889our $safe_hole = new Safe::Hole;
2567 2890
2568$SIG{FPE} = 'IGNORE'; 2891$SIG{FPE} = 'IGNORE';
2569 2892
2570$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2893$safe->permit_only (Opcode::opset qw(
2894 :base_core :base_mem :base_orig :base_math
2895 grepstart grepwhile mapstart mapwhile
2896 sort time
2897));
2571 2898
2572# here we export the classes and methods available to script code 2899# here we export the classes and methods available to script code
2573 2900
2574=pod 2901=pod
2575 2902
2576The following functions and methods are available within a safe environment: 2903The following functions and methods are available within a safe environment:
2577 2904
2578 cf::object contr pay_amount pay_player map 2905 cf::object
2906 contr pay_amount pay_player map x y force_find force_add destroy
2907 insert remove name archname title slaying race decrease_ob_nr
2908
2579 cf::object::player player 2909 cf::object::player
2580 cf::player peaceful 2910 player
2581 cf::map trigger 2911
2912 cf::player
2913 peaceful
2914
2915 cf::map
2916 trigger
2582 2917
2583=cut 2918=cut
2584 2919
2585for ( 2920for (
2586 ["cf::object" => qw(contr pay_amount pay_player map)], 2921 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2922 insert remove inv name archname title slaying race
2923 decrease_ob_nr destroy)],
2587 ["cf::object::player" => qw(player)], 2924 ["cf::object::player" => qw(player)],
2588 ["cf::player" => qw(peaceful)], 2925 ["cf::player" => qw(peaceful)],
2589 ["cf::map" => qw(trigger)], 2926 ["cf::map" => qw(trigger)],
2590) { 2927) {
2591 no strict 'refs'; 2928 no strict 'refs';
2667# the server's init and main functions 3004# the server's init and main functions
2668 3005
2669sub load_facedata($) { 3006sub load_facedata($) {
2670 my ($path) = @_; 3007 my ($path) = @_;
2671 3008
3009 # HACK to clear player env face cache, we need some signal framework
3010 # for this (global event?)
3011 %ext::player_env::MUSIC_FACE_CACHE = ();
3012
3013 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3014
2672 warn "loading facedata from $path\n"; 3015 warn "loading facedata from $path\n";
2673 3016
2674 my $facedata; 3017 my $facedata;
2675 0 < aio_load $path, $facedata 3018 0 < aio_load $path, $facedata
2676 or die "$path: $!"; 3019 or die "$path: $!";
2678 $facedata = Coro::Storable::thaw $facedata; 3021 $facedata = Coro::Storable::thaw $facedata;
2679 3022
2680 $facedata->{version} == 2 3023 $facedata->{version} == 2
2681 or cf::cleanup "$path: version mismatch, cannot proceed."; 3024 or cf::cleanup "$path: version mismatch, cannot proceed.";
2682 3025
3026 # patch in the exptable
3027 $facedata->{resource}{"res/exp_table"} = {
3028 type => FT_RSRC,
3029 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3030 };
3031 cf::cede_to_tick;
3032
2683 { 3033 {
2684 my $faces = $facedata->{faceinfo}; 3034 my $faces = $facedata->{faceinfo};
2685 3035
2686 while (my ($face, $info) = each %$faces) { 3036 while (my ($face, $info) = each %$faces) {
2687 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3037 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2688 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3038 cf::face::set_visibility $idx, $info->{visibility};
3039 cf::face::set_magicmap $idx, $info->{magicmap};
2689 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3040 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2690 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3041 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2691 Coro::cede; 3042
3043 cf::cede_to_tick;
2692 } 3044 }
2693 3045
2694 while (my ($face, $info) = each %$faces) { 3046 while (my ($face, $info) = each %$faces) {
2695 next unless $info->{smooth}; 3047 next unless $info->{smooth};
2696 my $idx = cf::face::find $face 3048 my $idx = cf::face::find $face
2697 or next; 3049 or next;
2698 if (my $smooth = cf::face::find $info->{smooth}) { 3050 if (my $smooth = cf::face::find $info->{smooth}) {
3051 cf::face::set_smooth $idx, $smooth;
2699 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3052 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2700 } else { 3053 } else {
2701 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3054 warn "smooth face '$info->{smooth}' not found for face '$face'";
2702 } 3055 }
2703 Coro::cede; 3056
3057 cf::cede_to_tick;
2704 } 3058 }
2705 } 3059 }
2706 3060
2707 { 3061 {
2708 my $anims = $facedata->{animinfo}; 3062 my $anims = $facedata->{animinfo};
2709 3063
2710 while (my ($anim, $info) = each %$anims) { 3064 while (my ($anim, $info) = each %$anims) {
2711 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3065 cf::anim::set $anim, $info->{frames}, $info->{facings};
2712 Coro::cede; 3066 cf::cede_to_tick;
2713 } 3067 }
2714 3068
2715 cf::anim::invalidate_all; # d'oh 3069 cf::anim::invalidate_all; # d'oh
2716 } 3070 }
2717 3071
3072 {
3073 # TODO: for gcfclient pleasure, we should give resources
3074 # that gcfclient doesn't grok a >10000 face index.
3075 my $res = $facedata->{resource};
3076
3077 my $soundconf = delete $res->{"res/sound.conf"};
3078
3079 while (my ($name, $info) = each %$res) {
3080 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3081 my $data;
3082
3083 if ($info->{type} & 1) {
3084 # prepend meta info
3085
3086 my $meta = $enc->encode ({
3087 name => $name,
3088 %{ $info->{meta} || {} },
3089 });
3090
3091 $data = pack "(w/a*)*", $meta, $info->{data};
3092 } else {
3093 $data = $info->{data};
3094 }
3095
3096 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3097 cf::face::set_type $idx, $info->{type};
3098
3099 cf::cede_to_tick;
3100 }
3101
3102 if ($soundconf) {
3103 $soundconf = $enc->decode (delete $soundconf->{data});
3104
3105 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3106 my $sound = $soundconf->{compat}[$_]
3107 or next;
3108
3109 my $face = cf::face::find "sound/$sound->[1]";
3110 cf::sound::set $sound->[0] => $face;
3111 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3112 }
3113
3114 while (my ($k, $v) = each %{$soundconf->{event}}) {
3115 my $face = cf::face::find "sound/$v";
3116 cf::sound::set $k => $face;
3117 }
3118 }
3119 }
3120
2718 1 3121 1
2719} 3122}
2720 3123
3124register_exticmd fx_want => sub {
3125 my ($ns, $want) = @_;
3126
3127 while (my ($k, $v) = each %$want) {
3128 $ns->fx_want ($k, $v);
3129 }
3130};
3131
2721sub reload_regions { 3132sub reload_regions {
3133 # HACK to clear player env face cache, we need some signal framework
3134 # for this (global event?)
3135 %ext::player_env::MUSIC_FACE_CACHE = ();
3136
2722 load_resource_file "$MAPDIR/regions" 3137 load_resource_file "$MAPDIR/regions"
2723 or die "unable to load regions file\n"; 3138 or die "unable to load regions file\n";
3139
3140 for (cf::region::list) {
3141 $_->{match} = qr/$_->{match}/
3142 if exists $_->{match};
3143 }
2724} 3144}
2725 3145
2726sub reload_facedata { 3146sub reload_facedata {
2727 load_facedata "$DATADIR/facedata" 3147 load_facedata "$DATADIR/facedata"
2728 or die "unable to load facedata\n"; 3148 or die "unable to load facedata\n";
2757 3177
2758sub init { 3178sub init {
2759 reload_resources; 3179 reload_resources;
2760} 3180}
2761 3181
2762sub cfg_load { 3182sub reload_config {
2763 open my $fh, "<:utf8", "$CONFDIR/config" 3183 open my $fh, "<:utf8", "$CONFDIR/config"
2764 or return; 3184 or return;
2765 3185
2766 local $/; 3186 local $/;
2767 *CFG = YAML::Syck::Load <$fh>; 3187 *CFG = YAML::Syck::Load <$fh>;
2783sub main { 3203sub main {
2784 # we must not ever block the main coroutine 3204 # we must not ever block the main coroutine
2785 local $Coro::idle = sub { 3205 local $Coro::idle = sub {
2786 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3206 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2787 (async { 3207 (async {
3208 $Coro::current->{desc} = "IDLE BUG HANDLER";
2788 Event::one_event; 3209 Event::one_event;
2789 })->prio (Coro::PRIO_MAX); 3210 })->prio (Coro::PRIO_MAX);
2790 }; 3211 };
2791 3212
2792 cfg_load; 3213 reload_config;
2793 db_init; 3214 db_init;
2794 load_extensions; 3215 load_extensions;
2795 3216
2796 $TICK_WATCHER->start; 3217 $TICK_WATCHER->start;
2797 Event::loop; 3218 Event::loop;
2864 # and maps saved/destroyed asynchronously. 3285 # and maps saved/destroyed asynchronously.
2865 warn "begin emergency player save\n"; 3286 warn "begin emergency player save\n";
2866 for my $login (keys %cf::PLAYER) { 3287 for my $login (keys %cf::PLAYER) {
2867 my $pl = $cf::PLAYER{$login} or next; 3288 my $pl = $cf::PLAYER{$login} or next;
2868 $pl->valid or next; 3289 $pl->valid or next;
3290 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2869 $pl->save; 3291 $pl->save;
2870 } 3292 }
2871 warn "end emergency player save\n"; 3293 warn "end emergency player save\n";
2872 3294
2873 warn "begin emergency map save\n"; 3295 warn "begin emergency map save\n";
2990 warn "reloading cf.pm"; 3412 warn "reloading cf.pm";
2991 require cf; 3413 require cf;
2992 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3414 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2993 3415
2994 warn "loading config and database again"; 3416 warn "loading config and database again";
2995 cf::cfg_load; 3417 cf::reload_config;
2996 3418
2997 warn "loading extensions"; 3419 warn "loading extensions";
2998 cf::load_extensions; 3420 cf::load_extensions;
2999 3421
3000 warn "reattaching attachments to objects/players"; 3422 warn "reattaching attachments to objects/players";
3036register_command "reload" => sub { 3458register_command "reload" => sub {
3037 my ($who, $arg) = @_; 3459 my ($who, $arg) = @_;
3038 3460
3039 if ($who->flag (FLAG_WIZ)) { 3461 if ($who->flag (FLAG_WIZ)) {
3040 $who->message ("reloading server."); 3462 $who->message ("reloading server.");
3463 async {
3464 $Coro::current->{desc} = "perl_reload";
3041 async { reload_perl }; 3465 reload_perl;
3466 };
3042 } 3467 }
3043}; 3468};
3044 3469
3045unshift @INC, $LIBDIR; 3470unshift @INC, $LIBDIR;
3046 3471
3065 my $signal = new Coro::Signal; 3490 my $signal = new Coro::Signal;
3066 push @WAIT_FOR_TICK_BEGIN, $signal; 3491 push @WAIT_FOR_TICK_BEGIN, $signal;
3067 $signal->wait; 3492 $signal->wait;
3068} 3493}
3069 3494
3070 my $min = 1e6;#d#
3071 my $avg = 10;
3072$TICK_WATCHER = Event->timer ( 3495$TICK_WATCHER = Event->timer (
3073 reentrant => 0, 3496 reentrant => 0,
3074 parked => 1, 3497 parked => 1,
3075 prio => 0, 3498 prio => 0,
3076 at => $NEXT_TICK || $TICK, 3499 at => $NEXT_TICK || $TICK,
3084 3507
3085 $NOW = $tick_start = Event::time; 3508 $NOW = $tick_start = Event::time;
3086 3509
3087 cf::server_tick; # one server iteration 3510 cf::server_tick; # one server iteration
3088 3511
3089 0 && sync_job {#d#
3090 for(1..10) {
3091 my $t = Event::time;
3092 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3093 or die;
3094
3095 $map->width (50);
3096 $map->height (50);
3097 $map->alloc;
3098 $map->_load_objects ("/tmp/x.map", 1);
3099 my $t = Event::time - $t;
3100
3101 #next unless $t < 0.0013;#d#
3102 if ($t < $min) {
3103 $min = $t;
3104 }
3105 $avg = $avg * 0.99 + $t * 0.01;
3106 }
3107 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3108 exit 0;
3109 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3110 };
3111
3112 $RUNTIME += $TICK; 3512 $RUNTIME += $TICK;
3113 $NEXT_TICK += $TICK; 3513 $NEXT_TICK += $TICK;
3114 3514
3115 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3515 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3116 $NEXT_RUNTIME_WRITE = $NOW + 10; 3516 $NEXT_RUNTIME_WRITE = $NOW + 10;
3117 Coro::async_pool { 3517 Coro::async_pool {
3518 $Coro::current->{desc} = "runtime saver";
3118 write_runtime 3519 write_runtime
3119 or warn "ERROR: unable to write runtime file: $!"; 3520 or warn "ERROR: unable to write runtime file: $!";
3120 }; 3521 };
3121 } 3522 }
3122 3523
3123# my $AFTER = Event::time;
3124# warn $AFTER - $NOW;#d#
3125
3126 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3524 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3127 $sig->send; 3525 $sig->send;
3128 } 3526 }
3129 while (my $sig = shift @WAIT_FOR_TICK) { 3527 while (my $sig = shift @WAIT_FOR_TICK) {
3130 $sig->send; 3528 $sig->send;
3140 3538
3141 $LOAD = ($NOW - $tick_start) / $TICK; 3539 $LOAD = ($NOW - $tick_start) / $TICK;
3142 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3540 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3143 3541
3144 _post_tick; 3542 _post_tick;
3145
3146
3147 }, 3543 },
3148); 3544);
3149 3545
3150{ 3546{
3547 BDB::min_parallel 8;
3151 BDB::max_poll_time $TICK * 0.1; 3548 BDB::max_poll_time $TICK * 0.1;
3152 $BDB_POLL_WATCHER = Event->io ( 3549 $BDB_POLL_WATCHER = Event->io (
3153 reentrant => 0, 3550 reentrant => 0,
3154 fd => BDB::poll_fileno, 3551 fd => BDB::poll_fileno,
3155 poll => 'r', 3552 poll => 'r',
3156 prio => 0, 3553 prio => 0,
3157 data => WF_AUTOCANCEL, 3554 data => WF_AUTOCANCEL,
3158 cb => \&BDB::poll_cb, 3555 cb => \&BDB::poll_cb,
3159 ); 3556 );
3160 BDB::min_parallel 8;
3161 3557
3162 BDB::set_sync_prepare { 3558 BDB::set_sync_prepare {
3163 my $status; 3559 my $status;
3164 my $current = $Coro::current; 3560 my $current = $Coro::current;
3165 ( 3561 (
3174 ) 3570 )
3175 }; 3571 };
3176 3572
3177 unless ($DB_ENV) { 3573 unless ($DB_ENV) {
3178 $DB_ENV = BDB::db_env_create; 3574 $DB_ENV = BDB::db_env_create;
3575 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3576 | BDB::LOG_AUTOREMOVE, 1);
3577 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3578 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3179 3579
3180 cf::sync_job { 3580 cf::sync_job {
3181 eval { 3581 eval {
3182 BDB::db_env_open 3582 BDB::db_env_open
3183 $DB_ENV, 3583 $DB_ENV,
3185 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3585 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3186 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3586 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3187 0666; 3587 0666;
3188 3588
3189 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3589 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3190
3191 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3192 $DB_ENV->set_lk_detect;
3193 }; 3590 };
3194 3591
3195 cf::cleanup "db_env_open(db): $@" if $@; 3592 cf::cleanup "db_env_open(db): $@" if $@;
3196 }; 3593 };
3197 } 3594 }
3595
3596 $BDB_DEADLOCK_WATCHER = Event->timer (
3597 after => 3,
3598 interval => 1,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3604 },
3605 );
3606 $BDB_CHECKPOINT_WATCHER = Event->timer (
3607 after => 11,
3608 interval => 60,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3614 },
3615 );
3616 $BDB_TRICKLE_WATCHER = Event->timer (
3617 after => 5,
3618 interval => 10,
3619 hard => 1,
3620 prio => 0,
3621 data => WF_AUTOCANCEL,
3622 cb => sub {
3623 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3624 },
3625 );
3198} 3626}
3199 3627
3200{ 3628{
3201 IO::AIO::min_parallel 8; 3629 IO::AIO::min_parallel 8;
3202 3630
3205 $AIO_POLL_WATCHER = Event->io ( 3633 $AIO_POLL_WATCHER = Event->io (
3206 reentrant => 0, 3634 reentrant => 0,
3207 data => WF_AUTOCANCEL, 3635 data => WF_AUTOCANCEL,
3208 fd => IO::AIO::poll_fileno, 3636 fd => IO::AIO::poll_fileno,
3209 poll => 'r', 3637 poll => 'r',
3210 prio => 6, 3638 prio => 0,
3211 cb => \&IO::AIO::poll_cb, 3639 cb => \&IO::AIO::poll_cb,
3212 ); 3640 );
3213} 3641}
3214 3642
3215my $_log_backtrace; 3643my $_log_backtrace;
3221 3649
3222 # limit the # of concurrent backtraces 3650 # limit the # of concurrent backtraces
3223 if ($_log_backtrace < 2) { 3651 if ($_log_backtrace < 2) {
3224 ++$_log_backtrace; 3652 ++$_log_backtrace;
3225 async { 3653 async {
3654 $Coro::current->{desc} = "abt $msg";
3655
3226 my @bt = fork_call { 3656 my @bt = fork_call {
3227 @addr = map { sprintf "%x", $_ } @addr; 3657 @addr = map { sprintf "%x", $_ } @addr;
3228 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3658 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3229 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3659 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3230 or die "addr2line: $!"; 3660 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines