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.166 by root, Sat Jan 13 23:06:13 2007 UTC vs.
Revision 1.182 by root, Fri Jan 19 15:38:01 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3 (); 13use Coro 3.4 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
44our @EVENT; 44our @EVENT;
45our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
46 46
47our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
49our $NEXT_TICK; 51our $NEXT_TICK;
50our $NOW; 52our $NOW;
51 53
52our %CFG; 54our %CFG;
53 55
… …
257} 259}
258 260
259sub freeze_mainloop { 261sub 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
342sub write_runtime { 348sub 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
… …
499our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
500our @CB_MAP = (); 504our @CB_MAP = ();
501 505
502my %attachment; 506my %attachment;
503 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
504sub _attach_cb($$$$) { 514sub _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
681sub reattach { 691sub 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
916cf::map->attach (prio => -10000, package => cf::mapsupport::);
917
918#############################################################################
919 917
920=head2 CORE EXTENSIONS 918=head2 CORE EXTENSIONS
921 919
922Functions and methods that extend core crossfire objects. 920Functions and methods that extend core crossfire objects.
923 921
… …
959 957
960sub exists($) { 958sub exists($) {
961 my ($login) = @_; 959 my ($login) = @_;
962 960
963 $cf::PLAYER{$login} 961 $cf::PLAYER{$login}
964 or cf::sync_job { !aio_stat $login } 962 or cf::sync_job { !aio_stat path $login }
965} 963}
966 964
967sub find($) { 965sub find($) {
968 return $cf::PLAYER{$_[0]} || do { 966 return $cf::PLAYER{$_[0]} || do {
969 my $login = $_[0]; 967 my $login = $_[0];
… …
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
1115use Fcntl; 1114use Fcntl;
1116use Coro::AIO; 1115use Coro::AIO;
1117 1116
1118use overload 1117use overload
1119 '""' => \&as_string; 1118 '""' => \&as_string,
1119 fallback => 1;
1120 1120
1121our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1122our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1123 1123
1124sub generate_random_map { 1124sub generate_random_map {
1125 my ($self, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1126
1127 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1128 $self->_create_random_map ( 1127 $self->_create_random_map (
1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1151} 1150}
1152 1151
1153# also paths starting with '/' 1152# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1153$EXT_MAP{"cf::map"} = qr{^(?=/)};
1155 1154
1155sub thawer_merge {
1156 my ($self, $merge) = @_;
1157
1158 # we have to keep some variables in memory intact
1159 local $self->{path};
1160 local $self->{load_path};
1161 local $self->{deny_save};
1162 local $self->{deny_reset};
1163
1164 $self->SUPER::thawer_merge ($merge);
1165}
1166
1156sub normalise { 1167sub normalise {
1157 my ($path, $base) = @_; 1168 my ($path, $base) = @_;
1158 1169
1159 # map plan: 1170 # map plan:
1160 # 1171 #
… …
1220# the displayed name, this is a one way mapping 1231# the displayed name, this is a one way mapping
1221sub visible_name { 1232sub visible_name {
1222 &as_string 1233 &as_string
1223} 1234}
1224 1235
1225# escape the /'s in the path
1226sub _escaped_path {
1227 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228
1229 $path
1230}
1231
1232# the original (read-only) location 1236# the original (read-only) location
1233sub load_path { 1237sub load_path {
1234 my ($self) = @_; 1238 my ($self) = @_;
1235 1239
1236 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
… …
1238 1242
1239# the temporary/swap location 1243# the temporary/swap location
1240sub save_path { 1244sub save_path {
1241 my ($self) = @_; 1245 my ($self) = @_;
1242 1246
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1243 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $self->_escaped_path 1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1244} 1249}
1245 1250
1246# the unique path, undef == no special unique path 1251# the unique path, undef == no special unique path
1247sub uniq_path { 1252sub uniq_path {
1248 my ($self) = @_; 1253 my ($self) = @_;
1249 1254
1255 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1250 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 1256 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1251} 1257}
1252 1258
1253# and all this just because we cannot iterate over 1259# and all this just because we cannot iterate over
1254# all maps in C++... 1260# all maps in C++...
1255sub change_all_map_light { 1261sub change_all_map_light {
… …
1261 1267
1262sub unlink_save { 1268sub unlink_save {
1263 my ($self) = @_; 1269 my ($self) = @_;
1264 1270
1265 utf8::encode (my $save = $self->save_path); 1271 utf8::encode (my $save = $self->save_path);
1266 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1272 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1267 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1268} 1274}
1269 1275
1270sub load_header_from($) { 1276sub load_header_from($) {
1271 my ($self, $path) = @_; 1277 my ($self, $path) = @_;
1272 1278
… …
1333 1339
1334 $map->load_header 1340 $map->load_header
1335 or return; 1341 or return;
1336 1342
1337 if ($map->should_reset) { 1343 if ($map->should_reset) {
1344 $cf::WAIT_FOR_TICK->wait;
1338 $map->reset; 1345 $map->reset;
1339 undef $guard; 1346 undef $guard;
1340 $map = find $path 1347 $map = find $path
1341 or return; 1348 or return;
1342 } 1349 }
… …
1512 1519
1513sub reset_at { 1520sub reset_at {
1514 my ($self) = @_; 1521 my ($self) = @_;
1515 1522
1516 # TODO: safety, remove and allow resettable per-player maps 1523 # TODO: safety, remove and allow resettable per-player maps
1517 return 1e99 if $self->isa ("ext::map_per_player"); 1524 return 1e99 if $self->isa ("ext::map_per_player");#d#
1518 return 1e99 if $self->{deny_reset}; 1525 return 1e99 if $self->{deny_reset};
1519 1526
1520 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1527 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1521 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1528 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1522 1529
… …
1527 my ($self) = @_; 1534 my ($self) = @_;
1528 1535
1529 $self->reset_at <= $cf::RUNTIME 1536 $self->reset_at <= $cf::RUNTIME
1530} 1537}
1531 1538
1532sub rename {
1533 my ($self, $new_path) = @_;
1534
1535 normalise $new_path;
1536
1537 $self->unlink_save;
1538
1539 delete $cf::MAP{$self->path};
1540 $self->{path} = $new_path; $self->path ($self->{path});
1541 $cf::MAP{$self->path} = $self;
1542
1543 $self->save;
1544}
1545
1546sub reset { 1539sub reset {
1547 my ($self) = @_; 1540 my ($self) = @_;
1548 1541
1549 my $lock = cf::lock_acquire "map_data:" . $self->path; 1542 my $lock = cf::lock_acquire "map_data:$self->{path}";
1550 1543
1551 return if $self->players; 1544 return if $self->players;
1552 return if $self->isa ("ext::map_per_player");#d# 1545 return if $self->isa ("ext::map_per_player");#d#
1553 1546
1554 warn "resetting map ", $self->path;#d# 1547 warn "resetting map ", $self->path;#d#
1555 1548
1556 delete $cf::MAP{$self->path}; 1549 delete $cf::MAP{$self->path};
1557 1550
1551 $self->in_memory (cf::MAP_SWAPPED);
1552 $self->clear;
1553
1558 $_->clear_links_to ($self) for values %cf::MAP; 1554 $_->clear_links_to ($self) for values %cf::MAP;
1559 1555
1560 $self->unlink_save; 1556 $self->unlink_save;
1561 $self->destroy; 1557 $self->destroy;
1562} 1558}
… …
1564my $nuke_counter = "aaaa"; 1560my $nuke_counter = "aaaa";
1565 1561
1566sub nuke { 1562sub nuke {
1567 my ($self) = @_; 1563 my ($self) = @_;
1568 1564
1565 delete $cf::MAP{$self->path};
1566
1567 $self->unlink_save;
1568
1569 bless $self, "cf::map";
1570 delete $self->{deny_reset};
1569 $self->{deny_save} = 1; 1571 $self->{deny_save} = 1;
1570 $self->reset_timeout (1); 1572 $self->reset_timeout (1);
1571 $self->rename ("{nuke}/" . ($nuke_counter++)); 1573 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1574
1575 $cf::MAP{$self->path} = $self;
1576
1572 $self->reset; # polite request, might not happen 1577 $self->reset; # polite request, might not happen
1573} 1578}
1574 1579
1575=item cf::map::unique_maps 1580=item cf::map::unique_maps
1576 1581
… …
1588 for (@$files) { 1593 for (@$files) {
1589 utf8::decode $_; 1594 utf8::decode $_;
1590 next if /\.pst$/; 1595 next if /\.pst$/;
1591 next unless /^$PATH_SEP/o; 1596 next unless /^$PATH_SEP/o;
1592 1597
1598 s/\.map$//;
1593 push @paths, $_; 1599 push @paths, $_;
1594 } 1600 }
1595 1601
1596 \@paths 1602 \@paths
1597} 1603}
… …
1806 1812
1807sub parse_random_map_params { 1813sub parse_random_map_params {
1808 my ($spec) = @_; 1814 my ($spec) = @_;
1809 1815
1810 my $rmp = { # defaults 1816 my $rmp = { # defaults
1811 xsize => 10, 1817 xsize => (cf::rndm 15, 40),
1812 ysize => 10, 1818 ysize => (cf::rndm 15, 40),
1819 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1820 #layout => string,
1813 }; 1821 };
1814 1822
1815 for (split /\n/, $spec) { 1823 for (split /\n/, $spec) {
1816 my ($k, $v) = split /\s+/, $_, 2; 1824 my ($k, $v) = split /\s+/, $_, 2;
1817 1825
… …
1821 $rmp 1829 $rmp
1822} 1830}
1823 1831
1824sub prepare_random_map { 1832sub prepare_random_map {
1825 my ($exit) = @_; 1833 my ($exit) = @_;
1834
1835 my $guard = cf::lock_acquire "exit_prepare:$exit";
1826 1836
1827 # all this does is basically replace the /! path by 1837 # all this does is basically replace the /! path by
1828 # a new random map path (?random/...) with a seed 1838 # a new random map path (?random/...) with a seed
1829 # that depends on the exit object 1839 # that depends on the exit object
1830 1840
… …
1839 1849
1840 $rmp->{random_seed} ||= $exit->random_seed; 1850 $rmp->{random_seed} ||= $exit->random_seed;
1841 1851
1842 my $data = cf::to_json $rmp; 1852 my $data = cf::to_json $rmp;
1843 my $md5 = Digest::MD5::md5_hex $data; 1853 my $md5 = Digest::MD5::md5_hex $data;
1854 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1844 1855
1845 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1856 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1846 aio_write $fh, 0, (length $data), $data, 0; 1857 aio_write $fh, 0, (length $data), $data, 0;
1858 undef $fh;
1859 aio_rename "$meta~", $meta;
1847 1860
1848 $exit->slaying ("?random/$md5"); 1861 $exit->slaying ("?random/$md5");
1849 $exit->msg (undef); 1862 $exit->msg (undef);
1850 } 1863 }
1851} 1864}
… …
2221 2234
2222sub main { 2235sub main {
2223 # we must not ever block the main coroutine 2236 # we must not ever block the main coroutine
2224 local $Coro::idle = sub { 2237 local $Coro::idle = sub {
2225 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2238 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2239 (async {
2226 async { Event::one_event }; 2240 Event::one_event;
2241 })->prio (Coro::PRIO_MAX);
2227 }; 2242 };
2228 2243
2229 cfg_load; 2244 cfg_load;
2230 db_load; 2245 db_load;
2231 load_extensions; 2246 load_extensions;
… …
2254 warn "enter emergency perl save\n"; 2269 warn "enter emergency perl save\n";
2255 2270
2256 cf::sync_job { 2271 cf::sync_job {
2257 # use a peculiar iteration method to avoid tripping on perl 2272 # use a peculiar iteration method to avoid tripping on perl
2258 # refcount bugs in for. also avoids problems with players 2273 # refcount bugs in for. also avoids problems with players
2259 # and maps saved/Destroyed asynchronously. 2274 # and maps saved/destroyed asynchronously.
2260 warn "begin emergency player save\n"; 2275 warn "begin emergency player save\n";
2261 for my $login (keys %cf::PLAYER) { 2276 for my $login (keys %cf::PLAYER) {
2262 my $pl = $cf::PLAYER{$login} or next; 2277 my $pl = $cf::PLAYER{$login} or next;
2263 $pl->valid or next; 2278 $pl->valid or next;
2264 $pl->save; 2279 $pl->save;
… …
2379 } 2394 }
2380 2395
2381 warn "reloaded"; 2396 warn "reloaded";
2382}; 2397};
2383 2398
2399our $RELOAD_WATCHER; # used only during reload
2400
2384register_command "reload" => sub { 2401register_command "reload" => sub {
2385 my ($who, $arg) = @_; 2402 my ($who, $arg) = @_;
2386 2403
2387 if ($who->flag (FLAG_WIZ)) { 2404 if ($who->flag (FLAG_WIZ)) {
2388 $who->message ("start of reload."); 2405 $who->message ("reloading server.");
2406
2407 # doing reload synchronously and two reloads happen back-to-back,
2408 # coro crashes during coro_state_free->destroy here.
2409
2410 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2389 reload; 2411 reload;
2390 $who->message ("end of reload."); 2412 undef $RELOAD_WATCHER;
2413 });
2391 } 2414 }
2392}; 2415};
2393 2416
2394unshift @INC, $LIBDIR; 2417unshift @INC, $LIBDIR;
2395 2418
… …
2416 }, 2439 },
2417); 2440);
2418 2441
2419IO::AIO::max_poll_time $TICK * 0.2; 2442IO::AIO::max_poll_time $TICK * 0.2;
2420 2443
2421Event->io ( 2444$AIO_POLL_WATCHER = Event->io (
2422 fd => IO::AIO::poll_fileno, 2445 fd => IO::AIO::poll_fileno,
2423 poll => 'r', 2446 poll => 'r',
2424 prio => 5, 2447 prio => 5,
2425 data => WF_AUTOCANCEL, 2448 data => WF_AUTOCANCEL,
2426 cb => \&IO::AIO::poll_cb, 2449 cb => \&IO::AIO::poll_cb,
2427); 2450);
2428 2451
2429Event->timer ( 2452$WRITE_RUNTIME_WATCHER = Event->timer (
2430 data => WF_AUTOCANCEL, 2453 data => WF_AUTOCANCEL,
2431 after => 0, 2454 after => 0,
2432 interval => 10, 2455 interval => 10,
2433 cb => sub { 2456 cb => sub {
2434 (Coro::unblock_sub { 2457 (Coro::unblock_sub {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines