… | |
… | |
21 | use Coro::Semaphore; |
21 | use Coro::Semaphore; |
22 | use Coro::AIO; |
22 | use Coro::AIO; |
23 | use Coro::Storable; |
23 | use Coro::Storable; |
24 | use Coro::Util (); |
24 | use Coro::Util (); |
25 | |
25 | |
26 | use JSON::XS 1.4 (); |
26 | use JSON::XS (); |
27 | use BDB (); |
27 | use BDB (); |
28 | use Data::Dumper; |
28 | use Data::Dumper; |
29 | use Digest::MD5; |
29 | use Digest::MD5; |
30 | use Fcntl; |
30 | use Fcntl; |
31 | use YAML::Syck (); |
31 | use YAML::Syck (); |
… | |
… | |
80 | our $NEXT_TICK; |
80 | our $NEXT_TICK; |
81 | our $NOW; |
81 | our $NOW; |
82 | our $USE_FSYNC = 1; # use fsync to write maps - default off |
82 | our $USE_FSYNC = 1; # use fsync to write maps - default off |
83 | |
83 | |
84 | our $BDB_POLL_WATCHER; |
84 | our $BDB_POLL_WATCHER; |
|
|
85 | our $BDB_DEADLOCK_WATCHER; |
|
|
86 | our $BDB_CHECKPOINT_WATCHER; |
|
|
87 | our $BDB_TRICKLE_WATCHER; |
85 | our $DB_ENV; |
88 | our $DB_ENV; |
86 | |
89 | |
87 | our %CFG; |
90 | our %CFG; |
88 | |
91 | |
89 | our $UPTIME; $UPTIME ||= time; |
92 | our $UPTIME; $UPTIME ||= time; |
90 | our $RUNTIME; |
93 | our $RUNTIME; |
91 | |
94 | |
92 | our %PLAYER; # all users |
95 | our (%PLAYER, %PLAYER_LOADING); # all users |
93 | our %MAP; # all maps |
96 | our (%MAP, %MAP_LOADING ); # all maps |
94 | our $LINK_MAP; # the special {link} map, which is always available |
97 | our $LINK_MAP; # the special {link} map, which is always available |
95 | |
98 | |
96 | # 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 ∕ |
97 | our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons |
100 | our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons |
98 | |
101 | |
… | |
… | |
187 | $msg .= "\n" |
190 | $msg .= "\n" |
188 | unless $msg =~ /\n$/; |
191 | unless $msg =~ /\n$/; |
189 | |
192 | |
190 | $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; |
191 | |
194 | |
192 | utf8::encode $msg; |
|
|
193 | LOG llevError, $msg; |
195 | LOG llevError, $msg; |
194 | }; |
196 | }; |
195 | } |
197 | } |
196 | |
198 | |
197 | @safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; |
199 | @safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; |
… | |
… | |
272 | Wait until the given lock is available and then acquires it and returns |
274 | Wait until the given lock is available and then acquires it and returns |
273 | a Coro::guard object. If the guard object gets destroyed (goes out of scope, |
275 | a Coro::guard object. If the guard object gets destroyed (goes out of scope, |
274 | for example when the coroutine gets canceled), the lock is automatically |
276 | for example when the coroutine gets canceled), the lock is automatically |
275 | returned. |
277 | returned. |
276 | |
278 | |
|
|
279 | Locks are *not* recursive, locking from the same coro twice results in a |
|
|
280 | deadlocked coro. |
|
|
281 | |
277 | Lock names should begin with a unique identifier (for example, cf::map::find |
282 | Lock names should begin with a unique identifier (for example, cf::map::find |
278 | uses map_find and cf::map::load uses map_load). |
283 | uses map_find and cf::map::load uses map_load). |
279 | |
284 | |
280 | =item $locked = cf::lock_active $string |
285 | =item $locked = cf::lock_active $string |
281 | |
286 | |
282 | Return true if the lock is currently active, i.e. somebody has locked it. |
287 | Return true if the lock is currently active, i.e. somebody has locked it. |
283 | |
288 | |
284 | =cut |
289 | =cut |
285 | |
290 | |
286 | our %LOCK; |
291 | our %LOCK; |
|
|
292 | our %LOCKER;#d# |
287 | |
293 | |
288 | sub lock_wait($) { |
294 | sub lock_wait($) { |
289 | 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# |
290 | |
301 | |
291 | # wait for lock, if any |
302 | # wait for lock, if any |
292 | while ($LOCK{$key}) { |
303 | while ($LOCK{$key}) { |
293 | push @{ $LOCK{$key} }, $Coro::current; |
304 | push @{ $LOCK{$key} }, $Coro::current; |
294 | Coro::schedule; |
305 | Coro::schedule; |
… | |
… | |
300 | |
311 | |
301 | # wait, to be sure we are not locked |
312 | # wait, to be sure we are not locked |
302 | lock_wait $key; |
313 | lock_wait $key; |
303 | |
314 | |
304 | $LOCK{$key} = []; |
315 | $LOCK{$key} = []; |
|
|
316 | $LOCKER{$key} = $Coro::current;#d# |
305 | |
317 | |
306 | Coro::guard { |
318 | Coro::guard { |
|
|
319 | delete $LOCKER{$key};#d# |
307 | # wake up all waiters, to be on the safe side |
320 | # wake up all waiters, to be on the safe side |
308 | $_->ready for @{ delete $LOCK{$key} }; |
321 | $_->ready for @{ delete $LOCK{$key} }; |
309 | } |
322 | } |
310 | } |
323 | } |
311 | |
324 | |
… | |
… | |
478 | sub fork_call(&@) { |
491 | sub fork_call(&@) { |
479 | my ($cb, @args) = @_; |
492 | my ($cb, @args) = @_; |
480 | |
493 | |
481 | # we seemingly have to make a local copy of the whole thing, |
494 | # we seemingly have to make a local copy of the whole thing, |
482 | # otherwise perl prematurely frees the stuff :/ |
495 | # otherwise perl prematurely frees the stuff :/ |
483 | # TODO: investigate and fix (liekly this will be rather laborious) |
496 | # TODO: investigate and fix (likely this will be rather laborious) |
484 | |
497 | |
485 | my @res = Coro::Util::fork_eval { |
498 | my @res = Coro::Util::fork_eval { |
486 | reset_signals; |
499 | reset_signals; |
487 | &$cb |
500 | &$cb |
488 | }, @args; |
501 | }, @args; |
… | |
… | |
497 | =item cf::db_put $family => $key => $value |
510 | =item cf::db_put $family => $key => $value |
498 | |
511 | |
499 | Stores the given C<$value> in the family. It can currently store binary |
512 | Stores the given C<$value> in the family. It can currently store binary |
500 | data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). |
513 | data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). |
501 | |
514 | |
|
|
515 | =item $db = cf::db_table "name" |
|
|
516 | |
|
|
517 | Create and/or open a new database table. The string must not be "db" and must be unique |
|
|
518 | within each server. |
|
|
519 | |
502 | =cut |
520 | =cut |
|
|
521 | |
|
|
522 | sub 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 | } |
503 | |
538 | |
504 | our $DB; |
539 | our $DB; |
505 | |
540 | |
506 | sub db_init { |
541 | sub db_init { |
507 | unless ($DB) { |
|
|
508 | $DB = BDB::db_create $DB_ENV; |
|
|
509 | |
|
|
510 | cf::sync_job { |
542 | cf::sync_job { |
511 | eval { |
543 | $DB ||= db_table "db"; |
512 | $DB->set_flags (BDB::CHKSUM); |
|
|
513 | |
|
|
514 | BDB::db_open $DB, undef, "db", undef, BDB::BTREE, |
|
|
515 | BDB::CREATE | BDB::AUTO_COMMIT, 0666; |
|
|
516 | cf::cleanup "db_open(db): $!" if $!; |
|
|
517 | }; |
|
|
518 | cf::cleanup "db_open(db): $@" if $@; |
|
|
519 | }; |
|
|
520 | } |
544 | }; |
521 | } |
545 | } |
522 | |
546 | |
523 | sub db_get($$) { |
547 | sub db_get($$) { |
524 | my $key = "$_[0]/$_[1]"; |
548 | my $key = "$_[0]/$_[1]"; |
525 | |
549 | |
… | |
… | |
575 | if (1) { |
599 | if (1) { |
576 | $md5 = |
600 | $md5 = |
577 | join "\x00", |
601 | join "\x00", |
578 | $processversion, |
602 | $processversion, |
579 | map { |
603 | map { |
580 | Coro::cede; |
604 | cf::cede_to_tick; |
581 | ($src->[$_], Digest::MD5::md5_hex $data[$_]) |
605 | ($src->[$_], Digest::MD5::md5_hex $data[$_]) |
582 | } 0.. $#$src; |
606 | } 0.. $#$src; |
583 | |
607 | |
584 | |
608 | |
585 | my $dbmd5 = db_get cache => "$id/md5"; |
609 | my $dbmd5 = db_get cache => "$id/md5"; |
… | |
… | |
1004 | sub object_freezer_save { |
1028 | sub object_freezer_save { |
1005 | my ($filename, $rdata, $objs) = @_; |
1029 | my ($filename, $rdata, $objs) = @_; |
1006 | |
1030 | |
1007 | sync_job { |
1031 | sync_job { |
1008 | if (length $$rdata) { |
1032 | if (length $$rdata) { |
|
|
1033 | utf8::decode (my $decname = $filename); |
1009 | warn sprintf "saving %s (%d,%d)\n", |
1034 | warn sprintf "saving %s (%d,%d)\n", |
1010 | $filename, length $$rdata, scalar @$objs; |
1035 | $decname, length $$rdata, scalar @$objs; |
1011 | |
1036 | |
1012 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
1037 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
1013 | chmod SAVE_MODE, $fh; |
1038 | chmod SAVE_MODE, $fh; |
1014 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
1039 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
1015 | aio_fsync $fh if $cf::USE_FSYNC; |
1040 | aio_fsync $fh if $cf::USE_FSYNC; |
… | |
… | |
1034 | } |
1059 | } |
1035 | } else { |
1060 | } else { |
1036 | aio_unlink $filename; |
1061 | aio_unlink $filename; |
1037 | aio_unlink "$filename.pst"; |
1062 | aio_unlink "$filename.pst"; |
1038 | } |
1063 | } |
1039 | } |
1064 | }; |
1040 | } |
1065 | } |
1041 | |
1066 | |
1042 | sub object_freezer_as_string { |
1067 | sub object_freezer_as_string { |
1043 | my ($rdata, $objs) = @_; |
1068 | my ($rdata, $objs) = @_; |
1044 | |
1069 | |
… | |
… | |
1056 | or return; |
1081 | or return; |
1057 | |
1082 | |
1058 | unless (aio_stat "$filename.pst") { |
1083 | unless (aio_stat "$filename.pst") { |
1059 | (aio_load "$filename.pst", $av) >= 0 |
1084 | (aio_load "$filename.pst", $av) >= 0 |
1060 | or return; |
1085 | or return; |
|
|
1086 | |
1061 | $av = eval { (Storable::thaw $av)->{objs} }; |
1087 | $av = eval { (Storable::thaw $av)->{objs} }; |
1062 | } |
1088 | } |
1063 | |
1089 | |
|
|
1090 | utf8::decode (my $decname = $filename); |
1064 | warn sprintf "loading %s (%d)\n", |
1091 | warn sprintf "loading %s (%d,%d)\n", |
1065 | $filename, length $data, scalar @{$av || []}; |
1092 | $decname, length $data, scalar @{$av || []}; |
|
|
1093 | |
1066 | return ($data, $av); |
1094 | ($data, $av) |
1067 | } |
1095 | } |
1068 | |
1096 | |
1069 | =head2 COMMAND CALLBACKS |
1097 | =head2 COMMAND CALLBACKS |
1070 | |
1098 | |
1071 | =over 4 |
1099 | =over 4 |
… | |
… | |
1149 | my ($type, $reply, @payload) = |
1177 | my ($type, $reply, @payload) = |
1150 | "ARRAY" eq ref $msg |
1178 | "ARRAY" eq ref $msg |
1151 | ? @$msg |
1179 | ? @$msg |
1152 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
1180 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
1153 | |
1181 | |
|
|
1182 | my @reply; |
|
|
1183 | |
1154 | if (my $cb = $EXTCMD{$type}) { |
1184 | if (my $cb = $EXTCMD{$type}) { |
1155 | my @reply = $cb->($pl, @payload); |
1185 | @reply = $cb->($pl, @payload); |
1156 | |
|
|
1157 | $pl->ext_reply ($reply, @reply) |
|
|
1158 | if $reply; |
|
|
1159 | } |
1186 | } |
|
|
1187 | |
|
|
1188 | $pl->ext_reply ($reply, @reply) |
|
|
1189 | if $reply; |
|
|
1190 | |
1160 | } else { |
1191 | } else { |
1161 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1192 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1162 | } |
1193 | } |
1163 | |
1194 | |
1164 | cf::override; |
1195 | cf::override; |
… | |
… | |
1254 | |
1285 | |
1255 | =head3 cf::player |
1286 | =head3 cf::player |
1256 | |
1287 | |
1257 | =over 4 |
1288 | =over 4 |
1258 | |
1289 | |
|
|
1290 | =item cf::player::num_playing |
|
|
1291 | |
|
|
1292 | Returns the official number of playing players, as per the Crossfire metaserver rules. |
|
|
1293 | |
|
|
1294 | =cut |
|
|
1295 | |
|
|
1296 | sub num_playing { |
|
|
1297 | scalar grep |
|
|
1298 | $_->ob->map |
|
|
1299 | && !$_->hidden |
|
|
1300 | && !$_->ob->flag (cf::FLAG_WIZ), |
|
|
1301 | cf::player::list |
|
|
1302 | } |
|
|
1303 | |
1259 | =item cf::player::find $login |
1304 | =item cf::player::find $login |
1260 | |
1305 | |
1261 | Returns the given player object, loading it if necessary (might block). |
1306 | Returns the given player object, loading it if necessary (might block). |
1262 | |
1307 | |
1263 | =cut |
1308 | =cut |
… | |
… | |
1298 | aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; |
1343 | aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; |
1299 | aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; |
1344 | aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; |
1300 | aio_unlink +(playerdir $login) . "/$login.pl.pst"; |
1345 | aio_unlink +(playerdir $login) . "/$login.pl.pst"; |
1301 | aio_unlink +(playerdir $login) . "/$login.pl"; |
1346 | aio_unlink +(playerdir $login) . "/$login.pl"; |
1302 | |
1347 | |
1303 | my $pl = load_pl path $login |
1348 | my $f = new_from_file cf::object::thawer path $login |
1304 | or return; |
1349 | or return; |
|
|
1350 | |
|
|
1351 | my $pl = cf::player::load_pl $f |
|
|
1352 | or return; |
|
|
1353 | local $cf::PLAYER_LOADING{$login} = $pl; |
|
|
1354 | $f->resolve_delayed_derefs; |
1305 | $cf::PLAYER{$login} = $pl |
1355 | $cf::PLAYER{$login} = $pl |
1306 | } |
1356 | } |
1307 | } |
1357 | } |
1308 | } |
1358 | } |
1309 | |
1359 | |
… | |
… | |
1319 | |
1369 | |
1320 | aio_mkdir playerdir $pl, 0770; |
1370 | aio_mkdir playerdir $pl, 0770; |
1321 | $pl->{last_save} = $cf::RUNTIME; |
1371 | $pl->{last_save} = $cf::RUNTIME; |
1322 | |
1372 | |
1323 | $pl->save_pl ($path); |
1373 | $pl->save_pl ($path); |
1324 | Coro::cede; |
1374 | cf::cede_to_tick; |
1325 | } |
1375 | } |
1326 | |
1376 | |
1327 | sub new($) { |
1377 | sub new($) { |
1328 | my ($login) = @_; |
1378 | my ($login) = @_; |
1329 | |
1379 | |
… | |
… | |
1407 | or return []; |
1457 | or return []; |
1408 | |
1458 | |
1409 | my @logins; |
1459 | my @logins; |
1410 | |
1460 | |
1411 | for my $login (@$dirs) { |
1461 | for my $login (@$dirs) { |
|
|
1462 | my $path = path $login; |
|
|
1463 | |
|
|
1464 | # a .pst is a dead give-away for a valid player |
|
|
1465 | unless (-e "$path.pst") { |
1412 | my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; |
1466 | my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; |
1413 | aio_read $fh, 0, 512, my $buf, 0 or next; |
1467 | aio_read $fh, 0, 512, my $buf, 0 or next; |
1414 | $buf !~ /^password -------------$/m or next; # official not-valid tag |
1468 | $buf !~ /^password -------------$/m or next; # official not-valid tag |
|
|
1469 | } |
1415 | |
1470 | |
1416 | utf8::decode $login; |
1471 | utf8::decode $login; |
1417 | push @logins, $login; |
1472 | push @logins, $login; |
1418 | } |
1473 | } |
1419 | |
1474 | |
… | |
… | |
1457 | sub expand_cfpod { |
1512 | sub expand_cfpod { |
1458 | ((my $self), (local $_)) = @_; |
1513 | ((my $self), (local $_)) = @_; |
1459 | |
1514 | |
1460 | # escape & and < |
1515 | # escape & and < |
1461 | s/&/&/g; |
1516 | s/&/&/g; |
1462 | s/(?<![BIUGH])</</g; |
1517 | s/(?<![BIUGHT])</</g; |
1463 | |
1518 | |
1464 | # this is buggy, it needs to properly take care of nested <'s |
1519 | # this is buggy, it needs to properly take care of nested <'s |
1465 | |
1520 | |
1466 | 1 while |
1521 | 1 while |
1467 | # replace B<>, I<>, U<> etc. |
1522 | # replace B<>, I<>, U<> etc. |
1468 | s/B<([^\>]*)>/<b>$1<\/b>/ |
1523 | s/B<([^\>]*)>/<b>$1<\/b>/ |
1469 | || s/I<([^\>]*)>/<i>$1<\/i>/ |
1524 | || s/I<([^\>]*)>/<i>$1<\/i>/ |
1470 | || s/U<([^\>]*)>/<u>$1<\/u>/ |
1525 | || s/U<([^\>]*)>/<u>$1<\/u>/ |
|
|
1526 | || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ |
1471 | # replace G<male|female> tags |
1527 | # replace G<male|female> tags |
1472 | || s{G<([^>|]*)\|([^>]*)>}{ |
1528 | || s{G<([^>|]*)\|([^>]*)>}{ |
1473 | $self->gender ? $2 : $1 |
1529 | $self->gender ? $2 : $1 |
1474 | }ge |
1530 | }ge |
1475 | # replace H<hint text> |
1531 | # replace H<hint text> |
… | |
… | |
1743 | |
1799 | |
1744 | sub load_header_from($) { |
1800 | sub load_header_from($) { |
1745 | my ($self, $path) = @_; |
1801 | my ($self, $path) = @_; |
1746 | |
1802 | |
1747 | utf8::encode $path; |
1803 | utf8::encode $path; |
1748 | #aio_open $path, O_RDONLY, 0 |
1804 | my $f = new_from_file cf::object::thawer $path |
1749 | # or return; |
|
|
1750 | |
|
|
1751 | $self->_load_header ($path) |
|
|
1752 | or return; |
1805 | or return; |
|
|
1806 | |
|
|
1807 | $self->_load_header ($f) |
|
|
1808 | or return; |
|
|
1809 | |
|
|
1810 | local $MAP_LOADING{$self->{path}} = $self; |
|
|
1811 | $f->resolve_delayed_derefs; |
1753 | |
1812 | |
1754 | $self->{load_path} = $path; |
1813 | $self->{load_path} = $path; |
1755 | |
1814 | |
1756 | 1 |
1815 | 1 |
1757 | } |
1816 | } |
… | |
… | |
1811 | sub find { |
1870 | sub find { |
1812 | my ($path, $origin) = @_; |
1871 | my ($path, $origin) = @_; |
1813 | |
1872 | |
1814 | $path = normalise $path, $origin && $origin->path; |
1873 | $path = normalise $path, $origin && $origin->path; |
1815 | |
1874 | |
|
|
1875 | cf::lock_wait "map_data:$path";#d#remove |
1816 | cf::lock_wait "map_find:$path"; |
1876 | cf::lock_wait "map_find:$path"; |
1817 | |
1877 | |
1818 | $cf::MAP{$path} || do { |
1878 | $cf::MAP{$path} || do { |
1819 | my $guard = cf::lock_acquire "map_find:$path"; |
1879 | my $guard1 = cf::lock_acquire "map_find:$path"; |
|
|
1880 | my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it |
|
|
1881 | |
1820 | my $map = new_from_path cf::map $path |
1882 | my $map = new_from_path cf::map $path |
1821 | or return; |
1883 | or return; |
1822 | |
1884 | |
1823 | $map->{last_save} = $cf::RUNTIME; |
1885 | $map->{last_save} = $cf::RUNTIME; |
1824 | |
1886 | |
… | |
… | |
1826 | or return; |
1888 | or return; |
1827 | |
1889 | |
1828 | if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) |
1890 | if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) |
1829 | # doing this can freeze the server in a sync job, obviously |
1891 | # doing this can freeze the server in a sync job, obviously |
1830 | #$cf::WAIT_FOR_TICK->wait; |
1892 | #$cf::WAIT_FOR_TICK->wait; |
|
|
1893 | undef $guard1; |
|
|
1894 | undef $guard2; |
1831 | $map->reset; |
1895 | $map->reset; |
1832 | undef $guard; |
|
|
1833 | return find $path; |
1896 | return find $path; |
1834 | } |
1897 | } |
1835 | |
1898 | |
1836 | $cf::MAP{$path} = $map |
1899 | $cf::MAP{$path} = $map |
1837 | } |
1900 | } |
… | |
… | |
1846 | local $self->{deny_reset} = 1; # loading can take a long time |
1909 | local $self->{deny_reset} = 1; # loading can take a long time |
1847 | |
1910 | |
1848 | my $path = $self->{path}; |
1911 | my $path = $self->{path}; |
1849 | |
1912 | |
1850 | { |
1913 | { |
1851 | my $guard = cf::lock_acquire "map_load:$path"; |
1914 | my $guard = cf::lock_acquire "map_data:$path"; |
1852 | |
1915 | |
|
|
1916 | return unless $self->valid; |
1853 | return if $self->in_memory != cf::MAP_SWAPPED; |
1917 | return unless $self->in_memory == cf::MAP_SWAPPED; |
1854 | |
1918 | |
1855 | $self->in_memory (cf::MAP_LOADING); |
1919 | $self->in_memory (cf::MAP_LOADING); |
1856 | |
1920 | |
1857 | $self->alloc; |
1921 | $self->alloc; |
1858 | |
1922 | |
1859 | $self->pre_load; |
1923 | $self->pre_load; |
1860 | Coro::cede; |
1924 | cf::cede_to_tick; |
1861 | |
1925 | |
|
|
1926 | my $f = new_from_file cf::object::thawer $self->{load_path}; |
|
|
1927 | $f->skip_block; |
1862 | $self->_load_objects ($self->{load_path}, 1) |
1928 | $self->_load_objects ($f) |
1863 | or return; |
1929 | or return; |
1864 | |
1930 | |
1865 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
1931 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
1866 | if delete $self->{load_original}; |
1932 | if delete $self->{load_original}; |
1867 | |
1933 | |
1868 | if (my $uniq = $self->uniq_path) { |
1934 | if (my $uniq = $self->uniq_path) { |
1869 | utf8::encode $uniq; |
1935 | utf8::encode $uniq; |
1870 | if (aio_open $uniq, O_RDONLY, 0) { |
1936 | unless (aio_stat $uniq) { |
|
|
1937 | if (my $f = new_from_file cf::object::thawer $uniq) { |
1871 | $self->clear_unique_items; |
1938 | $self->clear_unique_items; |
1872 | $self->_load_objects ($uniq, 0); |
1939 | $self->_load_objects ($f); |
|
|
1940 | $f->resolve_delayed_derefs; |
|
|
1941 | } |
1873 | } |
1942 | } |
1874 | } |
1943 | } |
1875 | |
1944 | |
1876 | Coro::cede; |
1945 | $f->resolve_delayed_derefs; |
|
|
1946 | |
|
|
1947 | cf::cede_to_tick; |
1877 | # now do the right thing for maps |
1948 | # now do the right thing for maps |
1878 | $self->link_multipart_objects; |
1949 | $self->link_multipart_objects; |
1879 | $self->difficulty ($self->estimate_difficulty) |
1950 | $self->difficulty ($self->estimate_difficulty) |
1880 | unless $self->difficulty; |
1951 | unless $self->difficulty; |
1881 | Coro::cede; |
1952 | cf::cede_to_tick; |
1882 | |
1953 | |
1883 | unless ($self->{deny_activate}) { |
1954 | unless ($self->{deny_activate}) { |
1884 | $self->decay_objects; |
1955 | $self->decay_objects; |
1885 | $self->fix_auto_apply; |
1956 | $self->fix_auto_apply; |
1886 | $self->update_buttons; |
1957 | $self->update_buttons; |
1887 | Coro::cede; |
1958 | cf::cede_to_tick; |
1888 | $self->set_darkness_map; |
1959 | $self->set_darkness_map; |
1889 | Coro::cede; |
1960 | cf::cede_to_tick; |
1890 | $self->activate; |
1961 | $self->activate; |
1891 | } |
1962 | } |
1892 | |
1963 | |
1893 | $self->{last_save} = $cf::RUNTIME; |
1964 | $self->{last_save} = $cf::RUNTIME; |
1894 | $self->last_access ($cf::RUNTIME); |
1965 | $self->last_access ($cf::RUNTIME); |
… | |
… | |
1944 | } |
2015 | } |
1945 | |
2016 | |
1946 | sub do_load_sync { |
2017 | sub do_load_sync { |
1947 | my ($map) = @_; |
2018 | my ($map) = @_; |
1948 | |
2019 | |
|
|
2020 | cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" |
|
|
2021 | if $Coro::current == $Coro::main; |
|
|
2022 | |
1949 | cf::sync_job { $map->load }; |
2023 | cf::sync_job { $map->load }; |
1950 | } |
2024 | } |
1951 | |
2025 | |
1952 | our %MAP_PREFETCH; |
2026 | our %MAP_PREFETCH; |
1953 | our $MAP_PREFETCHER = undef; |
2027 | our $MAP_PREFETCHER = undef; |
1954 | |
2028 | |
1955 | sub find_async { |
2029 | sub find_async { |
1956 | my ($path, $origin) = @_; |
2030 | my ($path, $origin, $load) = @_; |
1957 | |
2031 | |
1958 | $path = normalise $path, $origin && $origin->{path}; |
2032 | $path = normalise $path, $origin && $origin->{path}; |
1959 | |
2033 | |
1960 | if (my $map = $cf::MAP{$path}) { |
2034 | if (my $map = $cf::MAP{$path}) { |
1961 | return $map if $map->in_memory == cf::MAP_IN_MEMORY; |
2035 | return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; |
1962 | } |
2036 | } |
1963 | |
2037 | |
1964 | undef $MAP_PREFETCH{$path}; |
2038 | $MAP_PREFETCH{$path} |= $load; |
|
|
2039 | |
1965 | $MAP_PREFETCHER ||= cf::async { |
2040 | $MAP_PREFETCHER ||= cf::async { |
1966 | while (%MAP_PREFETCH) { |
2041 | while (%MAP_PREFETCH) { |
1967 | for my $path (keys %MAP_PREFETCH) { |
2042 | while (my ($k, $v) = each %MAP_PREFETCH) { |
1968 | if (my $map = find $path) { |
2043 | if (my $map = find $k) { |
1969 | $map->load; |
2044 | $map->load if $v; |
1970 | } |
2045 | } |
1971 | |
2046 | |
1972 | delete $MAP_PREFETCH{$path}; |
2047 | delete $MAP_PREFETCH{$k}; |
1973 | } |
2048 | } |
1974 | } |
2049 | } |
1975 | undef $MAP_PREFETCHER; |
2050 | undef $MAP_PREFETCHER; |
1976 | }; |
2051 | }; |
1977 | $MAP_PREFETCHER->prio (6); |
2052 | $MAP_PREFETCHER->prio (6); |
… | |
… | |
1980 | } |
2055 | } |
1981 | |
2056 | |
1982 | sub save { |
2057 | sub save { |
1983 | my ($self) = @_; |
2058 | my ($self) = @_; |
1984 | |
2059 | |
1985 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
2060 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
1986 | |
2061 | |
1987 | $self->{last_save} = $cf::RUNTIME; |
2062 | $self->{last_save} = $cf::RUNTIME; |
1988 | |
2063 | |
1989 | return unless $self->dirty; |
2064 | return unless $self->dirty; |
1990 | |
2065 | |
… | |
… | |
2013 | my ($self) = @_; |
2088 | my ($self) = @_; |
2014 | |
2089 | |
2015 | # save first because save cedes |
2090 | # save first because save cedes |
2016 | $self->save; |
2091 | $self->save; |
2017 | |
2092 | |
2018 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
2093 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2019 | |
2094 | |
2020 | return if $self->players; |
2095 | return if $self->players; |
2021 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2096 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2022 | return if $self->{deny_save}; |
2097 | return if $self->{deny_save}; |
2023 | |
2098 | |
|
|
2099 | $self->in_memory (cf::MAP_SWAPPED); |
|
|
2100 | |
|
|
2101 | $self->deactivate; |
|
|
2102 | $_->clear_links_to ($self) for values %cf::MAP; |
2024 | $self->clear; |
2103 | $self->clear; |
2025 | $self->in_memory (cf::MAP_SWAPPED); |
|
|
2026 | } |
2104 | } |
2027 | |
2105 | |
2028 | sub reset_at { |
2106 | sub reset_at { |
2029 | my ($self) = @_; |
2107 | my ($self) = @_; |
2030 | |
2108 | |
… | |
… | |
2062 | if $uniq; |
2140 | if $uniq; |
2063 | } |
2141 | } |
2064 | |
2142 | |
2065 | delete $cf::MAP{$self->path}; |
2143 | delete $cf::MAP{$self->path}; |
2066 | |
2144 | |
|
|
2145 | $self->deactivate; |
|
|
2146 | $_->clear_links_to ($self) for values %cf::MAP; |
2067 | $self->clear; |
2147 | $self->clear; |
2068 | |
|
|
2069 | $_->clear_links_to ($self) for values %cf::MAP; |
|
|
2070 | |
2148 | |
2071 | $self->unlink_save; |
2149 | $self->unlink_save; |
2072 | $self->destroy; |
2150 | $self->destroy; |
2073 | } |
2151 | } |
2074 | |
2152 | |
2075 | my $nuke_counter = "aaaa"; |
2153 | my $nuke_counter = "aaaa"; |
2076 | |
2154 | |
2077 | sub nuke { |
2155 | sub nuke { |
2078 | my ($self) = @_; |
2156 | my ($self) = @_; |
2079 | |
2157 | |
|
|
2158 | { |
|
|
2159 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
|
|
2160 | |
2080 | delete $cf::MAP{$self->path}; |
2161 | delete $cf::MAP{$self->path}; |
2081 | |
2162 | |
2082 | $self->unlink_save; |
2163 | $self->unlink_save; |
2083 | |
2164 | |
2084 | bless $self, "cf::map"; |
2165 | bless $self, "cf::map"; |
2085 | delete $self->{deny_reset}; |
2166 | delete $self->{deny_reset}; |
2086 | $self->{deny_save} = 1; |
2167 | $self->{deny_save} = 1; |
2087 | $self->reset_timeout (1); |
2168 | $self->reset_timeout (1); |
2088 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
2169 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
2089 | |
2170 | |
2090 | $cf::MAP{$self->path} = $self; |
2171 | $cf::MAP{$self->path} = $self; |
|
|
2172 | } |
2091 | |
2173 | |
2092 | $self->reset; # polite request, might not happen |
2174 | $self->reset; # polite request, might not happen |
2093 | } |
2175 | } |
2094 | |
2176 | |
2095 | =item $maps = cf::map::tmp_maps |
2177 | =item $maps = cf::map::tmp_maps |
… | |
… | |
2171 | |
2253 | |
2172 | sub inv_recursive { |
2254 | sub inv_recursive { |
2173 | inv_recursive_ inv $_[0] |
2255 | inv_recursive_ inv $_[0] |
2174 | } |
2256 | } |
2175 | |
2257 | |
|
|
2258 | =item $ref = $ob->ref |
|
|
2259 | |
|
|
2260 | creates and returns a persistent reference to an objetc that can be stored as a string. |
|
|
2261 | |
|
|
2262 | =item $ob = cf::object::deref ($refstring) |
|
|
2263 | |
|
|
2264 | returns the objetc referenced by refstring. may return undef when it cnanot find the object, |
|
|
2265 | even if the object actually exists. May block. |
|
|
2266 | |
|
|
2267 | =cut |
|
|
2268 | |
|
|
2269 | sub deref { |
|
|
2270 | my ($ref) = @_; |
|
|
2271 | |
|
|
2272 | # temporary compatibility#TODO#remove |
|
|
2273 | $ref =~ s{^<}{player/<}; |
|
|
2274 | |
|
|
2275 | if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { |
|
|
2276 | my ($uuid, $name) = ($1, $2); |
|
|
2277 | my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name |
|
|
2278 | or return; |
|
|
2279 | $pl->ob->uuid eq $uuid |
|
|
2280 | or return; |
|
|
2281 | |
|
|
2282 | $pl->ob |
|
|
2283 | } else { |
|
|
2284 | warn "$ref: cannot resolve object reference\n"; |
|
|
2285 | undef |
|
|
2286 | } |
|
|
2287 | } |
|
|
2288 | |
2176 | package cf; |
2289 | package cf; |
2177 | |
2290 | |
2178 | =back |
2291 | =back |
2179 | |
2292 | |
2180 | =head3 cf::object::player |
2293 | =head3 cf::object::player |
… | |
… | |
2338 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2451 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2339 | |
2452 | |
2340 | $self->enter_link; |
2453 | $self->enter_link; |
2341 | |
2454 | |
2342 | (async { |
2455 | (async { |
|
|
2456 | # *tag paths override both path and x|y |
|
|
2457 | if ($path =~ /^\*(.*)$/) { |
|
|
2458 | if (my @obs = grep $_->map, ext::map_tags::find $1) { |
|
|
2459 | my $ob = $obs[rand @obs]; |
|
|
2460 | |
|
|
2461 | # see if we actually can go there |
|
|
2462 | if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) { |
|
|
2463 | $ob = $obs[rand @obs]; |
|
|
2464 | } else { |
|
|
2465 | $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED); |
|
|
2466 | } |
|
|
2467 | # else put us there anyways for now #d# |
|
|
2468 | |
|
|
2469 | ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); |
|
|
2470 | } else { |
|
|
2471 | ($path, $x, $y) = (undef, undef, undef); |
|
|
2472 | } |
|
|
2473 | } |
|
|
2474 | |
2343 | my $map = eval { |
2475 | my $map = eval { |
2344 | my $map = cf::map::find $path; |
2476 | my $map = defined $path ? cf::map::find $path : undef; |
2345 | |
2477 | |
2346 | if ($map) { |
2478 | if ($map) { |
2347 | $map = $map->customise_for ($self); |
2479 | $map = $map->customise_for ($self); |
2348 | $map = $check->($map) if $check && $map; |
2480 | $map = $check->($map) if $check && $map; |
2349 | } else { |
2481 | } else { |
2350 | $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); |
2482 | $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); |
2351 | } |
2483 | } |
2352 | |
2484 | |
2353 | $map |
2485 | $map |
2354 | }; |
2486 | }; |
2355 | |
2487 | |
… | |
… | |
2489 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2621 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2490 | the message unless the client supports the msg packet. |
2622 | the message unless the client supports the msg packet. |
2491 | |
2623 | |
2492 | =cut |
2624 | =cut |
2493 | |
2625 | |
|
|
2626 | our %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 | |
2494 | sub cf::client::send_msg { |
2641 | sub cf::client::send_msg { |
2495 | my ($self, $channel, $msg, $color, @extra) = @_; |
2642 | my ($self, $channel, $msg, $color, @extra) = @_; |
2496 | |
2643 | |
2497 | $msg = $self->pl->expand_cfpod ($msg); |
2644 | $msg = $self->pl->expand_cfpod ($msg); |
2498 | |
2645 | |
2499 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
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}; |
2500 | |
2650 | |
2501 | if (ref $channel) { |
2651 | if (ref $channel) { |
2502 | # send meta info to client, if not yet sent |
2652 | # send meta info to client, if not yet sent |
2503 | unless (exists $self->{channel}{$channel->{id}}) { |
2653 | unless (exists $self->{channel}{$channel->{id}}) { |
2504 | $self->{channel}{$channel->{id}} = $channel; |
2654 | $self->{channel}{$channel->{id}} = $channel; |
2505 | $self->ext_msg (channel_info => $channel); |
2655 | $self->ext_msg (channel_info => $channel) |
|
|
2656 | if $self->can_msg; |
2506 | } |
2657 | } |
2507 | |
2658 | |
2508 | $channel = $channel->{id}; |
2659 | $channel = $channel->{id}; |
2509 | } |
2660 | } |
2510 | |
2661 | |
… | |
… | |
2551 | =cut |
2702 | =cut |
2552 | |
2703 | |
2553 | sub cf::client::ext_msg($$@) { |
2704 | sub cf::client::ext_msg($$@) { |
2554 | my ($self, $type, @msg) = @_; |
2705 | my ($self, $type, @msg) = @_; |
2555 | |
2706 | |
2556 | my $extcmd = $self->extcmd; |
|
|
2557 | |
|
|
2558 | if ($extcmd == 2) { |
2707 | if ($self->extcmd == 2) { |
2559 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2708 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2560 | } elsif ($extcmd == 1) { # TODO: remove |
2709 | } elsif ($self->extcmd == 1) { # TODO: remove |
2561 | push @msg, msgtype => "event_$type"; |
2710 | push @msg, msgtype => "event_$type"; |
2562 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2711 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2563 | } |
2712 | } |
2564 | } |
2713 | } |
2565 | |
2714 | |
… | |
… | |
2572 | sub cf::client::ext_reply($$@) { |
2721 | sub cf::client::ext_reply($$@) { |
2573 | my ($self, $id, @msg) = @_; |
2722 | my ($self, $id, @msg) = @_; |
2574 | |
2723 | |
2575 | if ($self->extcmd == 2) { |
2724 | if ($self->extcmd == 2) { |
2576 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
2725 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
2577 | } elsif ($self->ns->extcmd == 1) { |
2726 | } elsif ($self->extcmd == 1) { |
2578 | #TODO: version 1, remove |
2727 | #TODO: version 1, remove |
2579 | unshift @msg, msgtype => "reply", msgid => $id; |
2728 | unshift @msg, msgtype => "reply", msgid => $id; |
2580 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2729 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2581 | } |
2730 | } |
2582 | } |
2731 | } |
… | |
… | |
2646 | my ($type, $reply, @payload) = |
2795 | my ($type, $reply, @payload) = |
2647 | "ARRAY" eq ref $msg |
2796 | "ARRAY" eq ref $msg |
2648 | ? @$msg |
2797 | ? @$msg |
2649 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2798 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2650 | |
2799 | |
|
|
2800 | my @reply; |
|
|
2801 | |
2651 | if (my $cb = $EXTICMD{$type}) { |
2802 | if (my $cb = $EXTICMD{$type}) { |
2652 | my @reply = $cb->($ns, @payload); |
2803 | @reply = $cb->($ns, @payload); |
2653 | |
|
|
2654 | $ns->ext_reply ($reply, @reply) |
|
|
2655 | if $reply; |
|
|
2656 | } |
2804 | } |
|
|
2805 | |
|
|
2806 | $ns->ext_reply ($reply, @reply) |
|
|
2807 | if $reply; |
|
|
2808 | |
2657 | } else { |
2809 | } else { |
2658 | 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"; |
2659 | } |
2811 | } |
2660 | |
2812 | |
2661 | cf::override; |
2813 | cf::override; |
… | |
… | |
2722 | |
2874 | |
2723 | The following functions and methods are available within a safe environment: |
2875 | The following functions and methods are available within a safe environment: |
2724 | |
2876 | |
2725 | cf::object |
2877 | cf::object |
2726 | 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 |
2727 | insert remove name archname title slaying race |
2879 | insert remove name archname title slaying race decrease_ob_nr |
2728 | |
2880 | |
2729 | cf::object::player |
2881 | cf::object::player |
2730 | player |
2882 | player |
2731 | |
2883 | |
2732 | cf::player |
2884 | cf::player |
… | |
… | |
2737 | |
2889 | |
2738 | =cut |
2890 | =cut |
2739 | |
2891 | |
2740 | for ( |
2892 | for ( |
2741 | ["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 |
2742 | insert remove inv name archname title slaying race)], |
2894 | insert remove inv name archname title slaying race |
|
|
2895 | decrease_ob_nr)], |
2743 | ["cf::object::player" => qw(player)], |
2896 | ["cf::object::player" => qw(player)], |
2744 | ["cf::player" => qw(peaceful)], |
2897 | ["cf::player" => qw(peaceful)], |
2745 | ["cf::map" => qw(trigger)], |
2898 | ["cf::map" => qw(trigger)], |
2746 | ) { |
2899 | ) { |
2747 | no strict 'refs'; |
2900 | no strict 'refs'; |
… | |
… | |
2823 | # the server's init and main functions |
2976 | # the server's init and main functions |
2824 | |
2977 | |
2825 | sub load_facedata($) { |
2978 | sub load_facedata($) { |
2826 | my ($path) = @_; |
2979 | my ($path) = @_; |
2827 | |
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 | |
2828 | my $enc = JSON::XS->new->utf8->canonical; |
2985 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
2829 | |
2986 | |
2830 | warn "loading facedata from $path\n"; |
2987 | warn "loading facedata from $path\n"; |
2831 | |
2988 | |
2832 | my $facedata; |
2989 | my $facedata; |
2833 | 0 < aio_load $path, $facedata |
2990 | 0 < aio_load $path, $facedata |
… | |
… | |
2943 | $ns->fx_want ($k, $v); |
3100 | $ns->fx_want ($k, $v); |
2944 | } |
3101 | } |
2945 | }; |
3102 | }; |
2946 | |
3103 | |
2947 | sub reload_regions { |
3104 | sub 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 | |
2948 | load_resource_file "$MAPDIR/regions" |
3109 | load_resource_file "$MAPDIR/regions" |
2949 | or die "unable to load regions file\n"; |
3110 | or die "unable to load regions file\n"; |
2950 | |
3111 | |
2951 | for (cf::region::list) { |
3112 | for (cf::region::list) { |
2952 | $_->{match} = qr/$_->{match}/ |
3113 | $_->{match} = qr/$_->{match}/ |
… | |
… | |
2988 | |
3149 | |
2989 | sub init { |
3150 | sub init { |
2990 | reload_resources; |
3151 | reload_resources; |
2991 | } |
3152 | } |
2992 | |
3153 | |
2993 | sub cfg_load { |
3154 | sub reload_config { |
2994 | open my $fh, "<:utf8", "$CONFDIR/config" |
3155 | open my $fh, "<:utf8", "$CONFDIR/config" |
2995 | or return; |
3156 | or return; |
2996 | |
3157 | |
2997 | local $/; |
3158 | local $/; |
2998 | *CFG = YAML::Syck::Load <$fh>; |
3159 | *CFG = YAML::Syck::Load <$fh>; |
… | |
… | |
3018 | (async { |
3179 | (async { |
3019 | Event::one_event; |
3180 | Event::one_event; |
3020 | })->prio (Coro::PRIO_MAX); |
3181 | })->prio (Coro::PRIO_MAX); |
3021 | }; |
3182 | }; |
3022 | |
3183 | |
3023 | cfg_load; |
3184 | reload_config; |
3024 | db_init; |
3185 | db_init; |
3025 | load_extensions; |
3186 | load_extensions; |
3026 | |
3187 | |
3027 | $TICK_WATCHER->start; |
3188 | $TICK_WATCHER->start; |
3028 | Event::loop; |
3189 | Event::loop; |
… | |
… | |
3221 | warn "reloading cf.pm"; |
3382 | warn "reloading cf.pm"; |
3222 | require cf; |
3383 | require cf; |
3223 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3384 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3224 | |
3385 | |
3225 | warn "loading config and database again"; |
3386 | warn "loading config and database again"; |
3226 | cf::cfg_load; |
3387 | cf::reload_config; |
3227 | |
3388 | |
3228 | warn "loading extensions"; |
3389 | warn "loading extensions"; |
3229 | cf::load_extensions; |
3390 | cf::load_extensions; |
3230 | |
3391 | |
3231 | warn "reattaching attachments to objects/players"; |
3392 | warn "reattaching attachments to objects/players"; |
… | |
… | |
3296 | my $signal = new Coro::Signal; |
3457 | my $signal = new Coro::Signal; |
3297 | push @WAIT_FOR_TICK_BEGIN, $signal; |
3458 | push @WAIT_FOR_TICK_BEGIN, $signal; |
3298 | $signal->wait; |
3459 | $signal->wait; |
3299 | } |
3460 | } |
3300 | |
3461 | |
3301 | my $min = 1e6;#d# |
|
|
3302 | my $avg = 10; |
|
|
3303 | $TICK_WATCHER = Event->timer ( |
3462 | $TICK_WATCHER = Event->timer ( |
3304 | reentrant => 0, |
3463 | reentrant => 0, |
3305 | parked => 1, |
3464 | parked => 1, |
3306 | prio => 0, |
3465 | prio => 0, |
3307 | at => $NEXT_TICK || $TICK, |
3466 | at => $NEXT_TICK || $TICK, |
… | |
… | |
3315 | |
3474 | |
3316 | $NOW = $tick_start = Event::time; |
3475 | $NOW = $tick_start = Event::time; |
3317 | |
3476 | |
3318 | cf::server_tick; # one server iteration |
3477 | cf::server_tick; # one server iteration |
3319 | |
3478 | |
3320 | 0 && sync_job {#d# |
|
|
3321 | for(1..10) { |
|
|
3322 | my $t = Event::time; |
|
|
3323 | my $map = my $map = new_from_path cf::map "/tmp/x.map" |
|
|
3324 | or die; |
|
|
3325 | |
|
|
3326 | $map->width (50); |
|
|
3327 | $map->height (50); |
|
|
3328 | $map->alloc; |
|
|
3329 | $map->_load_objects ("/tmp/x.map", 1); |
|
|
3330 | my $t = Event::time - $t; |
|
|
3331 | |
|
|
3332 | #next unless $t < 0.0013;#d# |
|
|
3333 | if ($t < $min) { |
|
|
3334 | $min = $t; |
|
|
3335 | } |
|
|
3336 | $avg = $avg * 0.99 + $t * 0.01; |
|
|
3337 | } |
|
|
3338 | warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d# |
|
|
3339 | exit 0; |
|
|
3340 | # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477 |
|
|
3341 | }; |
|
|
3342 | |
|
|
3343 | $RUNTIME += $TICK; |
3479 | $RUNTIME += $TICK; |
3344 | $NEXT_TICK += $TICK; |
3480 | $NEXT_TICK += $TICK; |
3345 | |
3481 | |
3346 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
3482 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
3347 | $NEXT_RUNTIME_WRITE = $NOW + 10; |
3483 | $NEXT_RUNTIME_WRITE = $NOW + 10; |
… | |
… | |
3349 | write_runtime |
3485 | write_runtime |
3350 | or warn "ERROR: unable to write runtime file: $!"; |
3486 | or warn "ERROR: unable to write runtime file: $!"; |
3351 | }; |
3487 | }; |
3352 | } |
3488 | } |
3353 | |
3489 | |
3354 | # my $AFTER = Event::time; |
|
|
3355 | # warn $AFTER - $NOW;#d# |
|
|
3356 | |
|
|
3357 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
3490 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
3358 | $sig->send; |
3491 | $sig->send; |
3359 | } |
3492 | } |
3360 | while (my $sig = shift @WAIT_FOR_TICK) { |
3493 | while (my $sig = shift @WAIT_FOR_TICK) { |
3361 | $sig->send; |
3494 | $sig->send; |
… | |
… | |
3371 | |
3504 | |
3372 | $LOAD = ($NOW - $tick_start) / $TICK; |
3505 | $LOAD = ($NOW - $tick_start) / $TICK; |
3373 | $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; |
3506 | $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; |
3374 | |
3507 | |
3375 | _post_tick; |
3508 | _post_tick; |
3376 | |
|
|
3377 | |
|
|
3378 | }, |
3509 | }, |
3379 | ); |
3510 | ); |
3380 | |
3511 | |
3381 | { |
3512 | { |
|
|
3513 | BDB::min_parallel 8; |
3382 | BDB::max_poll_time $TICK * 0.1; |
3514 | BDB::max_poll_time $TICK * 0.1; |
3383 | $BDB_POLL_WATCHER = Event->io ( |
3515 | $BDB_POLL_WATCHER = Event->io ( |
3384 | reentrant => 0, |
3516 | reentrant => 0, |
3385 | fd => BDB::poll_fileno, |
3517 | fd => BDB::poll_fileno, |
3386 | poll => 'r', |
3518 | poll => 'r', |
3387 | prio => 0, |
3519 | prio => 0, |
3388 | data => WF_AUTOCANCEL, |
3520 | data => WF_AUTOCANCEL, |
3389 | cb => \&BDB::poll_cb, |
3521 | cb => \&BDB::poll_cb, |
3390 | ); |
3522 | ); |
3391 | BDB::min_parallel 8; |
|
|
3392 | |
3523 | |
3393 | BDB::set_sync_prepare { |
3524 | BDB::set_sync_prepare { |
3394 | my $status; |
3525 | my $status; |
3395 | my $current = $Coro::current; |
3526 | my $current = $Coro::current; |
3396 | ( |
3527 | ( |
… | |
… | |
3405 | ) |
3536 | ) |
3406 | }; |
3537 | }; |
3407 | |
3538 | |
3408 | unless ($DB_ENV) { |
3539 | unless ($DB_ENV) { |
3409 | $DB_ENV = BDB::db_env_create; |
3540 | $DB_ENV = BDB::db_env_create; |
|
|
3541 | $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC |
|
|
3542 | | BDB::LOG_AUTOREMOVE, 1); |
|
|
3543 | $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); |
|
|
3544 | $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); |
3410 | |
3545 | |
3411 | cf::sync_job { |
3546 | cf::sync_job { |
3412 | eval { |
3547 | eval { |
3413 | BDB::db_env_open |
3548 | BDB::db_env_open |
3414 | $DB_ENV, |
3549 | $DB_ENV, |
… | |
… | |
3416 | BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN |
3551 | BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN |
3417 | | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, |
3552 | | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, |
3418 | 0666; |
3553 | 0666; |
3419 | |
3554 | |
3420 | cf::cleanup "db_env_open($BDBDIR): $!" if $!; |
3555 | cf::cleanup "db_env_open($BDBDIR): $!" if $!; |
3421 | |
|
|
3422 | $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); |
|
|
3423 | $DB_ENV->set_lk_detect; |
|
|
3424 | }; |
3556 | }; |
3425 | |
3557 | |
3426 | cf::cleanup "db_env_open(db): $@" if $@; |
3558 | cf::cleanup "db_env_open(db): $@" if $@; |
3427 | }; |
3559 | }; |
3428 | } |
3560 | } |
|
|
3561 | |
|
|
3562 | $BDB_DEADLOCK_WATCHER = Event->timer ( |
|
|
3563 | after => 3, |
|
|
3564 | interval => 1, |
|
|
3565 | hard => 1, |
|
|
3566 | prio => 0, |
|
|
3567 | data => WF_AUTOCANCEL, |
|
|
3568 | cb => sub { |
|
|
3569 | BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; |
|
|
3570 | }, |
|
|
3571 | ); |
|
|
3572 | $BDB_CHECKPOINT_WATCHER = Event->timer ( |
|
|
3573 | after => 11, |
|
|
3574 | interval => 60, |
|
|
3575 | hard => 1, |
|
|
3576 | prio => 0, |
|
|
3577 | data => WF_AUTOCANCEL, |
|
|
3578 | cb => sub { |
|
|
3579 | BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; |
|
|
3580 | }, |
|
|
3581 | ); |
|
|
3582 | $BDB_TRICKLE_WATCHER = Event->timer ( |
|
|
3583 | after => 5, |
|
|
3584 | interval => 10, |
|
|
3585 | hard => 1, |
|
|
3586 | prio => 0, |
|
|
3587 | data => WF_AUTOCANCEL, |
|
|
3588 | cb => sub { |
|
|
3589 | BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; |
|
|
3590 | }, |
|
|
3591 | ); |
3429 | } |
3592 | } |
3430 | |
3593 | |
3431 | { |
3594 | { |
3432 | IO::AIO::min_parallel 8; |
3595 | IO::AIO::min_parallel 8; |
3433 | |
3596 | |