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.300 by root, Tue Jul 10 06:44:29 2007 UTC vs.
Revision 1.371 by root, Thu Sep 13 16:16:01 2007 UTC

10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
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
313 my $guard = Coro::guard { 334 my $guard = Coro::guard {
314 $TICK_WATCHER->start; 335 $TICK_WATCHER->start;
315 }; 336 };
316 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
317 $guard 338 $guard
339}
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 my $signal = new Coro::Signal;
360
361 while () {
362 next_job:
363 my $avail = cf::till_tick;
364 if ($avail > 0.01) {
365 for (0 .. $#SLOT_QUEUE) {
366 if ($SLOT_QUEUE[$_][0] < $avail) {
367 my $job = splice @SLOT_QUEUE, $_, 1, ();
368 $job->[2]->send;
369 Coro::cede;
370 goto next_job;
371 }
372 }
373 }
374
375 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait;
379 } else {
380 Coro::schedule;
381 }
382 }
383};
384
385sub get_slot($;$$) {
386 my ($time, $pri, $name) = @_;
387
388 $time = $TICK * .6 if $time > $TICK * .6;
389 my $sig = new Coro::Signal;
390
391 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
392 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
393 $SLOT_QUEUE->ready;
394 $sig->wait;
318} 395}
319 396
320=item cf::async { BLOCK } 397=item cf::async { BLOCK }
321 398
322Currently the same as Coro::async_pool, meaning you cannot use 399Currently the same as Coro::async_pool, meaning you cannot use
409Coro::Storable. May, of course, block. Note that the executed sub may 486Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 487never block itself or use any form of Event handling.
411 488
412=cut 489=cut
413 490
414sub _store_scalar {
415 open my $fh, ">", \my $buf
416 or die "fork_call: cannot open fh-to-buf in child : $!";
417 Storable::store_fd $_[0], $fh;
418 close $fh;
419
420 $buf
421}
422
423sub fork_call(&@) { 491sub fork_call(&@) {
424 my ($cb, @args) = @_; 492 my ($cb, @args) = @_;
425 493
426# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 494 # we seemingly have to make a local copy of the whole thing,
427# or die "socketpair: $!"; 495 # otherwise perl prematurely frees the stuff :/
428 pipe my $fh1, my $fh2 496 # TODO: investigate and fix (likely this will be rather laborious)
429 or die "pipe: $!";
430 497
431 if (my $pid = fork) { 498 my @res = Coro::Util::fork_eval {
432 close $fh2;
433
434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
436 $res = Coro::Storable::thaw $res;
437
438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440 Carp::confess $$res unless "ARRAY" eq ref $res;
441
442 return wantarray ? @$res : $res->[-1];
443 } else {
444 reset_signals; 499 reset_signals;
445 local $SIG{__WARN__}; 500 &$cb
446 local $SIG{__DIE__}; 501 }, @args;
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452 502
453 eval { 503 wantarray ? @res : $res[-1]
454 close $fh1;
455
456 my @res = eval { $cb->(@args) };
457
458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459 close $fh2;
460 };
461
462 warn $@ if $@;
463 _exit 0;
464 }
465} 504}
466 505
467=item $value = cf::db_get $family => $key 506=item $value = cf::db_get $family => $key
468 507
469Returns a single value from the environment database. 508Returns a single value from the environment database.
471=item cf::db_put $family => $key => $value 510=item cf::db_put $family => $key => $value
472 511
473Stores the given C<$value> in the family. It can currently store binary 512Stores the given C<$value> in the family. It can currently store binary
474data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 513data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
475 514
515=item $db = cf::db_table "name"
516
517Create and/or open a new database table. The string must not be "db" and must be unique
518within each server.
519
476=cut 520=cut
521
522sub db_table($) {
523 my ($name) = @_;
524 my $db = BDB::db_create $DB_ENV;
525
526 eval {
527 $db->set_flags (BDB::CHKSUM);
528
529 utf8::encode $name;
530 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
531 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
532 cf::cleanup "db_open(db): $!" if $!;
533 };
534 cf::cleanup "db_open(db): $@" if $@;
535
536 $db
537}
477 538
478our $DB; 539our $DB;
479 540
480sub db_init { 541sub db_init {
481 unless ($DB) {
482 $DB = BDB::db_create $DB_ENV;
483
484 cf::sync_job { 542 cf::sync_job {
485 eval { 543 $DB ||= db_table "db";
486 $DB->set_flags (BDB::CHKSUM);
487
488 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
489 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
490 cf::cleanup "db_open(db): $!" if $!;
491 };
492 cf::cleanup "db_open(db): $@" if $@;
493 };
494 } 544 };
495} 545}
496 546
497sub db_get($$) { 547sub db_get($$) {
498 my $key = "$_[0]/$_[1]"; 548 my $key = "$_[0]/$_[1]";
499 549
549 if (1) { 599 if (1) {
550 $md5 = 600 $md5 =
551 join "\x00", 601 join "\x00",
552 $processversion, 602 $processversion,
553 map { 603 map {
554 Coro::cede; 604 cf::cede_to_tick;
555 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 605 ($src->[$_], Digest::MD5::md5_hex $data[$_])
556 } 0.. $#$src; 606 } 0.. $#$src;
557 607
558 608
559 my $dbmd5 = db_get cache => "$id/md5"; 609 my $dbmd5 = db_get cache => "$id/md5";
865 "; 915 ";
866 die if $@; 916 die if $@;
867} 917}
868 918
869our $override; 919our $override;
870our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 920our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
871 921
872sub override { 922sub override {
873 $override = 1; 923 $override = 1;
874 @invoke_results = (); 924 @INVOKE_RESULTS = (@_);
875} 925}
876 926
877sub do_invoke { 927sub do_invoke {
878 my $event = shift; 928 my $event = shift;
879 my $callbacks = shift; 929 my $callbacks = shift;
880 930
881 @invoke_results = (); 931 @INVOKE_RESULTS = ();
882 932
883 local $override; 933 local $override;
884 934
885 for (@$callbacks) { 935 for (@$callbacks) {
886 eval { &{$_->[1]} }; 936 eval { &{$_->[1]} };
903 953
904Generate an object-specific event with the given arguments. 954Generate an object-specific event with the given arguments.
905 955
906This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 956This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
907removed in future versions), and there is no public API to access override 957removed in future versions), and there is no public API to access override
908results (if you must, access C<@cf::invoke_results> directly). 958results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909 959
910=back 960=back
911 961
912=cut 962=cut
913 963
914############################################################################# 964#############################################################################
915# object support 965# object support
966#
967
968sub _can_merge {
969 my ($ob1, $ob2) = @_;
970
971 local $Storable::canonical = 1;
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974
975 $fob1 eq $fob2
976}
916 977
917sub reattach { 978sub reattach {
918 # basically do the same as instantiate, without calling instantiate 979 # basically do the same as instantiate, without calling instantiate
919 my ($obj) = @_; 980 my ($obj) = @_;
920 981
965); 1026);
966 1027
967sub object_freezer_save { 1028sub object_freezer_save {
968 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
969 1030
1031 my $guard = cf::lock_acquire "io";
1032
970 sync_job { 1033 sync_job {
971 if (length $$rdata) { 1034 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename);
972 warn sprintf "saving %s (%d,%d)\n", 1036 warn sprintf "saving %s (%d,%d)\n",
973 $filename, length $$rdata, scalar @$objs; 1037 $decname, length $$rdata, scalar @$objs;
974 1038
975 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1039 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
976 chmod SAVE_MODE, $fh; 1040 chmod SAVE_MODE, $fh;
977 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1041 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
978 aio_fsync $fh if $cf::USE_FSYNC; 1042 aio_fsync $fh if $cf::USE_FSYNC;
997 } 1061 }
998 } else { 1062 } else {
999 aio_unlink $filename; 1063 aio_unlink $filename;
1000 aio_unlink "$filename.pst"; 1064 aio_unlink "$filename.pst";
1001 } 1065 }
1002 } 1066 };
1067
1068 undef $guard;
1003} 1069}
1004 1070
1005sub object_freezer_as_string { 1071sub object_freezer_as_string {
1006 my ($rdata, $objs) = @_; 1072 my ($rdata, $objs) = @_;
1007 1073
1012 1078
1013sub object_thawer_load { 1079sub object_thawer_load {
1014 my ($filename) = @_; 1080 my ($filename) = @_;
1015 1081
1016 my ($data, $av); 1082 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1017 1085
1018 (aio_load $filename, $data) >= 0 1086 (aio_load $filename, $data) >= 0
1019 or return; 1087 or return;
1020 1088
1021 unless (aio_stat "$filename.pst") { 1089 unless (aio_stat "$filename.pst") {
1022 (aio_load "$filename.pst", $av) >= 0 1090 (aio_load "$filename.pst", $av) >= 0
1023 or return; 1091 or return;
1092
1093 undef $guard;
1024 $av = eval { (Storable::thaw $av)->{objs} }; 1094 $av = eval { (Storable::thaw $av)->{objs} };
1025 } 1095 }
1026 1096
1097 utf8::decode (my $decname = $filename);
1027 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
1028 $filename, length $data, scalar @{$av || []}; 1099 $decname, length $data, scalar @{$av || []};
1100
1029 return ($data, $av); 1101 ($data, $av)
1030} 1102}
1031 1103
1032=head2 COMMAND CALLBACKS 1104=head2 COMMAND CALLBACKS
1033 1105
1034=over 4 1106=over 4
1107 my ($pl, $buf) = @_; 1179 my ($pl, $buf) = @_;
1108 1180
1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1181 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110 1182
1111 if (ref $msg) { 1183 if (ref $msg) {
1184 my ($type, $reply, @payload) =
1185 "ARRAY" eq ref $msg
1186 ? @$msg
1187 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1188
1189 my @reply;
1190
1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
1113 if (my %reply = $cb->($pl, $msg)) { 1192 @reply = $cb->($pl, @payload);
1114 $pl->ext_reply ($msg->{msgid}, %reply);
1115 }
1116 } 1193 }
1194
1195 $pl->ext_reply ($reply, @reply)
1196 if $reply;
1197
1117 } else { 1198 } else {
1118 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119 } 1200 }
1120 1201
1121 cf::override; 1202 cf::override;
1211 1292
1212=head3 cf::player 1293=head3 cf::player
1213 1294
1214=over 4 1295=over 4
1215 1296
1297=item cf::player::num_playing
1298
1299Returns the official number of playing players, as per the Crossfire metaserver rules.
1300
1301=cut
1302
1303sub num_playing {
1304 scalar grep
1305 $_->ob->map
1306 && !$_->hidden
1307 && !$_->ob->flag (cf::FLAG_WIZ),
1308 cf::player::list
1309}
1310
1216=item cf::player::find $login 1311=item cf::player::find $login
1217 1312
1218Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1219 1314
1220=cut 1315=cut
1255 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1256 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1257 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1258 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1259 1354
1260 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1261 or return; 1356 or return;
1357
1358 $f->next;
1359 my $pl = cf::player::load_pl $f
1360 or return;
1361 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs;
1262 $cf::PLAYER{$login} = $pl 1363 $cf::PLAYER{$login} = $pl
1263 } 1364 }
1264 } 1365 }
1265} 1366}
1266 1367
1276 1377
1277 aio_mkdir playerdir $pl, 0770; 1378 aio_mkdir playerdir $pl, 0770;
1278 $pl->{last_save} = $cf::RUNTIME; 1379 $pl->{last_save} = $cf::RUNTIME;
1279 1380
1280 $pl->save_pl ($path); 1381 $pl->save_pl ($path);
1281 Coro::cede; 1382 cf::cede_to_tick;
1282} 1383}
1283 1384
1284sub new($) { 1385sub new($) {
1285 my ($login) = @_; 1386 my ($login) = @_;
1286 1387
1290 $self->{deny_save} = 1; 1391 $self->{deny_save} = 1;
1291 1392
1292 $cf::PLAYER{$login} = $self; 1393 $cf::PLAYER{$login} = $self;
1293 1394
1294 $self 1395 $self
1396}
1397
1398=item $player->send_msg ($channel, $msg, $color, [extra...])
1399
1400=cut
1401
1402sub send_msg {
1403 my $ns = shift->ns
1404 or return;
1405 $ns->send_msg (@_);
1295} 1406}
1296 1407
1297=item $pl->quit_character 1408=item $pl->quit_character
1298 1409
1299Nukes the player without looking back. If logged in, the connection will 1410Nukes the player without looking back. If logged in, the connection will
1354 or return []; 1465 or return [];
1355 1466
1356 my @logins; 1467 my @logins;
1357 1468
1358 for my $login (@$dirs) { 1469 for my $login (@$dirs) {
1470 my $path = path $login;
1471
1472 # a .pst is a dead give-away for a valid player
1473 unless (-e "$path.pst") {
1359 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1474 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1360 aio_read $fh, 0, 512, my $buf, 0 or next; 1475 aio_read $fh, 0, 512, my $buf, 0 or next;
1361 $buf !~ /^password -------------$/m or next; # official not-valid tag 1476 $buf !~ /^password -------------$/m or next; # official not-valid tag
1477 }
1362 1478
1363 utf8::decode $login; 1479 utf8::decode $login;
1364 push @logins, $login; 1480 push @logins, $login;
1365 } 1481 }
1366 1482
1404sub expand_cfpod { 1520sub expand_cfpod {
1405 ((my $self), (local $_)) = @_; 1521 ((my $self), (local $_)) = @_;
1406 1522
1407 # escape & and < 1523 # escape & and <
1408 s/&/&amp;/g; 1524 s/&/&amp;/g;
1409 s/(?<![BIUGH])</&lt;/g; 1525 s/(?<![BIUGHT])</&lt;/g;
1410 1526
1411 # this is buggy, it needs to properly take care of nested <'s 1527 # this is buggy, it needs to properly take care of nested <'s
1412 1528
1413 1 while 1529 1 while
1414 # replace B<>, I<>, U<> etc. 1530 # replace B<>, I<>, U<> etc.
1415 s/B<([^\>]*)>/<b>$1<\/b>/ 1531 s/B<([^\>]*)>/<b>$1<\/b>/
1416 || s/I<([^\>]*)>/<i>$1<\/i>/ 1532 || s/I<([^\>]*)>/<i>$1<\/i>/
1417 || s/U<([^\>]*)>/<u>$1<\/u>/ 1533 || s/U<([^\>]*)>/<u>$1<\/u>/
1534 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1418 # replace G<male|female> tags 1535 # replace G<male|female> tags
1419 || s{G<([^>|]*)\|([^>]*)>}{ 1536 || s{G<([^>|]*)\|([^>]*)>}{
1420 $self->gender ? $2 : $1 1537 $self->gender ? $2 : $1
1421 }ge 1538 }ge
1422 # replace H<hint text> 1539 # replace H<hint text>
1435 s/\s+\n/\n/g; # ws line-ends 1552 s/\s+\n/\n/g; # ws line-ends
1436 s/\n\n+/\n/g; # double lines 1553 s/\n\n+/\n/g; # double lines
1437 s/^\n+//; # beginning lines 1554 s/^\n+//; # beginning lines
1438 s/\n+$//; # ending lines 1555 s/\n+$//; # ending lines
1439 1556
1440 warn $_;#d#
1441 $_ 1557 $_
1442} 1558}
1443 1559
1444sub hintmode { 1560sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1561 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1562 $_[0]{hintmode}
1447} 1563}
1448 1564
1449=item $player->ext_reply ($msgid, %msg) 1565=item $player->ext_reply ($msgid, @msg)
1450 1566
1451Sends an ext reply to the player. 1567Sends an ext reply to the player.
1452 1568
1453=cut 1569=cut
1454 1570
1455sub ext_reply($$%) { 1571sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1572 my ($self, $id, @msg) = @_;
1457 1573
1458 $msg{msgid} = $id; 1574 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1575}
1461 1576
1462=item $player->ext_event ($type, %msg) 1577=item $player->ext_msg ($type, @msg)
1463 1578
1464Sends an ext event to the client. 1579Sends an ext event to the client.
1465 1580
1466=cut 1581=cut
1467 1582
1468sub ext_event($$%) { 1583sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1584 my ($self, $type, @msg) = @_;
1470 1585
1471 $self->ns->ext_event ($type, %msg); 1586 $self->ns->ext_msg ($type, @msg);
1472} 1587}
1473 1588
1474=head3 cf::region 1589=head3 cf::region
1475 1590
1476=over 4 1591=over 4
1489 my ($path) = @_; 1604 my ($path) = @_;
1490 1605
1491 my ($match, $specificity); 1606 my ($match, $specificity);
1492 1607
1493 for my $region (list) { 1608 for my $region (list) {
1494 if ($region->match && $path =~ $region->match) { 1609 if ($region->{match} && $path =~ $region->{match}) {
1495 ($match, $specificity) = ($region, $region->specificity) 1610 ($match, $specificity) = ($region, $region->specificity)
1496 if $region->specificity > $specificity; 1611 if $region->specificity > $specificity;
1497 } 1612 }
1498 } 1613 }
1499 1614
1619 $self->init; # pass $1 etc. 1734 $self->init; # pass $1 etc.
1620 return $self; 1735 return $self;
1621 } 1736 }
1622 } 1737 }
1623 1738
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1739 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1740 ()
1626} 1741}
1627 1742
1628sub init { 1743sub init {
1629 my ($self) = @_; 1744 my ($self) = @_;
1692 1807
1693sub load_header_from($) { 1808sub load_header_from($) {
1694 my ($self, $path) = @_; 1809 my ($self, $path) = @_;
1695 1810
1696 utf8::encode $path; 1811 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1812 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 or return; 1813 or return;
1814
1815 $self->_load_header ($f)
1816 or return;
1817
1818 local $MAP_LOADING{$self->{path}} = $self;
1819 $f->resolve_delayed_derefs;
1702 1820
1703 $self->{load_path} = $path; 1821 $self->{load_path} = $path;
1704 1822
1705 1 1823 1
1706} 1824}
1760sub find { 1878sub find {
1761 my ($path, $origin) = @_; 1879 my ($path, $origin) = @_;
1762 1880
1763 $path = normalise $path, $origin && $origin->path; 1881 $path = normalise $path, $origin && $origin->path;
1764 1882
1883 cf::lock_wait "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 1884 cf::lock_wait "map_find:$path";
1766 1885
1767 $cf::MAP{$path} || do { 1886 $cf::MAP{$path} || do {
1768 my $guard = cf::lock_acquire "map_find:$path"; 1887 my $guard1 = cf::lock_acquire "map_find:$path";
1888 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1889
1769 my $map = new_from_path cf::map $path 1890 my $map = new_from_path cf::map $path
1770 or return; 1891 or return;
1771 1892
1772 $map->{last_save} = $cf::RUNTIME; 1893 $map->{last_save} = $cf::RUNTIME;
1773 1894
1775 or return; 1896 or return;
1776 1897
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1898 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 1899 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 1900 #$cf::WAIT_FOR_TICK->wait;
1901 undef $guard1;
1902 undef $guard2;
1780 $map->reset; 1903 $map->reset;
1781 undef $guard;
1782 return find $path; 1904 return find $path;
1783 } 1905 }
1784 1906
1785 $cf::MAP{$path} = $map 1907 $cf::MAP{$path} = $map
1786 } 1908 }
1795 local $self->{deny_reset} = 1; # loading can take a long time 1917 local $self->{deny_reset} = 1; # loading can take a long time
1796 1918
1797 my $path = $self->{path}; 1919 my $path = $self->{path};
1798 1920
1799 { 1921 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 1922 my $guard = cf::lock_acquire "map_data:$path";
1801 1923
1924 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 1925 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 1926
1804 $self->in_memory (cf::MAP_LOADING); 1927 $self->in_memory (cf::MAP_LOADING);
1805 1928
1806 $self->alloc; 1929 $self->alloc;
1807 1930
1808 $self->pre_load; 1931 $self->pre_load;
1809 Coro::cede; 1932 cf::cede_to_tick;
1810 1933
1934 my $f = new_from_file cf::object::thawer $self->{load_path};
1935 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 1936 $self->_load_objects ($f)
1812 or return; 1937 or return;
1813 1938
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1939 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815 if delete $self->{load_original}; 1940 if delete $self->{load_original};
1816 1941
1817 if (my $uniq = $self->uniq_path) { 1942 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 1943 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 1944 unless (aio_stat $uniq) {
1945 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 1946 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 1947 $self->_load_objects ($f);
1948 $f->resolve_delayed_derefs;
1949 }
1822 } 1950 }
1823 } 1951 }
1824 1952
1825 Coro::cede; 1953 $f->resolve_delayed_derefs;
1954
1955 cf::cede_to_tick;
1826 # now do the right thing for maps 1956 # now do the right thing for maps
1827 $self->link_multipart_objects; 1957 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 1958 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 1959 unless $self->difficulty;
1830 Coro::cede; 1960 cf::cede_to_tick;
1831 1961
1832 unless ($self->{deny_activate}) { 1962 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 1963 $self->decay_objects;
1834 $self->fix_auto_apply; 1964 $self->fix_auto_apply;
1835 $self->update_buttons; 1965 $self->update_buttons;
1836 Coro::cede; 1966 cf::cede_to_tick;
1837 $self->set_darkness_map; 1967 $self->set_darkness_map;
1838 Coro::cede; 1968 cf::cede_to_tick;
1839 $self->activate; 1969 $self->activate;
1840 } 1970 }
1971
1972 $self->{last_save} = $cf::RUNTIME;
1973 $self->last_access ($cf::RUNTIME);
1841 1974
1842 $self->in_memory (cf::MAP_IN_MEMORY); 1975 $self->in_memory (cf::MAP_IN_MEMORY);
1843 } 1976 }
1844 1977
1845 $self->post_load; 1978 $self->post_load;
1856 1989
1857 $self 1990 $self
1858} 1991}
1859 1992
1860# find and load all maps in the 3x3 area around a map 1993# find and load all maps in the 3x3 area around a map
1861sub load_diag { 1994sub load_neighbours {
1862 my ($map) = @_; 1995 my ($map) = @_;
1863 1996
1864 my @diag; # diagonal neighbours 1997 my @neigh; # diagonal neighbours
1865 1998
1866 for (0 .. 3) { 1999 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2000 my $neigh = $map->tile_path ($_)
1868 or next; 2001 or next;
1869 $neigh = find $neigh, $map 2002 $neigh = find $neigh, $map
1870 or next; 2003 or next;
1871 $neigh->load; 2004 $neigh->load;
1872 2005
2006 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2007 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2008 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2009 }
1876 2010
1877 for (@diag) { 2011 for (grep defined $_->[0], @neigh) {
2012 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2013 my $neigh = find $path, $origin
1879 or next; 2014 or next;
1880 $neigh->load; 2015 $neigh->load;
1881 } 2016 }
1882} 2017}
1883 2018
1888} 2023}
1889 2024
1890sub do_load_sync { 2025sub do_load_sync {
1891 my ($map) = @_; 2026 my ($map) = @_;
1892 2027
2028 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2029 if $Coro::current == $Coro::main;
2030
1893 cf::sync_job { $map->load }; 2031 cf::sync_job { $map->load };
1894} 2032}
1895 2033
1896our %MAP_PREFETCH; 2034our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2035our $MAP_PREFETCHER = undef;
1898 2036
1899sub find_async { 2037sub find_async {
1900 my ($path, $origin) = @_; 2038 my ($path, $origin, $load) = @_;
1901 2039
1902 $path = normalise $path, $origin && $origin->{path}; 2040 $path = normalise $path, $origin && $origin->{path};
1903 2041
1904 if (my $map = $cf::MAP{$path}) { 2042 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2043 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1906 } 2044 }
1907 2045
1908 undef $MAP_PREFETCH{$path}; 2046 $MAP_PREFETCH{$path} |= $load;
2047
1909 $MAP_PREFETCHER ||= cf::async { 2048 $MAP_PREFETCHER ||= cf::async {
1910 while (%MAP_PREFETCH) { 2049 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2050 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 2051 if (my $map = find $k) {
1913 or next;
1914 $map->load; 2052 $map->load if $v;
2053 }
1915 2054
1916 delete $MAP_PREFETCH{$path}; 2055 delete $MAP_PREFETCH{$k};
1917 } 2056 }
1918 } 2057 }
1919 undef $MAP_PREFETCHER; 2058 undef $MAP_PREFETCHER;
1920 }; 2059 };
1921 $MAP_PREFETCHER->prio (6); 2060 $MAP_PREFETCHER->prio (6);
1924} 2063}
1925 2064
1926sub save { 2065sub save {
1927 my ($self) = @_; 2066 my ($self) = @_;
1928 2067
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2068 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2069
1931 $self->{last_save} = $cf::RUNTIME; 2070 $self->{last_save} = $cf::RUNTIME;
1932 2071
1933 return unless $self->dirty; 2072 return unless $self->dirty;
1934 2073
1957 my ($self) = @_; 2096 my ($self) = @_;
1958 2097
1959 # save first because save cedes 2098 # save first because save cedes
1960 $self->save; 2099 $self->save;
1961 2100
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2101 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2102
1964 return if $self->players; 2103 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2104 return if $self->in_memory != cf::MAP_IN_MEMORY;
1966 return if $self->{deny_save}; 2105 return if $self->{deny_save};
1967 2106
2107 $self->in_memory (cf::MAP_SWAPPED);
2108
2109 $self->deactivate;
2110 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2111 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2112}
1971 2113
1972sub reset_at { 2114sub reset_at {
1973 my ($self) = @_; 2115 my ($self) = @_;
1974 2116
2006 if $uniq; 2148 if $uniq;
2007 } 2149 }
2008 2150
2009 delete $cf::MAP{$self->path}; 2151 delete $cf::MAP{$self->path};
2010 2152
2153 $self->deactivate;
2154 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2155 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2156
2015 $self->unlink_save; 2157 $self->unlink_save;
2016 $self->destroy; 2158 $self->destroy;
2017} 2159}
2018 2160
2019my $nuke_counter = "aaaa"; 2161my $nuke_counter = "aaaa";
2020 2162
2021sub nuke { 2163sub nuke {
2022 my ($self) = @_; 2164 my ($self) = @_;
2023 2165
2166 {
2167 my $lock = cf::lock_acquire "map_data:$self->{path}";
2168
2024 delete $cf::MAP{$self->path}; 2169 delete $cf::MAP{$self->path};
2025 2170
2026 $self->unlink_save; 2171 $self->unlink_save;
2027 2172
2028 bless $self, "cf::map"; 2173 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2174 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2175 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2176 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2177 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2178
2034 $cf::MAP{$self->path} = $self; 2179 $cf::MAP{$self->path} = $self;
2180 }
2035 2181
2036 $self->reset; # polite request, might not happen 2182 $self->reset; # polite request, might not happen
2037} 2183}
2038 2184
2039=item $maps = cf::map::tmp_maps 2185=item $maps = cf::map::tmp_maps
2115 2261
2116sub inv_recursive { 2262sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2263 inv_recursive_ inv $_[0]
2118} 2264}
2119 2265
2266=item $ref = $ob->ref
2267
2268creates and returns a persistent reference to an objetc that can be stored as a string.
2269
2270=item $ob = cf::object::deref ($refstring)
2271
2272returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2273even if the object actually exists. May block.
2274
2275=cut
2276
2277sub deref {
2278 my ($ref) = @_;
2279
2280 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return;
2287 $pl->ob->uuid eq $uuid
2288 or return;
2289
2290 $pl->ob
2291 } else {
2292 warn "$ref: cannot resolve object reference\n";
2293 undef
2294 }
2295}
2296
2120package cf; 2297package cf;
2121 2298
2122=back 2299=back
2123 2300
2124=head3 cf::object::player 2301=head3 cf::object::player
2146 2323
2147 } else { 2324 } else {
2148 my $pl = $self->contr; 2325 my $pl = $self->contr;
2149 2326
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2327 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2328 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2329 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2330
2159 } else { 2331 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2332 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2333 $self->message ($msg, $flags);
2162 } 2334 }
2163 } 2335 }
2336}
2337
2338=item $object->send_msg ($channel, $msg, $color, [extra...])
2339
2340=cut
2341
2342sub cf::object::send_msg {
2343 my $pl = shift->contr
2344 or return;
2345 $pl->send_msg (@_);
2164} 2346}
2165 2347
2166=item $player_object->may ("access") 2348=item $player_object->may ("access")
2167 2349
2168Returns wether the given player is authorized to access resource "access" 2350Returns wether the given player is authorized to access resource "access"
2247 # use -1 or undef as default coordinates, not 0, 0 2429 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2430 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2431 if $x <=0 && $y <= 0;
2250 2432
2251 $map->load; 2433 $map->load;
2252 $map->load_diag; 2434 $map->load_neighbours;
2253 2435
2254 return unless $self->contr->active; 2436 return unless $self->contr->active;
2255 $self->activate_recursive; 2437 $self->activate_recursive;
2256 2438
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2439 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2440 $self->enter_map ($map, $x, $y);
2259} 2441}
2260 2442
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2443=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2444
2263Moves the player to the given map-path and coordinates by first freezing 2445Moves the player to the given map-path and coordinates by first freezing
2264her, loading and preparing them map, calling the provided $check callback 2446her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on 2447that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position. 2448the new (success) or old (failed) map position. In either case, $done will
2449be called at the end of this process.
2267 2450
2268=cut 2451=cut
2269 2452
2270our $GOTOGEN; 2453our $GOTOGEN;
2271 2454
2272sub cf::object::player::goto { 2455sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2456 my ($self, $path, $x, $y, $check, $done) = @_;
2274 2457
2275 # do generation counting so two concurrent goto's will be executed in-order 2458 # do generation counting so two concurrent goto's will be executed in-order
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2460
2278 $self->enter_link; 2461 $self->enter_link;
2279 2462
2280 (async { 2463 (async {
2464 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs];
2468
2469 # see if we actually can go there
2470 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2471 $ob = $obs[rand @obs];
2472 } else {
2473 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2474 }
2475 # else put us there anyways for now #d#
2476
2477 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2478 } else {
2479 ($path, $x, $y) = (undef, undef, undef);
2480 }
2481 }
2482
2281 my $map = eval { 2483 my $map = eval {
2282 my $map = cf::map::find $path; 2484 my $map = defined $path ? cf::map::find $path : undef;
2283 2485
2284 if ($map) { 2486 if ($map) {
2285 $map = $map->customise_for ($self); 2487 $map = $map->customise_for ($self);
2286 $map = $check->($map) if $check && $map; 2488 $map = $check->($map) if $check && $map;
2287 } else { 2489 } else {
2288 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2490 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2289 } 2491 }
2290 2492
2291 $map 2493 $map
2292 }; 2494 };
2293 2495
2298 2500
2299 if ($gen == $self->{_goto_generation}) { 2501 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2502 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2503 $self->leave_link ($map, $x, $y);
2302 } 2504 }
2505
2506 $done->() if $done;
2303 })->prio (1); 2507 })->prio (1);
2304} 2508}
2305 2509
2306=item $player_object->enter_exit ($exit_object) 2510=item $player_object->enter_exit ($exit_object)
2307 2511
2416 2620
2417 utf8::encode $text; 2621 utf8::encode $text;
2418 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2622 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2419} 2623}
2420 2624
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 2625=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 2626
2423Send a drawinfo or msg packet to the client, formatting the msg for the 2627Send a drawinfo or msg packet to the client, formatting the msg for the
2424client if neccessary. C<$type> should be a string identifying the type of 2628client if neccessary. C<$type> should be a string identifying the type of
2425the message, with C<log> being the default. If C<$color> is negative, suppress 2629the message, with C<log> being the default. If C<$color> is negative, suppress
2426the message unless the client supports the msg packet. 2630the message unless the client supports the msg packet.
2427 2631
2428=cut 2632=cut
2429 2633
2634our %CHANNEL = (
2635 "c/identify" => {
2636 id => "identify",
2637 title => "Identify",
2638 reply => undef,
2639 tooltip => "Items recently identified",
2640 },
2641 "c/examine" => {
2642 id => "examine",
2643 title => "Examine",
2644 reply => undef,
2645 tooltip => "Signs and other items you examined",
2646 },
2647);
2648
2430sub cf::client::send_msg { 2649sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 2650 my ($self, $channel, $msg, $color, @extra) = @_;
2432 2651
2433 $msg = $self->pl->expand_cfpod ($msg); 2652 $msg = $self->pl->expand_cfpod ($msg);
2434 2653
2654 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655
2656 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2658
2659 if (ref $channel) {
2660 # send meta info to client, if not yet sent
2661 unless (exists $self->{channel}{$channel->{id}}) {
2662 $self->{channel}{$channel->{id}} = $channel;
2663 $self->ext_msg (channel_info => $channel)
2664 if $self->can_msg;
2665 }
2666
2667 $channel = $channel->{id};
2668 }
2669
2435 return unless @extra || length $msg; 2670 return unless @extra || length $msg;
2436 2671
2437 if ($self->can_msg) { 2672 if ($self->can_msg) {
2673 # default colour, mask it out
2674 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2675 if $color & cf::NDI_DEF;
2676
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2677 $self->send_packet ("msg " . $self->{json_coder}->encode (
2678 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2439 } else { 2679 } else {
2440 # replace some tags by gcfclient-compatible ones
2441 for ($msg) {
2442 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448 }
2449
2450 if ($color >= 0) { 2680 if ($color >= 0) {
2681 # replace some tags by gcfclient-compatible ones
2682 for ($msg) {
2683 1 while
2684 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2685 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2686 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2687 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2688 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2689 }
2690
2691 $color &= cf::NDI_COLOR_MASK;
2692
2693 utf8::encode $msg;
2694
2451 if (0 && $msg =~ /\[/) { 2695 if (0 && $msg =~ /\[/) {
2696 # COMMAND/INFO
2452 $self->send_packet ("drawextinfo $color 4 0 $msg") 2697 $self->send_packet ("drawextinfo $color 10 8 $msg")
2453 } else { 2698 } else {
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2699 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg") 2700 $self->send_packet ("drawinfo $color $msg")
2456 } 2701 }
2457 } 2702 }
2458 } 2703 }
2459} 2704}
2460 2705
2461=item $client->ext_event ($type, %msg) 2706=item $client->ext_msg ($type, @msg)
2462 2707
2463Sends an ext event to the client. 2708Sends an ext event to the client.
2464 2709
2465=cut 2710=cut
2466 2711
2467sub cf::client::ext_event($$%) { 2712sub cf::client::ext_msg($$@) {
2468 my ($self, $type, %msg) = @_; 2713 my ($self, $type, @msg) = @_;
2469 2714
2715 if ($self->extcmd == 2) {
2716 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2717 } elsif ($self->extcmd == 1) { # TODO: remove
2470 $msg{msgtype} = "event_$type"; 2718 push @msg, msgtype => "event_$type";
2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2719 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2720 }
2721}
2722
2723=item $client->ext_reply ($msgid, @msg)
2724
2725Sends an ext reply to the client.
2726
2727=cut
2728
2729sub cf::client::ext_reply($$@) {
2730 my ($self, $id, @msg) = @_;
2731
2732 if ($self->extcmd == 2) {
2733 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2734 } elsif ($self->extcmd == 1) {
2735 #TODO: version 1, remove
2736 unshift @msg, msgtype => "reply", msgid => $id;
2737 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2738 }
2472} 2739}
2473 2740
2474=item $success = $client->query ($flags, "text", \&cb) 2741=item $success = $client->query ($flags, "text", \&cb)
2475 2742
2476Queues a query to the client, calling the given callback with 2743Queues a query to the client, calling the given callback with
2531 my ($ns, $buf) = @_; 2798 my ($ns, $buf) = @_;
2532 2799
2533 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2800 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534 2801
2535 if (ref $msg) { 2802 if (ref $msg) {
2803 my ($type, $reply, @payload) =
2804 "ARRAY" eq ref $msg
2805 ? @$msg
2806 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2807
2808 my @reply;
2809
2536 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2810 if (my $cb = $EXTICMD{$type}) {
2537 if (my %reply = $cb->($ns, $msg)) { 2811 @reply = $cb->($ns, @payload);
2538 $reply{msgid} = $msg->{msgid};
2539 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540 }
2541 } 2812 }
2813
2814 $ns->ext_reply ($reply, @reply)
2815 if $reply;
2816
2542 } else { 2817 } else {
2543 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2818 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544 } 2819 }
2545 2820
2546 cf::override; 2821 cf::override;
2593our $safe = new Safe "safe"; 2868our $safe = new Safe "safe";
2594our $safe_hole = new Safe::Hole; 2869our $safe_hole = new Safe::Hole;
2595 2870
2596$SIG{FPE} = 'IGNORE'; 2871$SIG{FPE} = 'IGNORE';
2597 2872
2598$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2873$safe->permit_only (Opcode::opset qw(
2874 :base_core :base_mem :base_orig :base_math
2875 grepstart grepwhile mapstart mapwhile
2876 sort time
2877));
2599 2878
2600# here we export the classes and methods available to script code 2879# here we export the classes and methods available to script code
2601 2880
2602=pod 2881=pod
2603 2882
2604The following functions and methods are available within a safe environment: 2883The following functions and methods are available within a safe environment:
2605 2884
2606 cf::object 2885 cf::object
2607 contr pay_amount pay_player map x y force_find force_add 2886 contr pay_amount pay_player map x y force_find force_add
2608 insert remove 2887 insert remove name archname title slaying race decrease_ob_nr
2609 2888
2610 cf::object::player 2889 cf::object::player
2611 player 2890 player
2612 2891
2613 cf::player 2892 cf::player
2618 2897
2619=cut 2898=cut
2620 2899
2621for ( 2900for (
2622 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2901 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2902 insert remove inv name archname title slaying race
2623 insert remove)], 2903 decrease_ob_nr)],
2624 ["cf::object::player" => qw(player)], 2904 ["cf::object::player" => qw(player)],
2625 ["cf::player" => qw(peaceful)], 2905 ["cf::player" => qw(peaceful)],
2626 ["cf::map" => qw(trigger)], 2906 ["cf::map" => qw(trigger)],
2627) { 2907) {
2628 no strict 'refs'; 2908 no strict 'refs';
2704# the server's init and main functions 2984# the server's init and main functions
2705 2985
2706sub load_facedata($) { 2986sub load_facedata($) {
2707 my ($path) = @_; 2987 my ($path) = @_;
2708 2988
2989 # HACK to clear player env face cache, we need some signal framework
2990 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = ();
2992
2993 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2994
2709 warn "loading facedata from $path\n"; 2995 warn "loading facedata from $path\n";
2710 2996
2711 my $facedata; 2997 my $facedata;
2712 0 < aio_load $path, $facedata 2998 0 < aio_load $path, $facedata
2713 or die "$path: $!"; 2999 or die "$path: $!";
2715 $facedata = Coro::Storable::thaw $facedata; 3001 $facedata = Coro::Storable::thaw $facedata;
2716 3002
2717 $facedata->{version} == 2 3003 $facedata->{version} == 2
2718 or cf::cleanup "$path: version mismatch, cannot proceed."; 3004 or cf::cleanup "$path: version mismatch, cannot proceed.";
2719 3005
3006 # patch in the exptable
3007 $facedata->{resource}{"res/exp_table"} = {
3008 type => FT_RSRC,
3009 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3010 };
3011 cf::cede_to_tick;
3012
2720 { 3013 {
2721 my $faces = $facedata->{faceinfo}; 3014 my $faces = $facedata->{faceinfo};
2722 3015
2723 while (my ($face, $info) = each %$faces) { 3016 while (my ($face, $info) = each %$faces) {
2724 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3017 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2725 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3018 cf::face::set_visibility $idx, $info->{visibility};
3019 cf::face::set_magicmap $idx, $info->{magicmap};
2726 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3020 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2727 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3021 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2728 Coro::cede; 3022
3023 cf::cede_to_tick;
2729 } 3024 }
2730 3025
2731 while (my ($face, $info) = each %$faces) { 3026 while (my ($face, $info) = each %$faces) {
2732 next unless $info->{smooth}; 3027 next unless $info->{smooth};
2733 my $idx = cf::face::find $face 3028 my $idx = cf::face::find $face
2734 or next; 3029 or next;
2735 if (my $smooth = cf::face::find $info->{smooth}) { 3030 if (my $smooth = cf::face::find $info->{smooth}) {
3031 cf::face::set_smooth $idx, $smooth;
2736 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3032 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2737 } else { 3033 } else {
2738 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3034 warn "smooth face '$info->{smooth}' not found for face '$face'";
2739 } 3035 }
2740 Coro::cede; 3036
3037 cf::cede_to_tick;
2741 } 3038 }
2742 } 3039 }
2743 3040
2744 { 3041 {
2745 my $anims = $facedata->{animinfo}; 3042 my $anims = $facedata->{animinfo};
2746 3043
2747 while (my ($anim, $info) = each %$anims) { 3044 while (my ($anim, $info) = each %$anims) {
2748 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3045 cf::anim::set $anim, $info->{frames}, $info->{facings};
2749 Coro::cede; 3046 cf::cede_to_tick;
2750 } 3047 }
2751 3048
2752 cf::anim::invalidate_all; # d'oh 3049 cf::anim::invalidate_all; # d'oh
2753 } 3050 }
2754 3051
3052 {
3053 # TODO: for gcfclient pleasure, we should give resources
3054 # that gcfclient doesn't grok a >10000 face index.
3055 my $res = $facedata->{resource};
3056
3057 my $soundconf = delete $res->{"res/sound.conf"};
3058
3059 while (my ($name, $info) = each %$res) {
3060 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3061 my $data;
3062
3063 if ($info->{type} & 1) {
3064 # prepend meta info
3065
3066 my $meta = $enc->encode ({
3067 name => $name,
3068 %{ $info->{meta} || {} },
3069 });
3070
3071 $data = pack "(w/a*)*", $meta, $info->{data};
3072 } else {
3073 $data = $info->{data};
3074 }
3075
3076 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3077 cf::face::set_type $idx, $info->{type};
3078
3079 cf::cede_to_tick;
3080 }
3081
3082 if ($soundconf) {
3083 $soundconf = $enc->decode (delete $soundconf->{data});
3084
3085 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3086 my $sound = $soundconf->{compat}[$_]
3087 or next;
3088
3089 my $face = cf::face::find "sound/$sound->[1]";
3090 cf::sound::set $sound->[0] => $face;
3091 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3092 }
3093
3094 while (my ($k, $v) = each %{$soundconf->{event}}) {
3095 my $face = cf::face::find "sound/$v";
3096 cf::sound::set $k => $face;
3097 }
3098 }
3099 }
3100
2755 1 3101 1
2756} 3102}
2757 3103
3104register_exticmd fx_want => sub {
3105 my ($ns, $want) = @_;
3106
3107 while (my ($k, $v) = each %$want) {
3108 $ns->fx_want ($k, $v);
3109 }
3110};
3111
2758sub reload_regions { 3112sub reload_regions {
3113 # HACK to clear player env face cache, we need some signal framework
3114 # for this (global event?)
3115 %ext::player_env::MUSIC_FACE_CACHE = ();
3116
2759 load_resource_file "$MAPDIR/regions" 3117 load_resource_file "$MAPDIR/regions"
2760 or die "unable to load regions file\n"; 3118 or die "unable to load regions file\n";
3119
3120 for (cf::region::list) {
3121 $_->{match} = qr/$_->{match}/
3122 if exists $_->{match};
3123 }
2761} 3124}
2762 3125
2763sub reload_facedata { 3126sub reload_facedata {
2764 load_facedata "$DATADIR/facedata" 3127 load_facedata "$DATADIR/facedata"
2765 or die "unable to load facedata\n"; 3128 or die "unable to load facedata\n";
2794 3157
2795sub init { 3158sub init {
2796 reload_resources; 3159 reload_resources;
2797} 3160}
2798 3161
2799sub cfg_load { 3162sub reload_config {
2800 open my $fh, "<:utf8", "$CONFDIR/config" 3163 open my $fh, "<:utf8", "$CONFDIR/config"
2801 or return; 3164 or return;
2802 3165
2803 local $/; 3166 local $/;
2804 *CFG = YAML::Syck::Load <$fh>; 3167 *CFG = YAML::Syck::Load <$fh>;
2824 (async { 3187 (async {
2825 Event::one_event; 3188 Event::one_event;
2826 })->prio (Coro::PRIO_MAX); 3189 })->prio (Coro::PRIO_MAX);
2827 }; 3190 };
2828 3191
2829 cfg_load; 3192 reload_config;
2830 db_init; 3193 db_init;
2831 load_extensions; 3194 load_extensions;
2832 3195
2833 $TICK_WATCHER->start; 3196 $TICK_WATCHER->start;
2834 Event::loop; 3197 Event::loop;
3027 warn "reloading cf.pm"; 3390 warn "reloading cf.pm";
3028 require cf; 3391 require cf;
3029 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3392 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3030 3393
3031 warn "loading config and database again"; 3394 warn "loading config and database again";
3032 cf::cfg_load; 3395 cf::reload_config;
3033 3396
3034 warn "loading extensions"; 3397 warn "loading extensions";
3035 cf::load_extensions; 3398 cf::load_extensions;
3036 3399
3037 warn "reattaching attachments to objects/players"; 3400 warn "reattaching attachments to objects/players";
3102 my $signal = new Coro::Signal; 3465 my $signal = new Coro::Signal;
3103 push @WAIT_FOR_TICK_BEGIN, $signal; 3466 push @WAIT_FOR_TICK_BEGIN, $signal;
3104 $signal->wait; 3467 $signal->wait;
3105} 3468}
3106 3469
3107 my $min = 1e6;#d#
3108 my $avg = 10;
3109$TICK_WATCHER = Event->timer ( 3470$TICK_WATCHER = Event->timer (
3110 reentrant => 0, 3471 reentrant => 0,
3111 parked => 1, 3472 parked => 1,
3112 prio => 0, 3473 prio => 0,
3113 at => $NEXT_TICK || $TICK, 3474 at => $NEXT_TICK || $TICK,
3121 3482
3122 $NOW = $tick_start = Event::time; 3483 $NOW = $tick_start = Event::time;
3123 3484
3124 cf::server_tick; # one server iteration 3485 cf::server_tick; # one server iteration
3125 3486
3126 0 && sync_job {#d#
3127 for(1..10) {
3128 my $t = Event::time;
3129 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3130 or die;
3131
3132 $map->width (50);
3133 $map->height (50);
3134 $map->alloc;
3135 $map->_load_objects ("/tmp/x.map", 1);
3136 my $t = Event::time - $t;
3137
3138 #next unless $t < 0.0013;#d#
3139 if ($t < $min) {
3140 $min = $t;
3141 }
3142 $avg = $avg * 0.99 + $t * 0.01;
3143 }
3144 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3145 exit 0;
3146 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3147 };
3148
3149 $RUNTIME += $TICK; 3487 $RUNTIME += $TICK;
3150 $NEXT_TICK += $TICK; 3488 $NEXT_TICK += $TICK;
3151 3489
3152 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3490 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3153 $NEXT_RUNTIME_WRITE = $NOW + 10; 3491 $NEXT_RUNTIME_WRITE = $NOW + 10;
3155 write_runtime 3493 write_runtime
3156 or warn "ERROR: unable to write runtime file: $!"; 3494 or warn "ERROR: unable to write runtime file: $!";
3157 }; 3495 };
3158 } 3496 }
3159 3497
3160# my $AFTER = Event::time;
3161# warn $AFTER - $NOW;#d#
3162
3163 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3164 $sig->send; 3499 $sig->send;
3165 } 3500 }
3166 while (my $sig = shift @WAIT_FOR_TICK) { 3501 while (my $sig = shift @WAIT_FOR_TICK) {
3167 $sig->send; 3502 $sig->send;
3177 3512
3178 $LOAD = ($NOW - $tick_start) / $TICK; 3513 $LOAD = ($NOW - $tick_start) / $TICK;
3179 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3180 3515
3181 _post_tick; 3516 _post_tick;
3182
3183
3184 }, 3517 },
3185); 3518);
3186 3519
3187{ 3520{
3521 BDB::min_parallel 8;
3188 BDB::max_poll_time $TICK * 0.1; 3522 BDB::max_poll_time $TICK * 0.1;
3189 $BDB_POLL_WATCHER = Event->io ( 3523 $BDB_POLL_WATCHER = Event->io (
3190 reentrant => 0, 3524 reentrant => 0,
3191 fd => BDB::poll_fileno, 3525 fd => BDB::poll_fileno,
3192 poll => 'r', 3526 poll => 'r',
3193 prio => 0, 3527 prio => 0,
3194 data => WF_AUTOCANCEL, 3528 data => WF_AUTOCANCEL,
3195 cb => \&BDB::poll_cb, 3529 cb => \&BDB::poll_cb,
3196 ); 3530 );
3197 BDB::min_parallel 8;
3198 3531
3199 BDB::set_sync_prepare { 3532 BDB::set_sync_prepare {
3200 my $status; 3533 my $status;
3201 my $current = $Coro::current; 3534 my $current = $Coro::current;
3202 ( 3535 (
3211 ) 3544 )
3212 }; 3545 };
3213 3546
3214 unless ($DB_ENV) { 3547 unless ($DB_ENV) {
3215 $DB_ENV = BDB::db_env_create; 3548 $DB_ENV = BDB::db_env_create;
3549 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3550 | BDB::LOG_AUTOREMOVE, 1);
3551 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3552 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3216 3553
3217 cf::sync_job { 3554 cf::sync_job {
3218 eval { 3555 eval {
3219 BDB::db_env_open 3556 BDB::db_env_open
3220 $DB_ENV, 3557 $DB_ENV,
3222 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3559 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3223 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3560 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3224 0666; 3561 0666;
3225 3562
3226 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3563 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3227
3228 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3229 $DB_ENV->set_lk_detect;
3230 }; 3564 };
3231 3565
3232 cf::cleanup "db_env_open(db): $@" if $@; 3566 cf::cleanup "db_env_open(db): $@" if $@;
3233 }; 3567 };
3234 } 3568 }
3569
3570 $BDB_DEADLOCK_WATCHER = Event->timer (
3571 after => 3,
3572 interval => 1,
3573 hard => 1,
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3578 },
3579 );
3580 $BDB_CHECKPOINT_WATCHER = Event->timer (
3581 after => 11,
3582 interval => 60,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 );
3590 $BDB_TRICKLE_WATCHER = Event->timer (
3591 after => 5,
3592 interval => 10,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 );
3235} 3600}
3236 3601
3237{ 3602{
3238 IO::AIO::min_parallel 8; 3603 IO::AIO::min_parallel 8;
3239 3604

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines