… | |
… | |
44 | our @EVENT; |
44 | our @EVENT; |
45 | our $LIBDIR = datadir . "/ext"; |
45 | our $LIBDIR = datadir . "/ext"; |
46 | |
46 | |
47 | our $TICK = MAX_TIME * 1e-6; |
47 | our $TICK = MAX_TIME * 1e-6; |
48 | our $TICK_WATCHER; |
48 | our $TICK_WATCHER; |
|
|
49 | our $AIO_POLL_WATCHER; |
|
|
50 | our $WRITE_RUNTIME_WATCHER; |
49 | our $NEXT_TICK; |
51 | our $NEXT_TICK; |
50 | our $NOW; |
52 | our $NOW; |
51 | |
53 | |
52 | our %CFG; |
54 | our %CFG; |
53 | |
55 | |
… | |
… | |
257 | } |
259 | } |
258 | |
260 | |
259 | sub freeze_mainloop { |
261 | sub freeze_mainloop { |
260 | return unless $TICK_WATCHER->is_active; |
262 | return unless $TICK_WATCHER->is_active; |
261 | |
263 | |
262 | my $guard = Coro::guard { $TICK_WATCHER->start }; |
264 | my $guard = Coro::guard { |
|
|
265 | $TICK_WATCHER->start; |
|
|
266 | $WRITE_RUNTIME_WATCHER->start; |
|
|
267 | }; |
|
|
268 | $WRITE_RUNTIME_WATCHER->stop; |
263 | $TICK_WATCHER->stop; |
269 | $TICK_WATCHER->stop; |
264 | $guard |
270 | $guard |
265 | } |
271 | } |
266 | |
272 | |
267 | =item cf::async { BLOCK } |
273 | =item cf::async { BLOCK } |
… | |
… | |
338 | |
344 | |
339 | $coro |
345 | $coro |
340 | } |
346 | } |
341 | |
347 | |
342 | sub write_runtime { |
348 | sub write_runtime { |
343 | return unless $TICK_WATCHER->is_active; |
|
|
344 | |
|
|
345 | my $runtime = cf::localdir . "/runtime"; |
349 | my $runtime = cf::localdir . "/runtime"; |
346 | |
350 | |
347 | my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 |
351 | my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 |
348 | or return; |
352 | or return; |
349 | |
353 | |
… | |
… | |
499 | our @CB_TYPE = (); # registry for type (cf-object class) based events |
503 | our @CB_TYPE = (); # registry for type (cf-object class) based events |
500 | our @CB_MAP = (); |
504 | our @CB_MAP = (); |
501 | |
505 | |
502 | my %attachment; |
506 | my %attachment; |
503 | |
507 | |
|
|
508 | sub cf::attachable::thawer_merge { |
|
|
509 | # simply override everything except _meta |
|
|
510 | local $_[0]{_meta}; |
|
|
511 | %{$_[0]} = %{$_[1]}; |
|
|
512 | } |
|
|
513 | |
504 | sub _attach_cb($$$$) { |
514 | sub _attach_cb($$$$) { |
505 | my ($registry, $event, $prio, $cb) = @_; |
515 | my ($registry, $event, $prio, $cb) = @_; |
506 | |
516 | |
507 | use sort 'stable'; |
517 | use sort 'stable'; |
508 | |
518 | |
… | |
… | |
679 | # object support |
689 | # object support |
680 | |
690 | |
681 | sub reattach { |
691 | sub reattach { |
682 | # basically do the same as instantiate, without calling instantiate |
692 | # basically do the same as instantiate, without calling instantiate |
683 | my ($obj) = @_; |
693 | my ($obj) = @_; |
|
|
694 | |
|
|
695 | bless $obj, ref $obj; # re-bless in case extensions have been reloaded |
684 | |
696 | |
685 | my $registry = $obj->registry; |
697 | my $registry = $obj->registry; |
686 | |
698 | |
687 | @$registry = (); |
699 | @$registry = (); |
688 | |
700 | |
… | |
… | |
900 | } or warn "$ext not loaded: $@"; |
912 | } or warn "$ext not loaded: $@"; |
901 | } |
913 | } |
902 | } |
914 | } |
903 | |
915 | |
904 | ############################################################################# |
916 | ############################################################################# |
905 | # load/save/clean perl data associated with a map |
|
|
906 | |
|
|
907 | *cf::mapsupport::on_clean = sub { |
|
|
908 | my ($map) = @_; |
|
|
909 | |
|
|
910 | my $path = $map->tmpname; |
|
|
911 | defined $path or return; |
|
|
912 | |
|
|
913 | unlink "$path.pst"; |
|
|
914 | }; |
|
|
915 | |
|
|
916 | cf::map->attach (prio => -10000, package => cf::mapsupport::); |
|
|
917 | |
|
|
918 | ############################################################################# |
|
|
919 | |
917 | |
920 | =head2 CORE EXTENSIONS |
918 | =head2 CORE EXTENSIONS |
921 | |
919 | |
922 | Functions and methods that extend core crossfire objects. |
920 | Functions and methods that extend core crossfire objects. |
923 | |
921 | |
… | |
… | |
1077 | for (@$files) { |
1075 | for (@$files) { |
1078 | utf8::decode $_; |
1076 | utf8::decode $_; |
1079 | next if /\.(?:pl|pst)$/; |
1077 | next if /\.(?:pl|pst)$/; |
1080 | next unless /^$PATH_SEP/o; |
1078 | next unless /^$PATH_SEP/o; |
1081 | |
1079 | |
|
|
1080 | s/\.map$//; |
1082 | push @paths, "~" . $pl->ob->name . "/" . $_; |
1081 | push @paths, "~" . $pl->ob->name . "/" . $_; |
1083 | } |
1082 | } |
1084 | |
1083 | |
1085 | \@paths |
1084 | \@paths |
1086 | } |
1085 | } |
… | |
… | |
1114 | |
1113 | |
1115 | use Fcntl; |
1114 | use Fcntl; |
1116 | use Coro::AIO; |
1115 | use Coro::AIO; |
1117 | |
1116 | |
1118 | use overload |
1117 | use overload |
1119 | '""' => \&as_string; |
1118 | '""' => \&as_string, |
|
|
1119 | fallback => 1; |
1120 | |
1120 | |
1121 | our $MAX_RESET = 3600; |
1121 | our $MAX_RESET = 3600; |
1122 | our $DEFAULT_RESET = 3000; |
1122 | our $DEFAULT_RESET = 3000; |
1123 | |
1123 | |
1124 | sub generate_random_map { |
1124 | sub generate_random_map { |
… | |
… | |
1151 | } |
1151 | } |
1152 | |
1152 | |
1153 | # also paths starting with '/' |
1153 | # also paths starting with '/' |
1154 | $EXT_MAP{"cf::map"} = qr{^(?=/)}; |
1154 | $EXT_MAP{"cf::map"} = qr{^(?=/)}; |
1155 | |
1155 | |
|
|
1156 | sub thawer_merge { |
|
|
1157 | my ($self, $merge) = @_; |
|
|
1158 | |
|
|
1159 | # we have to keep some variables in memory intact |
|
|
1160 | local $self->{path}; |
|
|
1161 | local $self->{load_path}; |
|
|
1162 | local $self->{deny_save}; |
|
|
1163 | local $self->{deny_reset}; |
|
|
1164 | |
|
|
1165 | $self->SUPER::thawer_merge ($merge); |
|
|
1166 | } |
|
|
1167 | |
1156 | sub normalise { |
1168 | sub normalise { |
1157 | my ($path, $base) = @_; |
1169 | my ($path, $base) = @_; |
1158 | |
1170 | |
1159 | # map plan: |
1171 | # map plan: |
1160 | # |
1172 | # |
… | |
… | |
1220 | # the displayed name, this is a one way mapping |
1232 | # the displayed name, this is a one way mapping |
1221 | sub visible_name { |
1233 | sub visible_name { |
1222 | &as_string |
1234 | &as_string |
1223 | } |
1235 | } |
1224 | |
1236 | |
1225 | # escape the /'s in the path |
|
|
1226 | sub _escaped_path { |
|
|
1227 | (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; |
|
|
1228 | |
|
|
1229 | $path |
|
|
1230 | } |
|
|
1231 | |
|
|
1232 | # the original (read-only) location |
1237 | # the original (read-only) location |
1233 | sub load_path { |
1238 | sub load_path { |
1234 | my ($self) = @_; |
1239 | my ($self) = @_; |
1235 | |
1240 | |
1236 | sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} |
1241 | sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} |
… | |
… | |
1238 | |
1243 | |
1239 | # the temporary/swap location |
1244 | # the temporary/swap location |
1240 | sub save_path { |
1245 | sub save_path { |
1241 | my ($self) = @_; |
1246 | my ($self) = @_; |
1242 | |
1247 | |
|
|
1248 | (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; |
1243 | sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $self->_escaped_path |
1249 | sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path |
1244 | } |
1250 | } |
1245 | |
1251 | |
1246 | # the unique path, undef == no special unique path |
1252 | # the unique path, undef == no special unique path |
1247 | sub uniq_path { |
1253 | sub uniq_path { |
1248 | my ($self) = @_; |
1254 | my ($self) = @_; |
1249 | |
1255 | |
|
|
1256 | (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; |
1250 | sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path |
1257 | sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path |
1251 | } |
1258 | } |
1252 | |
1259 | |
1253 | # and all this just because we cannot iterate over |
1260 | # and all this just because we cannot iterate over |
1254 | # all maps in C++... |
1261 | # all maps in C++... |
1255 | sub change_all_map_light { |
1262 | sub change_all_map_light { |
… | |
… | |
1261 | |
1268 | |
1262 | sub unlink_save { |
1269 | sub unlink_save { |
1263 | my ($self) = @_; |
1270 | my ($self) = @_; |
1264 | |
1271 | |
1265 | utf8::encode (my $save = $self->save_path); |
1272 | utf8::encode (my $save = $self->save_path); |
1266 | IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; |
1273 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; |
1267 | IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; |
1274 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; |
1268 | } |
1275 | } |
1269 | |
1276 | |
1270 | sub load_header_from($) { |
1277 | sub load_header_from($) { |
1271 | my ($self, $path) = @_; |
1278 | my ($self, $path) = @_; |
1272 | |
1279 | |
… | |
… | |
1333 | |
1340 | |
1334 | $map->load_header |
1341 | $map->load_header |
1335 | or return; |
1342 | or return; |
1336 | |
1343 | |
1337 | if ($map->should_reset) { |
1344 | if ($map->should_reset) { |
|
|
1345 | $cf::WAIT_FOR_TICK->wait; |
1338 | $map->reset; |
1346 | $map->reset; |
1339 | undef $guard; |
1347 | undef $guard; |
1340 | $map = find $path |
1348 | $map = find $path |
1341 | or return; |
1349 | or return; |
1342 | } |
1350 | } |
… | |
… | |
1512 | |
1520 | |
1513 | sub reset_at { |
1521 | sub reset_at { |
1514 | my ($self) = @_; |
1522 | my ($self) = @_; |
1515 | |
1523 | |
1516 | # TODO: safety, remove and allow resettable per-player maps |
1524 | # TODO: safety, remove and allow resettable per-player maps |
1517 | return 1e99 if $self->isa ("ext::map_per_player"); |
1525 | return 1e99 if $self->isa ("ext::map_per_player");#d# |
1518 | return 1e99 if $self->{deny_reset}; |
1526 | return 1e99 if $self->{deny_reset}; |
1519 | |
1527 | |
1520 | my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; |
1528 | my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; |
1521 | my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; |
1529 | my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; |
1522 | |
1530 | |
… | |
… | |
1544 | } |
1552 | } |
1545 | |
1553 | |
1546 | sub reset { |
1554 | sub reset { |
1547 | my ($self) = @_; |
1555 | my ($self) = @_; |
1548 | |
1556 | |
1549 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
1557 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
1550 | |
1558 | |
1551 | return if $self->players; |
1559 | return if $self->players; |
1552 | return if $self->isa ("ext::map_per_player");#d# |
1560 | return if $self->isa ("ext::map_per_player");#d# |
1553 | |
1561 | |
1554 | warn "resetting map ", $self->path;#d# |
1562 | warn "resetting map ", $self->path;#d# |
1555 | |
1563 | |
1556 | delete $cf::MAP{$self->path}; |
1564 | delete $cf::MAP{$self->path}; |
|
|
1565 | |
|
|
1566 | $self->in_memory (cf::MAP_SWAPPED); |
|
|
1567 | $self->clear; |
1557 | |
1568 | |
1558 | $_->clear_links_to ($self) for values %cf::MAP; |
1569 | $_->clear_links_to ($self) for values %cf::MAP; |
1559 | |
1570 | |
1560 | $self->unlink_save; |
1571 | $self->unlink_save; |
1561 | $self->destroy; |
1572 | $self->destroy; |
… | |
… | |
1588 | for (@$files) { |
1599 | for (@$files) { |
1589 | utf8::decode $_; |
1600 | utf8::decode $_; |
1590 | next if /\.pst$/; |
1601 | next if /\.pst$/; |
1591 | next unless /^$PATH_SEP/o; |
1602 | next unless /^$PATH_SEP/o; |
1592 | |
1603 | |
|
|
1604 | s/\.map$//; |
1593 | push @paths, $_; |
1605 | push @paths, $_; |
1594 | } |
1606 | } |
1595 | |
1607 | |
1596 | \@paths |
1608 | \@paths |
1597 | } |
1609 | } |
… | |
… | |
2254 | warn "enter emergency perl save\n"; |
2266 | warn "enter emergency perl save\n"; |
2255 | |
2267 | |
2256 | cf::sync_job { |
2268 | cf::sync_job { |
2257 | # use a peculiar iteration method to avoid tripping on perl |
2269 | # use a peculiar iteration method to avoid tripping on perl |
2258 | # refcount bugs in for. also avoids problems with players |
2270 | # refcount bugs in for. also avoids problems with players |
2259 | # and maps saved/Destroyed asynchronously. |
2271 | # and maps saved/destroyed asynchronously. |
2260 | warn "begin emergency player save\n"; |
2272 | warn "begin emergency player save\n"; |
2261 | for my $login (keys %cf::PLAYER) { |
2273 | for my $login (keys %cf::PLAYER) { |
2262 | my $pl = $cf::PLAYER{$login} or next; |
2274 | my $pl = $cf::PLAYER{$login} or next; |
2263 | $pl->valid or next; |
2275 | $pl->valid or next; |
2264 | $pl->save; |
2276 | $pl->save; |
… | |
… | |
2416 | }, |
2428 | }, |
2417 | ); |
2429 | ); |
2418 | |
2430 | |
2419 | IO::AIO::max_poll_time $TICK * 0.2; |
2431 | IO::AIO::max_poll_time $TICK * 0.2; |
2420 | |
2432 | |
2421 | Event->io ( |
2433 | $AIO_POLL_WATCHER = Event->io ( |
2422 | fd => IO::AIO::poll_fileno, |
2434 | fd => IO::AIO::poll_fileno, |
2423 | poll => 'r', |
2435 | poll => 'r', |
2424 | prio => 5, |
2436 | prio => 5, |
2425 | data => WF_AUTOCANCEL, |
2437 | data => WF_AUTOCANCEL, |
2426 | cb => \&IO::AIO::poll_cb, |
2438 | cb => \&IO::AIO::poll_cb, |
2427 | ); |
2439 | ); |
2428 | |
2440 | |
2429 | Event->timer ( |
2441 | $WRITE_RUNTIME_WATCHER = Event->timer ( |
2430 | data => WF_AUTOCANCEL, |
2442 | data => WF_AUTOCANCEL, |
2431 | after => 0, |
2443 | after => 0, |
2432 | interval => 10, |
2444 | interval => 10, |
2433 | cb => sub { |
2445 | cb => sub { |
2434 | (Coro::unblock_sub { |
2446 | (Coro::unblock_sub { |