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.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.366 by root, Tue Sep 11 16:05:35 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_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 87our $DB_ENV;
84 88
85our %CFG; 89our %CFG;
86 90
87our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 92our $RUNTIME;
89 93
90our %PLAYER; # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 95our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 96our $LINK_MAP; # the special {link} map, which is always available
93 97
94# used to convert map paths into valid unix filenames by replacing / by ∕ 98# used to convert map paths into valid unix filenames by replacing / by ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 100
166 170
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 171These 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 172returns 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. 173per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 174
175=item @cf::INVOKE_RESULTS
176
177This array contains the results of the last C<invoke ()> call. When
178C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
179that call.
180
171=back 181=back
172 182
173=cut 183=cut
174 184
175BEGIN { 185BEGIN {
179 $msg .= "\n" 189 $msg .= "\n"
180 unless $msg =~ /\n$/; 190 unless $msg =~ /\n$/;
181 191
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183 193
184 utf8::encode $msg;
185 LOG llevError, $msg; 194 LOG llevError, $msg;
186 }; 195 };
187} 196}
188 197
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
264Wait until the given lock is available and then acquires it and returns 273Wait 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, 274a Coro::guard object. If the guard object gets destroyed (goes out of scope,
266for example when the coroutine gets canceled), the lock is automatically 275for example when the coroutine gets canceled), the lock is automatically
267returned. 276returned.
268 277
278Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro.
280
269Lock names should begin with a unique identifier (for example, cf::map::find 281Lock names should begin with a unique identifier (for example, cf::map::find
270uses map_find and cf::map::load uses map_load). 282uses map_find and cf::map::load uses map_load).
271 283
272=item $locked = cf::lock_active $string 284=item $locked = cf::lock_active $string
273 285
274Return true if the lock is currently active, i.e. somebody has locked it. 286Return true if the lock is currently active, i.e. somebody has locked it.
275 287
276=cut 288=cut
277 289
278our %LOCK; 290our %LOCK;
291our %LOCKER;#d#
279 292
280sub lock_wait($) { 293sub lock_wait($) {
281 my ($key) = @_; 294 my ($key) = @_;
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
282 300
283 # wait for lock, if any 301 # wait for lock, if any
284 while ($LOCK{$key}) { 302 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 303 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 304 Coro::schedule;
292 310
293 # wait, to be sure we are not locked 311 # wait, to be sure we are not locked
294 lock_wait $key; 312 lock_wait $key;
295 313
296 $LOCK{$key} = []; 314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
297 316
298 Coro::guard { 317 Coro::guard {
318 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 319 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 320 $_->ready for @{ delete $LOCK{$key} };
301 } 321 }
302} 322}
303 323
313 my $guard = Coro::guard { 333 my $guard = Coro::guard {
314 $TICK_WATCHER->start; 334 $TICK_WATCHER->start;
315 }; 335 };
316 $TICK_WATCHER->stop; 336 $TICK_WATCHER->stop;
317 $guard 337 $guard
338}
339
340=item cf::get_slot $time[, $priority[, $name]]
341
342Allocate $time seconds of blocking CPU time at priority C<$priority>:
343This call blocks and returns only when you have at least C<$time> seconds
344of cpu time till the next tick. The slot is only valid till the next cede.
345
346The optional C<$name> can be used to identify the job to run. It might be
347used for statistical purposes and should identify the same time-class.
348
349Useful for short background jobs.
350
351=cut
352
353our @SLOT_QUEUE;
354our $SLOT_QUEUE;
355
356$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async {
358 my $signal = new Coro::Signal;
359
360 while () {
361 next_job:
362 my $avail = cf::till_tick;
363 if ($avail > 0.01) {
364 for (0 .. $#SLOT_QUEUE) {
365 if ($SLOT_QUEUE[$_][0] < $avail) {
366 my $job = splice @SLOT_QUEUE, $_, 1, ();
367 $job->[2]->send;
368 Coro::cede;
369 goto next_job;
370 }
371 }
372 }
373
374 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait;
378 } else {
379 Coro::schedule;
380 }
381 }
382};
383
384sub get_slot($;$$) {
385 my ($time, $pri, $name) = @_;
386
387 $time = $TICK * .6 if $time > $TICK * .6;
388 my $sig = new Coro::Signal;
389
390 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
391 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
392 $SLOT_QUEUE->ready;
393 $sig->wait;
318} 394}
319 395
320=item cf::async { BLOCK } 396=item cf::async { BLOCK }
321 397
322Currently the same as Coro::async_pool, meaning you cannot use 398Currently the same as Coro::async_pool, meaning you cannot use
412=cut 488=cut
413 489
414sub fork_call(&@) { 490sub fork_call(&@) {
415 my ($cb, @args) = @_; 491 my ($cb, @args) = @_;
416 492
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 493 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 494 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 495 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 496
422 if (my $pid = fork) { 497 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 warn "pst<$res>" unless $res =~ /^pst/;
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 Carp::confess $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 498 reset_signals;
436 local $SIG{__WARN__}; 499 &$cb
437 local $SIG{__DIE__}; 500 }, @args;
438 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX);
440 eval {
441 close $fh1;
442 501
443 my @res = eval { $cb->(@args) }; 502 wantarray ? @res : $res[-1]
444
445 open my $fh, ">", \my $buf
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449
450 warn "writing ", length $buf;
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2;
455 };
456
457 warn $@ if $@;
458 _exit 0;
459 }
460} 503}
461 504
462=item $value = cf::db_get $family => $key 505=item $value = cf::db_get $family => $key
463 506
464Returns a single value from the environment database. 507Returns a single value from the environment database.
466=item cf::db_put $family => $key => $value 509=item cf::db_put $family => $key => $value
467 510
468Stores the given C<$value> in the family. It can currently store binary 511Stores the given C<$value> in the family. It can currently store binary
469data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 512data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
470 513
514=item $db = cf::db_table "name"
515
516Create and/or open a new database table. The string must not be "db" and must be unique
517within each server.
518
471=cut 519=cut
520
521sub db_table($) {
522 my ($name) = @_;
523 my $db = BDB::db_create $DB_ENV;
524
525 eval {
526 $db->set_flags (BDB::CHKSUM);
527
528 utf8::encode $name;
529 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
530 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
531 cf::cleanup "db_open(db): $!" if $!;
532 };
533 cf::cleanup "db_open(db): $@" if $@;
534
535 $db
536}
472 537
473our $DB; 538our $DB;
474 539
475sub db_init { 540sub db_init {
476 unless ($DB) {
477 $DB = BDB::db_create $DB_ENV;
478
479 cf::sync_job { 541 cf::sync_job {
480 eval { 542 $DB ||= db_table "db";
481 $DB->set_flags (BDB::CHKSUM);
482
483 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
484 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
485 cf::cleanup "db_open(db): $!" if $!;
486 };
487 cf::cleanup "db_open(db): $@" if $@;
488 };
489 } 543 };
490} 544}
491 545
492sub db_get($$) { 546sub db_get($$) {
493 my $key = "$_[0]/$_[1]"; 547 my $key = "$_[0]/$_[1]";
494 548
544 if (1) { 598 if (1) {
545 $md5 = 599 $md5 =
546 join "\x00", 600 join "\x00",
547 $processversion, 601 $processversion,
548 map { 602 map {
549 Coro::cede; 603 cf::cede_to_tick;
550 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 604 ($src->[$_], Digest::MD5::md5_hex $data[$_])
551 } 0.. $#$src; 605 } 0.. $#$src;
552 606
553 607
554 my $dbmd5 = db_get cache => "$id/md5"; 608 my $dbmd5 = db_get cache => "$id/md5";
860 "; 914 ";
861 die if $@; 915 die if $@;
862} 916}
863 917
864our $override; 918our $override;
865our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 919our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
866 920
867sub override { 921sub override {
868 $override = 1; 922 $override = 1;
869 @invoke_results = (); 923 @INVOKE_RESULTS = (@_);
870} 924}
871 925
872sub do_invoke { 926sub do_invoke {
873 my $event = shift; 927 my $event = shift;
874 my $callbacks = shift; 928 my $callbacks = shift;
875 929
876 @invoke_results = (); 930 @INVOKE_RESULTS = ();
877 931
878 local $override; 932 local $override;
879 933
880 for (@$callbacks) { 934 for (@$callbacks) {
881 eval { &{$_->[1]} }; 935 eval { &{$_->[1]} };
898 952
899Generate an object-specific event with the given arguments. 953Generate an object-specific event with the given arguments.
900 954
901This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 955This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
902removed in future versions), and there is no public API to access override 956removed in future versions), and there is no public API to access override
903results (if you must, access C<@cf::invoke_results> directly). 957results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 958
905=back 959=back
906 960
907=cut 961=cut
908 962
909############################################################################# 963#############################################################################
910# object support 964# object support
965#
966
967sub _can_merge {
968 my ($ob1, $ob2) = @_;
969
970 local $Storable::canonical = 1;
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973
974 $fob1 eq $fob2
975}
911 976
912sub reattach { 977sub reattach {
913 # basically do the same as instantiate, without calling instantiate 978 # basically do the same as instantiate, without calling instantiate
914 my ($obj) = @_; 979 my ($obj) = @_;
915 980
960); 1025);
961 1026
962sub object_freezer_save { 1027sub object_freezer_save {
963 my ($filename, $rdata, $objs) = @_; 1028 my ($filename, $rdata, $objs) = @_;
964 1029
1030 my $guard = cf::lock_acquire "io";
1031
965 sync_job { 1032 sync_job {
966 if (length $$rdata) { 1033 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename);
967 warn sprintf "saving %s (%d,%d)\n", 1035 warn sprintf "saving %s (%d,%d)\n",
968 $filename, length $$rdata, scalar @$objs; 1036 $decname, length $$rdata, scalar @$objs;
969 1037
970 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
971 chmod SAVE_MODE, $fh; 1039 chmod SAVE_MODE, $fh;
972 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
973 aio_fsync $fh if $cf::USE_FSYNC; 1041 aio_fsync $fh if $cf::USE_FSYNC;
992 } 1060 }
993 } else { 1061 } else {
994 aio_unlink $filename; 1062 aio_unlink $filename;
995 aio_unlink "$filename.pst"; 1063 aio_unlink "$filename.pst";
996 } 1064 }
997 } 1065 };
1066
1067 undef $guard;
998} 1068}
999 1069
1000sub object_freezer_as_string { 1070sub object_freezer_as_string {
1001 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
1002 1072
1007 1077
1008sub object_thawer_load { 1078sub object_thawer_load {
1009 my ($filename) = @_; 1079 my ($filename) = @_;
1010 1080
1011 my ($data, $av); 1081 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1012 1084
1013 (aio_load $filename, $data) >= 0 1085 (aio_load $filename, $data) >= 0
1014 or return; 1086 or return;
1015 1087
1016 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
1017 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
1018 or return; 1090 or return;
1091
1092 undef $guard;
1019 $av = eval { (Storable::thaw $av)->{objs} }; 1093 $av = eval { (Storable::thaw $av)->{objs} };
1020 } 1094 }
1021 1095
1096 utf8::decode (my $decname = $filename);
1022 warn sprintf "loading %s (%d)\n", 1097 warn sprintf "loading %s (%d,%d)\n",
1023 $filename, length $data, scalar @{$av || []}; 1098 $decname, length $data, scalar @{$av || []};
1099
1024 return ($data, $av); 1100 ($data, $av)
1025} 1101}
1026 1102
1027=head2 COMMAND CALLBACKS 1103=head2 COMMAND CALLBACKS
1028 1104
1029=over 4 1105=over 4
1102 my ($pl, $buf) = @_; 1178 my ($pl, $buf) = @_;
1103 1179
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1180 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1181
1106 if (ref $msg) { 1182 if (ref $msg) {
1183 my ($type, $reply, @payload) =
1184 "ARRAY" eq ref $msg
1185 ? @$msg
1186 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1187
1188 my @reply;
1189
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1190 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1191 @reply = $cb->($pl, @payload);
1109 $pl->ext_reply ($msg->{msgid}, %reply);
1110 }
1111 } 1192 }
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196
1112 } else { 1197 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1199 }
1115 1200
1116 cf::override; 1201 cf::override;
1206 1291
1207=head3 cf::player 1292=head3 cf::player
1208 1293
1209=over 4 1294=over 4
1210 1295
1296=item cf::player::num_playing
1297
1298Returns the official number of playing players, as per the Crossfire metaserver rules.
1299
1300=cut
1301
1302sub num_playing {
1303 scalar grep
1304 $_->ob->map
1305 && !$_->hidden
1306 && !$_->ob->flag (cf::FLAG_WIZ),
1307 cf::player::list
1308}
1309
1211=item cf::player::find $login 1310=item cf::player::find $login
1212 1311
1213Returns the given player object, loading it if necessary (might block). 1312Returns the given player object, loading it if necessary (might block).
1214 1313
1215=cut 1314=cut
1250 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1349 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1350 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1351 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253 aio_unlink +(playerdir $login) . "/$login.pl"; 1352 aio_unlink +(playerdir $login) . "/$login.pl";
1254 1353
1255 my $pl = load_pl path $login 1354 my $f = new_from_file cf::object::thawer path $login
1256 or return; 1355 or return;
1356
1357 $f->next;
1358 my $pl = cf::player::load_pl $f
1359 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs;
1257 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1258 } 1363 }
1259 } 1364 }
1260} 1365}
1261 1366
1271 1376
1272 aio_mkdir playerdir $pl, 0770; 1377 aio_mkdir playerdir $pl, 0770;
1273 $pl->{last_save} = $cf::RUNTIME; 1378 $pl->{last_save} = $cf::RUNTIME;
1274 1379
1275 $pl->save_pl ($path); 1380 $pl->save_pl ($path);
1276 Coro::cede; 1381 cf::cede_to_tick;
1277} 1382}
1278 1383
1279sub new($) { 1384sub new($) {
1280 my ($login) = @_; 1385 my ($login) = @_;
1281 1386
1285 $self->{deny_save} = 1; 1390 $self->{deny_save} = 1;
1286 1391
1287 $cf::PLAYER{$login} = $self; 1392 $cf::PLAYER{$login} = $self;
1288 1393
1289 $self 1394 $self
1395}
1396
1397=item $player->send_msg ($channel, $msg, $color, [extra...])
1398
1399=cut
1400
1401sub send_msg {
1402 my $ns = shift->ns
1403 or return;
1404 $ns->send_msg (@_);
1290} 1405}
1291 1406
1292=item $pl->quit_character 1407=item $pl->quit_character
1293 1408
1294Nukes the player without looking back. If logged in, the connection will 1409Nukes the player without looking back. If logged in, the connection will
1349 or return []; 1464 or return [];
1350 1465
1351 my @logins; 1466 my @logins;
1352 1467
1353 for my $login (@$dirs) { 1468 for my $login (@$dirs) {
1469 my $path = path $login;
1470
1471 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") {
1354 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1356 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1357 1477
1358 utf8::decode $login; 1478 utf8::decode $login;
1359 push @logins, $login; 1479 push @logins, $login;
1360 } 1480 }
1361 1481
1399sub expand_cfpod { 1519sub expand_cfpod {
1400 ((my $self), (local $_)) = @_; 1520 ((my $self), (local $_)) = @_;
1401 1521
1402 # escape & and < 1522 # escape & and <
1403 s/&/&amp;/g; 1523 s/&/&amp;/g;
1404 s/(?<![BIUGH])</&lt;/g; 1524 s/(?<![BIUGHT])</&lt;/g;
1405 1525
1406 # this is buggy, it needs to properly take care of nested <'s 1526 # this is buggy, it needs to properly take care of nested <'s
1407 1527
1408 1 while 1528 1 while
1409 # replace B<>, I<>, U<> etc. 1529 # replace B<>, I<>, U<> etc.
1410 s/B<([^\>]*)>/<b>$1<\/b>/ 1530 s/B<([^\>]*)>/<b>$1<\/b>/
1411 || s/I<([^\>]*)>/<i>$1<\/i>/ 1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1412 || s/U<([^\>]*)>/<u>$1<\/u>/ 1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1413 # replace G<male|female> tags 1534 # replace G<male|female> tags
1414 || s{G<([^>|]*)\|([^>]*)>}{ 1535 || s{G<([^>|]*)\|([^>]*)>}{
1415 $self->gender ? $2 : $1 1536 $self->gender ? $2 : $1
1416 }ge 1537 }ge
1417 # replace H<hint text> 1538 # replace H<hint text>
1438sub hintmode { 1559sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1; 1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode} 1561 $_[0]{hintmode}
1441} 1562}
1442 1563
1443=item $player->ext_reply ($msgid, %msg) 1564=item $player->ext_reply ($msgid, @msg)
1444 1565
1445Sends an ext reply to the player. 1566Sends an ext reply to the player.
1446 1567
1447=cut 1568=cut
1448 1569
1449sub ext_reply($$%) { 1570sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1571 my ($self, $id, @msg) = @_;
1451 1572
1452 $msg{msgid} = $id; 1573 $self->ns->ext_reply ($id, @msg)
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454} 1574}
1455 1575
1456=item $player->ext_event ($type, %msg) 1576=item $player->ext_msg ($type, @msg)
1457 1577
1458Sends an ext event to the client. 1578Sends an ext event to the client.
1459 1579
1460=cut 1580=cut
1461 1581
1462sub ext_event($$%) { 1582sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1583 my ($self, $type, @msg) = @_;
1464 1584
1465 $self->ns->ext_event ($type, %msg); 1585 $self->ns->ext_msg ($type, @msg);
1466} 1586}
1467 1587
1468=head3 cf::region 1588=head3 cf::region
1469 1589
1470=over 4 1590=over 4
1483 my ($path) = @_; 1603 my ($path) = @_;
1484 1604
1485 my ($match, $specificity); 1605 my ($match, $specificity);
1486 1606
1487 for my $region (list) { 1607 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1608 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1609 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1610 if $region->specificity > $specificity;
1491 } 1611 }
1492 } 1612 }
1493 1613
1613 $self->init; # pass $1 etc. 1733 $self->init; # pass $1 etc.
1614 return $self; 1734 return $self;
1615 } 1735 }
1616 } 1736 }
1617 1737
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1738 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1739 ()
1620} 1740}
1621 1741
1622sub init { 1742sub init {
1623 my ($self) = @_; 1743 my ($self) = @_;
1686 1806
1687sub load_header_from($) { 1807sub load_header_from($) {
1688 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1689 1809
1690 utf8::encode $path; 1810 utf8::encode $path;
1691 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1692 # or return;
1693
1694 $self->_load_header ($path)
1695 or return; 1812 or return;
1813
1814 $self->_load_header ($f)
1815 or return;
1816
1817 local $MAP_LOADING{$self->{path}} = $self;
1818 $f->resolve_delayed_derefs;
1696 1819
1697 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1698 1821
1699 1 1822 1
1700} 1823}
1754sub find { 1877sub find {
1755 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1756 1879
1757 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1758 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1759 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1760 1884
1761 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1762 my $guard = cf::lock_acquire "map_find:$path"; 1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1763 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1764 or return; 1890 or return;
1765 1891
1766 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1767 1893
1769 or return; 1895 or return;
1770 1896
1771 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1772 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1773 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1774 $map->reset; 1902 $map->reset;
1775 undef $guard;
1776 return find $path; 1903 return find $path;
1777 } 1904 }
1778 1905
1779 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1780 } 1907 }
1789 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1790 1917
1791 my $path = $self->{path}; 1918 my $path = $self->{path};
1792 1919
1793 { 1920 {
1794 my $guard = cf::lock_acquire "map_load:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1795 1922
1923 return unless $self->valid;
1796 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1797 1925
1798 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1799 1927
1800 $self->alloc; 1928 $self->alloc;
1801 1929
1802 $self->pre_load; 1930 $self->pre_load;
1803 Coro::cede; 1931 cf::cede_to_tick;
1804 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1805 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1806 or return; 1936 or return;
1807 1937
1808 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1809 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1810 1940
1811 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1812 utf8::encode $uniq; 1942 utf8::encode $uniq;
1813 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1814 $self->clear_unique_items; 1945 $self->clear_unique_items;
1815 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1816 } 1949 }
1817 } 1950 }
1818 1951
1819 Coro::cede; 1952 $f->resolve_delayed_derefs;
1953
1954 cf::cede_to_tick;
1820 # now do the right thing for maps 1955 # now do the right thing for maps
1821 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1822 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
1823 unless $self->difficulty; 1958 unless $self->difficulty;
1824 Coro::cede; 1959 cf::cede_to_tick;
1825 1960
1826 unless ($self->{deny_activate}) { 1961 unless ($self->{deny_activate}) {
1827 $self->decay_objects; 1962 $self->decay_objects;
1828 $self->fix_auto_apply; 1963 $self->fix_auto_apply;
1829 $self->update_buttons; 1964 $self->update_buttons;
1830 Coro::cede; 1965 cf::cede_to_tick;
1831 $self->set_darkness_map; 1966 $self->set_darkness_map;
1832 Coro::cede; 1967 cf::cede_to_tick;
1833 $self->activate; 1968 $self->activate;
1834 } 1969 }
1970
1971 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME);
1835 1973
1836 $self->in_memory (cf::MAP_IN_MEMORY); 1974 $self->in_memory (cf::MAP_IN_MEMORY);
1837 } 1975 }
1838 1976
1839 $self->post_load; 1977 $self->post_load;
1850 1988
1851 $self 1989 $self
1852} 1990}
1853 1991
1854# find and load all maps in the 3x3 area around a map 1992# find and load all maps in the 3x3 area around a map
1855sub load_diag { 1993sub load_neighbours {
1856 my ($map) = @_; 1994 my ($map) = @_;
1857 1995
1858 my @diag; # diagonal neighbours 1996 my @neigh; # diagonal neighbours
1859 1997
1860 for (0 .. 3) { 1998 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_) 1999 my $neigh = $map->tile_path ($_)
1862 or next; 2000 or next;
1863 $neigh = find $neigh, $map 2001 $neigh = find $neigh, $map
1864 or next; 2002 or next;
1865 $neigh->load; 2003 $neigh->load;
1866 2004
2005 push @neigh,
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2006 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2007 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 } 2008 }
1870 2009
1871 for (@diag) { 2010 for (grep defined $_->[0], @neigh) {
2011 my ($path, $origin) = @$_;
1872 my $neigh = find @$_ 2012 my $neigh = find $path, $origin
1873 or next; 2013 or next;
1874 $neigh->load; 2014 $neigh->load;
1875 } 2015 }
1876} 2016}
1877 2017
1882} 2022}
1883 2023
1884sub do_load_sync { 2024sub do_load_sync {
1885 my ($map) = @_; 2025 my ($map) = @_;
1886 2026
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main;
2029
1887 cf::sync_job { $map->load }; 2030 cf::sync_job { $map->load };
1888} 2031}
1889 2032
1890our %MAP_PREFETCH; 2033our %MAP_PREFETCH;
1891our $MAP_PREFETCHER = undef; 2034our $MAP_PREFETCHER = undef;
1892 2035
1893sub find_async { 2036sub find_async {
1894 my ($path, $origin) = @_; 2037 my ($path, $origin, $load) = @_;
1895 2038
1896 $path = normalise $path, $origin && $origin->{path}; 2039 $path = normalise $path, $origin && $origin->{path};
1897 2040
1898 if (my $map = $cf::MAP{$path}) { 2041 if (my $map = $cf::MAP{$path}) {
1899 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1900 } 2043 }
1901 2044
1902 undef $MAP_PREFETCH{$path}; 2045 $MAP_PREFETCH{$path} |= $load;
2046
1903 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
1904 while (%MAP_PREFETCH) { 2048 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 2049 while (my ($k, $v) = each %MAP_PREFETCH) {
1906 my $map = find $path 2050 if (my $map = find $k) {
1907 or next;
1908 $map->load; 2051 $map->load if $v;
2052 }
1909 2053
1910 delete $MAP_PREFETCH{$path}; 2054 delete $MAP_PREFETCH{$k};
1911 } 2055 }
1912 } 2056 }
1913 undef $MAP_PREFETCHER; 2057 undef $MAP_PREFETCHER;
1914 }; 2058 };
1915 $MAP_PREFETCHER->prio (6); 2059 $MAP_PREFETCHER->prio (6);
1918} 2062}
1919 2063
1920sub save { 2064sub save {
1921 my ($self) = @_; 2065 my ($self) = @_;
1922 2066
1923 my $lock = cf::lock_acquire "map_data:" . $self->path; 2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
1924 2068
1925 $self->{last_save} = $cf::RUNTIME; 2069 $self->{last_save} = $cf::RUNTIME;
1926 2070
1927 return unless $self->dirty; 2071 return unless $self->dirty;
1928 2072
1951 my ($self) = @_; 2095 my ($self) = @_;
1952 2096
1953 # save first because save cedes 2097 # save first because save cedes
1954 $self->save; 2098 $self->save;
1955 2099
1956 my $lock = cf::lock_acquire "map_data:" . $self->path; 2100 my $lock = cf::lock_acquire "map_data:$self->{path}";
1957 2101
1958 return if $self->players; 2102 return if $self->players;
1959 return if $self->in_memory != cf::MAP_IN_MEMORY; 2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
1960 return if $self->{deny_save}; 2104 return if $self->{deny_save};
1961 2105
2106 $self->in_memory (cf::MAP_SWAPPED);
2107
2108 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP;
1962 $self->clear; 2110 $self->clear;
1963 $self->in_memory (cf::MAP_SWAPPED);
1964} 2111}
1965 2112
1966sub reset_at { 2113sub reset_at {
1967 my ($self) = @_; 2114 my ($self) = @_;
1968 2115
2000 if $uniq; 2147 if $uniq;
2001 } 2148 }
2002 2149
2003 delete $cf::MAP{$self->path}; 2150 delete $cf::MAP{$self->path};
2004 2151
2152 $self->deactivate;
2153 $_->clear_links_to ($self) for values %cf::MAP;
2005 $self->clear; 2154 $self->clear;
2006
2007 $_->clear_links_to ($self) for values %cf::MAP;
2008 2155
2009 $self->unlink_save; 2156 $self->unlink_save;
2010 $self->destroy; 2157 $self->destroy;
2011} 2158}
2012 2159
2013my $nuke_counter = "aaaa"; 2160my $nuke_counter = "aaaa";
2014 2161
2015sub nuke { 2162sub nuke {
2016 my ($self) = @_; 2163 my ($self) = @_;
2017 2164
2165 {
2166 my $lock = cf::lock_acquire "map_data:$self->{path}";
2167
2018 delete $cf::MAP{$self->path}; 2168 delete $cf::MAP{$self->path};
2019 2169
2020 $self->unlink_save; 2170 $self->unlink_save;
2021 2171
2022 bless $self, "cf::map"; 2172 bless $self, "cf::map";
2023 delete $self->{deny_reset}; 2173 delete $self->{deny_reset};
2024 $self->{deny_save} = 1; 2174 $self->{deny_save} = 1;
2025 $self->reset_timeout (1); 2175 $self->reset_timeout (1);
2026 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2176 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027 2177
2028 $cf::MAP{$self->path} = $self; 2178 $cf::MAP{$self->path} = $self;
2179 }
2029 2180
2030 $self->reset; # polite request, might not happen 2181 $self->reset; # polite request, might not happen
2031} 2182}
2032 2183
2033=item $maps = cf::map::tmp_maps 2184=item $maps = cf::map::tmp_maps
2109 2260
2110sub inv_recursive { 2261sub inv_recursive {
2111 inv_recursive_ inv $_[0] 2262 inv_recursive_ inv $_[0]
2112} 2263}
2113 2264
2265=item $ref = $ob->ref
2266
2267creates and returns a persistent reference to an objetc that can be stored as a string.
2268
2269=item $ob = cf::object::deref ($refstring)
2270
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block.
2273
2274=cut
2275
2276sub deref {
2277 my ($ref) = @_;
2278
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return;
2286 $pl->ob->uuid eq $uuid
2287 or return;
2288
2289 $pl->ob
2290 } else {
2291 warn "$ref: cannot resolve object reference\n";
2292 undef
2293 }
2294}
2295
2114package cf; 2296package cf;
2115 2297
2116=back 2298=back
2117 2299
2118=head3 cf::object::player 2300=head3 cf::object::player
2140 2322
2141 } else { 2323 } else {
2142 my $pl = $self->contr; 2324 my $pl = $self->contr;
2143 2325
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2326 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2327 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147 $diag->{id},
2148 msgtype => "reply",
2149 msg => $diag->{pl}->expand_cfpod ($msg),
2150 add_topics => []
2151 );
2152 2329
2153 } else { 2330 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2331 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2332 $self->message ($msg, $flags);
2156 } 2333 }
2157 } 2334 }
2335}
2336
2337=item $object->send_msg ($channel, $msg, $color, [extra...])
2338
2339=cut
2340
2341sub cf::object::send_msg {
2342 my $pl = shift->contr
2343 or return;
2344 $pl->send_msg (@_);
2158} 2345}
2159 2346
2160=item $player_object->may ("access") 2347=item $player_object->may ("access")
2161 2348
2162Returns wether the given player is authorized to access resource "access" 2349Returns wether the given player is authorized to access resource "access"
2241 # use -1 or undef as default coordinates, not 0, 0 2428 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2429 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2430 if $x <=0 && $y <= 0;
2244 2431
2245 $map->load; 2432 $map->load;
2246 $map->load_diag; 2433 $map->load_neighbours;
2247 2434
2248 return unless $self->contr->active; 2435 return unless $self->contr->active;
2249 $self->activate_recursive; 2436 $self->activate_recursive;
2250 2437
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2439 $self->enter_map ($map, $x, $y);
2253} 2440}
2254 2441
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2443
2257Moves the player to the given map-path and coordinates by first freezing 2444Moves the player to the given map-path and coordinates by first freezing
2258her, loading and preparing them map, calling the provided $check callback 2445her, loading and preparing them map, calling the provided $check callback
2259that has to return the map if sucecssful, and then unfreezes the player on 2446that has to return the map if sucecssful, and then unfreezes the player on
2260the new (success) or old (failed) map position. 2447the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process.
2261 2449
2262=cut 2450=cut
2263 2451
2264our $GOTOGEN; 2452our $GOTOGEN;
2265 2453
2266sub cf::object::player::goto { 2454sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2455 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2456
2269 # do generation counting so two concurrent goto's will be executed in-order 2457 # do generation counting so two concurrent goto's will be executed in-order
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2459
2272 $self->enter_link; 2460 $self->enter_link;
2273 2461
2274 (async { 2462 (async {
2463 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs];
2467
2468 # todo: use ob_blocked to check all tiles of the destination "object"
2469 # for suitability.
2470
2471 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2472 }
2473 }
2474
2275 my $map = eval { 2475 my $map = eval {
2276 my $map = cf::map::find $path; 2476 my $map = cf::map::find $path;
2277 2477
2278 if ($map) { 2478 if ($map) {
2279 $map = $map->customise_for ($self); 2479 $map = $map->customise_for ($self);
2292 2492
2293 if ($gen == $self->{_goto_generation}) { 2493 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2494 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2495 $self->leave_link ($map, $x, $y);
2296 } 2496 }
2497
2498 $done->() if $done;
2297 })->prio (1); 2499 })->prio (1);
2298} 2500}
2299 2501
2300=item $player_object->enter_exit ($exit_object) 2502=item $player_object->enter_exit ($exit_object)
2301 2503
2410 2612
2411 utf8::encode $text; 2613 utf8::encode $text;
2412 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2614 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2413} 2615}
2414 2616
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2617=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2618
2417Send a drawinfo or msg packet to the client, formatting the msg for the 2619Send a drawinfo or msg packet to the client, formatting the msg for the
2418client if neccessary. C<$type> should be a string identifying the type of 2620client if neccessary. C<$type> should be a string identifying the type of
2419the message, with C<log> being the default. If C<$color> is negative, suppress 2621the message, with C<log> being the default. If C<$color> is negative, suppress
2420the message unless the client supports the msg packet. 2622the message unless the client supports the msg packet.
2421 2623
2422=cut 2624=cut
2423 2625
2626our %CHANNEL = (
2627 "c/identify" => {
2628 id => "identify",
2629 title => "Identify",
2630 reply => undef,
2631 tooltip => "Items recently identified",
2632 },
2633 "c/examine" => {
2634 id => "examine",
2635 title => "Examine",
2636 reply => undef,
2637 tooltip => "Signs and other items you examined",
2638 },
2639);
2640
2424sub cf::client::send_msg { 2641sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2642 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2643
2427 $msg = $self->pl->expand_cfpod ($msg); 2644 $msg = $self->pl->expand_cfpod ($msg);
2428 2645
2646 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647
2648 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2650
2651 if (ref $channel) {
2652 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg;
2657 }
2658
2659 $channel = $channel->{id};
2660 }
2661
2429 return unless @extra || length $msg; 2662 return unless @extra || length $msg;
2430 2663
2431 if ($self->can_msg) { 2664 if ($self->can_msg) {
2665 # default colour, mask it out
2666 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2667 if $color & cf::NDI_DEF;
2668
2432 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2669 $self->send_packet ("msg " . $self->{json_coder}->encode (
2670 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2433 } else { 2671 } else {
2434 # replace some tags by gcfclient-compatible ones
2435 for ($msg) {
2436 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442 }
2443
2444 if ($color >= 0) { 2672 if ($color >= 0) {
2673 # replace some tags by gcfclient-compatible ones
2674 for ($msg) {
2675 1 while
2676 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2677 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2678 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2679 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2680 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2681 }
2682
2683 $color &= cf::NDI_COLOR_MASK;
2684
2685 utf8::encode $msg;
2686
2445 if (0 && $msg =~ /\[/) { 2687 if (0 && $msg =~ /\[/) {
2688 # COMMAND/INFO
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2689 $self->send_packet ("drawextinfo $color 10 8 $msg")
2447 } else { 2690 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2691 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg") 2692 $self->send_packet ("drawinfo $color $msg")
2450 } 2693 }
2451 } 2694 }
2452 } 2695 }
2453} 2696}
2454 2697
2455=item $client->ext_event ($type, %msg) 2698=item $client->ext_msg ($type, @msg)
2456 2699
2457Sends an ext event to the client. 2700Sends an ext event to the client.
2458 2701
2459=cut 2702=cut
2460 2703
2461sub cf::client::ext_event($$%) { 2704sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2705 my ($self, $type, @msg) = @_;
2463 2706
2707 if ($self->extcmd == 2) {
2708 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2709 } elsif ($self->extcmd == 1) { # TODO: remove
2464 $msg{msgtype} = "event_$type"; 2710 push @msg, msgtype => "event_$type";
2465 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2711 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2712 }
2713}
2714
2715=item $client->ext_reply ($msgid, @msg)
2716
2717Sends an ext reply to the client.
2718
2719=cut
2720
2721sub cf::client::ext_reply($$@) {
2722 my ($self, $id, @msg) = @_;
2723
2724 if ($self->extcmd == 2) {
2725 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2726 } elsif ($self->extcmd == 1) {
2727 #TODO: version 1, remove
2728 unshift @msg, msgtype => "reply", msgid => $id;
2729 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2730 }
2466} 2731}
2467 2732
2468=item $success = $client->query ($flags, "text", \&cb) 2733=item $success = $client->query ($flags, "text", \&cb)
2469 2734
2470Queues a query to the client, calling the given callback with 2735Queues a query to the client, calling the given callback with
2525 my ($ns, $buf) = @_; 2790 my ($ns, $buf) = @_;
2526 2791
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2792 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 2793
2529 if (ref $msg) { 2794 if (ref $msg) {
2795 my ($type, $reply, @payload) =
2796 "ARRAY" eq ref $msg
2797 ? @$msg
2798 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2799
2800 my @reply;
2801
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2802 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 2803 @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 } 2804 }
2805
2806 $ns->ext_reply ($reply, @reply)
2807 if $reply;
2808
2536 } else { 2809 } else {
2537 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2810 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2538 } 2811 }
2539 2812
2540 cf::override; 2813 cf::override;
2587our $safe = new Safe "safe"; 2860our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 2861our $safe_hole = new Safe::Hole;
2589 2862
2590$SIG{FPE} = 'IGNORE'; 2863$SIG{FPE} = 'IGNORE';
2591 2864
2592$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2865$safe->permit_only (Opcode::opset qw(
2866 :base_core :base_mem :base_orig :base_math
2867 grepstart grepwhile mapstart mapwhile
2868 sort time
2869));
2593 2870
2594# here we export the classes and methods available to script code 2871# here we export the classes and methods available to script code
2595 2872
2596=pod 2873=pod
2597 2874
2598The following functions and methods are available within a safe environment: 2875The following functions and methods are available within a safe environment:
2599 2876
2600 cf::object 2877 cf::object
2601 contr pay_amount pay_player map x y force_find force_add 2878 contr pay_amount pay_player map x y force_find force_add
2602 insert remove 2879 insert remove name archname title slaying race decrease_ob_nr
2603 2880
2604 cf::object::player 2881 cf::object::player
2605 player 2882 player
2606 2883
2607 cf::player 2884 cf::player
2612 2889
2613=cut 2890=cut
2614 2891
2615for ( 2892for (
2616 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2894 insert remove inv name archname title slaying race
2617 insert remove)], 2895 decrease_ob_nr)],
2618 ["cf::object::player" => qw(player)], 2896 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 2897 ["cf::player" => qw(peaceful)],
2620 ["cf::map" => qw(trigger)], 2898 ["cf::map" => qw(trigger)],
2621) { 2899) {
2622 no strict 'refs'; 2900 no strict 'refs';
2698# the server's init and main functions 2976# the server's init and main functions
2699 2977
2700sub load_facedata($) { 2978sub load_facedata($) {
2701 my ($path) = @_; 2979 my ($path) = @_;
2702 2980
2981 # HACK to clear player env face cache, we need some signal framework
2982 # for this (global event?)
2983 %ext::player_env::MUSIC_FACE_CACHE = ();
2984
2985 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2986
2703 warn "loading facedata from $path\n"; 2987 warn "loading facedata from $path\n";
2704 2988
2705 my $facedata; 2989 my $facedata;
2706 0 < aio_load $path, $facedata 2990 0 < aio_load $path, $facedata
2707 or die "$path: $!"; 2991 or die "$path: $!";
2709 $facedata = Coro::Storable::thaw $facedata; 2993 $facedata = Coro::Storable::thaw $facedata;
2710 2994
2711 $facedata->{version} == 2 2995 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 2996 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 2997
2998 # patch in the exptable
2999 $facedata->{resource}{"res/exp_table"} = {
3000 type => FT_RSRC,
3001 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3002 };
3003 cf::cede_to_tick;
3004
2714 { 3005 {
2715 my $faces = $facedata->{faceinfo}; 3006 my $faces = $facedata->{faceinfo};
2716 3007
2717 while (my ($face, $info) = each %$faces) { 3008 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3009 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3010 cf::face::set_visibility $idx, $info->{visibility};
3011 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722 Coro::cede; 3014
3015 cf::cede_to_tick;
2723 } 3016 }
2724 3017
2725 while (my ($face, $info) = each %$faces) { 3018 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 3019 next unless $info->{smooth};
2727 my $idx = cf::face::find $face 3020 my $idx = cf::face::find $face
2728 or next; 3021 or next;
2729 if (my $smooth = cf::face::find $info->{smooth}) { 3022 if (my $smooth = cf::face::find $info->{smooth}) {
3023 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3024 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 3025 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3026 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 3027 }
2734 Coro::cede; 3028
3029 cf::cede_to_tick;
2735 } 3030 }
2736 } 3031 }
2737 3032
2738 { 3033 {
2739 my $anims = $facedata->{animinfo}; 3034 my $anims = $facedata->{animinfo};
2740 3035
2741 while (my ($anim, $info) = each %$anims) { 3036 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3037 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 3038 cf::cede_to_tick;
2744 } 3039 }
2745 3040
2746 cf::anim::invalidate_all; # d'oh 3041 cf::anim::invalidate_all; # d'oh
2747 } 3042 }
2748 3043
3044 {
3045 # TODO: for gcfclient pleasure, we should give resources
3046 # that gcfclient doesn't grok a >10000 face index.
3047 my $res = $facedata->{resource};
3048
3049 my $soundconf = delete $res->{"res/sound.conf"};
3050
3051 while (my ($name, $info) = each %$res) {
3052 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data;
3054
3055 if ($info->{type} & 1) {
3056 # prepend meta info
3057
3058 my $meta = $enc->encode ({
3059 name => $name,
3060 %{ $info->{meta} || {} },
3061 });
3062
3063 $data = pack "(w/a*)*", $meta, $info->{data};
3064 } else {
3065 $data = $info->{data};
3066 }
3067
3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3069 cf::face::set_type $idx, $info->{type};
3070
3071 cf::cede_to_tick;
3072 }
3073
3074 if ($soundconf) {
3075 $soundconf = $enc->decode (delete $soundconf->{data});
3076
3077 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3078 my $sound = $soundconf->{compat}[$_]
3079 or next;
3080
3081 my $face = cf::face::find "sound/$sound->[1]";
3082 cf::sound::set $sound->[0] => $face;
3083 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3084 }
3085
3086 while (my ($k, $v) = each %{$soundconf->{event}}) {
3087 my $face = cf::face::find "sound/$v";
3088 cf::sound::set $k => $face;
3089 }
3090 }
3091 }
3092
2749 1 3093 1
2750} 3094}
2751 3095
3096register_exticmd fx_want => sub {
3097 my ($ns, $want) = @_;
3098
3099 while (my ($k, $v) = each %$want) {
3100 $ns->fx_want ($k, $v);
3101 }
3102};
3103
2752sub reload_regions { 3104sub reload_regions {
3105 # HACK to clear player env face cache, we need some signal framework
3106 # for this (global event?)
3107 %ext::player_env::MUSIC_FACE_CACHE = ();
3108
2753 load_resource_file "$MAPDIR/regions" 3109 load_resource_file "$MAPDIR/regions"
2754 or die "unable to load regions file\n"; 3110 or die "unable to load regions file\n";
3111
3112 for (cf::region::list) {
3113 $_->{match} = qr/$_->{match}/
3114 if exists $_->{match};
3115 }
2755} 3116}
2756 3117
2757sub reload_facedata { 3118sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 3119 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 3120 or die "unable to load facedata\n";
2788 3149
2789sub init { 3150sub init {
2790 reload_resources; 3151 reload_resources;
2791} 3152}
2792 3153
2793sub cfg_load { 3154sub reload_config {
2794 open my $fh, "<:utf8", "$CONFDIR/config" 3155 open my $fh, "<:utf8", "$CONFDIR/config"
2795 or return; 3156 or return;
2796 3157
2797 local $/; 3158 local $/;
2798 *CFG = YAML::Syck::Load <$fh>; 3159 *CFG = YAML::Syck::Load <$fh>;
2818 (async { 3179 (async {
2819 Event::one_event; 3180 Event::one_event;
2820 })->prio (Coro::PRIO_MAX); 3181 })->prio (Coro::PRIO_MAX);
2821 }; 3182 };
2822 3183
2823 cfg_load; 3184 reload_config;
2824 db_init; 3185 db_init;
2825 load_extensions; 3186 load_extensions;
2826 3187
2827 $TICK_WATCHER->start; 3188 $TICK_WATCHER->start;
2828 Event::loop; 3189 Event::loop;
3021 warn "reloading cf.pm"; 3382 warn "reloading cf.pm";
3022 require cf; 3383 require cf;
3023 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3384 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024 3385
3025 warn "loading config and database again"; 3386 warn "loading config and database again";
3026 cf::cfg_load; 3387 cf::reload_config;
3027 3388
3028 warn "loading extensions"; 3389 warn "loading extensions";
3029 cf::load_extensions; 3390 cf::load_extensions;
3030 3391
3031 warn "reattaching attachments to objects/players"; 3392 warn "reattaching attachments to objects/players";
3096 my $signal = new Coro::Signal; 3457 my $signal = new Coro::Signal;
3097 push @WAIT_FOR_TICK_BEGIN, $signal; 3458 push @WAIT_FOR_TICK_BEGIN, $signal;
3098 $signal->wait; 3459 $signal->wait;
3099} 3460}
3100 3461
3101 my $min = 1e6;#d# 3462our $stat_fh;
3102 my $avg = 10; 3463sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3464
3103$TICK_WATCHER = Event->timer ( 3465$TICK_WATCHER = Event->timer (
3104 reentrant => 0, 3466 reentrant => 0,
3105 parked => 1, 3467 parked => 1,
3106 prio => 0, 3468 prio => 0,
3107 at => $NEXT_TICK || $TICK, 3469 at => $NEXT_TICK || $TICK,
3111 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3473 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3112 unless ++$bug_warning > 10; 3474 unless ++$bug_warning > 10;
3113 return; 3475 return;
3114 } 3476 }
3115 3477
3478 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3479
3116 $NOW = $tick_start = Event::time; 3480 $NOW = $tick_start = Event::time;
3117 3481
3118 cf::server_tick; # one server iteration 3482 cf::server_tick; # one server iteration
3119
3120 0 && sync_job {#d#
3121 for(1..10) {
3122 my $t = Event::time;
3123 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3124 or die;
3125
3126 $map->width (50);
3127 $map->height (50);
3128 $map->alloc;
3129 $map->_load_objects ("/tmp/x.map", 1);
3130 my $t = Event::time - $t;
3131
3132 #next unless $t < 0.0013;#d#
3133 if ($t < $min) {
3134 $min = $t;
3135 }
3136 $avg = $avg * 0.99 + $t * 0.01;
3137 }
3138 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3139 exit 0;
3140 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3141 };
3142 3483
3143 $RUNTIME += $TICK; 3484 $RUNTIME += $TICK;
3144 $NEXT_TICK += $TICK; 3485 $NEXT_TICK += $TICK;
3145 3486
3146 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3487 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3172 $LOAD = ($NOW - $tick_start) / $TICK; 3513 $LOAD = ($NOW - $tick_start) / $TICK;
3173 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3174 3515
3175 _post_tick; 3516 _post_tick;
3176 3517
3177 3518 # gather some statistics#d#
3519 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3520 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3178 }, 3521 },
3179); 3522);
3180 3523
3181{ 3524{
3525 BDB::min_parallel 8;
3182 BDB::max_poll_time $TICK * 0.1; 3526 BDB::max_poll_time $TICK * 0.1;
3183 $BDB_POLL_WATCHER = Event->io ( 3527 $BDB_POLL_WATCHER = Event->io (
3184 reentrant => 0, 3528 reentrant => 0,
3185 fd => BDB::poll_fileno, 3529 fd => BDB::poll_fileno,
3186 poll => 'r', 3530 poll => 'r',
3187 prio => 0, 3531 prio => 0,
3188 data => WF_AUTOCANCEL, 3532 data => WF_AUTOCANCEL,
3189 cb => \&BDB::poll_cb, 3533 cb => \&BDB::poll_cb,
3190 ); 3534 );
3191 BDB::min_parallel 8;
3192 3535
3193 BDB::set_sync_prepare { 3536 BDB::set_sync_prepare {
3194 my $status; 3537 my $status;
3195 my $current = $Coro::current; 3538 my $current = $Coro::current;
3196 ( 3539 (
3217 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3560 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3218 0666; 3561 0666;
3219 3562
3220 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3563 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3221 3564
3222 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3565 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3566 | BDB::LOG_AUTOREMOVE, 1);
3223 $DB_ENV->set_lk_detect; 3567 $DB_ENV->set_lk_detect;
3224 }; 3568 };
3225 3569
3226 cf::cleanup "db_env_open(db): $@" if $@; 3570 cf::cleanup "db_env_open(db): $@" if $@;
3227 }; 3571 };
3228 } 3572 }
3573
3574 $BDB_CHECKPOINT_WATCHER = Event->timer (
3575 after => 11,
3576 interval => 60,
3577 hard => 1,
3578 prio => 0,
3579 data => WF_AUTOCANCEL,
3580 cb => sub {
3581 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3582 },
3583 );
3584 $BDB_TRICKLE_WATCHER = Event->timer (
3585 after => 5,
3586 interval => 10,
3587 hard => 1,
3588 prio => 0,
3589 data => WF_AUTOCANCEL,
3590 cb => sub {
3591 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3592 },
3593 );
3229} 3594}
3230 3595
3231{ 3596{
3232 IO::AIO::min_parallel 8; 3597 IO::AIO::min_parallel 8;
3233 3598

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines