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.171 by root, Sun Jan 14 12:24:48 2007 UTC vs.
Revision 1.181 by root, Fri Jan 19 15:29:52 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;
… …
957 957
958sub exists($) { 958sub exists($) {
959 my ($login) = @_; 959 my ($login) = @_;
960 960
961 $cf::PLAYER{$login} 961 $cf::PLAYER{$login}
962 or cf::sync_job { !aio_stat $login } 962 or cf::sync_job { !aio_stat path $login }
963} 963}
964 964
965sub find($) { 965sub find($) {
966 return $cf::PLAYER{$_[0]} || do { 966 return $cf::PLAYER{$_[0]} || do {
967 my $login = $_[0]; 967 my $login = $_[0];
… …
1113 1113
1114use Fcntl; 1114use Fcntl;
1115use Coro::AIO; 1115use Coro::AIO;
1116 1116
1117use overload 1117use overload
1118 '""' => \&as_string; 1118 '""' => \&as_string,
1119 fallback => 1;
1119 1120
1120our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1121our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1122 1123
1123sub generate_random_map { 1124sub generate_random_map {
1124 my ($self, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1125
1126 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1127 $self->_create_random_map ( 1127 $self->_create_random_map (
1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1151 1151
1152# also paths starting with '/' 1152# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1153$EXT_MAP{"cf::map"} = qr{^(?=/)};
1154 1154
1155sub thawer_merge { 1155sub thawer_merge {
1156 my ($self, $merge) = @_;
1157
1156 # we have to keep some variables in memory intact 1158 # we have to keep some variables in memory intact
1157 local $_[0]{path}; 1159 local $self->{path};
1160 local $self->{load_path};
1158 local $_[0]{deny_save}; 1161 local $self->{deny_save};
1159 local $_[0]{deny_reset}; 1162 local $self->{deny_reset};
1160 1163
1161 $_[0]->SUPER::thawer_merge ($_[1]); 1164 $self->SUPER::thawer_merge ($merge);
1162} 1165}
1163 1166
1164sub normalise { 1167sub normalise {
1165 my ($path, $base) = @_; 1168 my ($path, $base) = @_;
1166 1169
… …
1531 my ($self) = @_; 1534 my ($self) = @_;
1532 1535
1533 $self->reset_at <= $cf::RUNTIME 1536 $self->reset_at <= $cf::RUNTIME
1534} 1537}
1535 1538
1536sub rename {
1537 my ($self, $new_path) = @_;
1538
1539 normalise $new_path;
1540
1541 $self->unlink_save;
1542
1543 delete $cf::MAP{$self->path};
1544 $self->{path} = $new_path; $self->path ($self->{path});
1545 $cf::MAP{$self->path} = $self;
1546
1547 $self->save;
1548}
1549
1550sub reset { 1539sub reset {
1551 my ($self) = @_; 1540 my ($self) = @_;
1552 1541
1553 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1542 my $lock = cf::lock_acquire "map_data:$self->{path}";
1554 1543
… …
1571my $nuke_counter = "aaaa"; 1560my $nuke_counter = "aaaa";
1572 1561
1573sub nuke { 1562sub nuke {
1574 my ($self) = @_; 1563 my ($self) = @_;
1575 1564
1565 delete $cf::MAP{$self->path};
1566
1567 $self->unlink_save;
1568
1569 bless $self, "cf::map";
1570 delete $self->{deny_reset};
1576 $self->{deny_save} = 1; 1571 $self->{deny_save} = 1;
1577 $self->reset_timeout (1); 1572 $self->reset_timeout (1);
1578 $self->rename ("{nuke}/" . ($nuke_counter++)); 1573 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1574
1575 $cf::MAP{$self->path} = $self;
1576
1579 $self->reset; # polite request, might not happen 1577 $self->reset; # polite request, might not happen
1580} 1578}
1581 1579
1582=item cf::map::unique_maps 1580=item cf::map::unique_maps
1583 1581
… …
1814 1812
1815sub parse_random_map_params { 1813sub parse_random_map_params {
1816 my ($spec) = @_; 1814 my ($spec) = @_;
1817 1815
1818 my $rmp = { # defaults 1816 my $rmp = { # defaults
1819 xsize => 10, 1817 xsize => (cf::rndm 15, 40),
1820 ysize => 10, 1818 ysize => (cf::rndm 15, 40),
1819 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1820 #layout => string
1821 }; 1821 };
1822 1822
1823 for (split /\n/, $spec) { 1823 for (split /\n/, $spec) {
1824 my ($k, $v) = split /\s+/, $_, 2; 1824 my ($k, $v) = split /\s+/, $_, 2;
1825 1825
… …
1829 $rmp 1829 $rmp
1830} 1830}
1831 1831
1832sub prepare_random_map { 1832sub prepare_random_map {
1833 my ($exit) = @_; 1833 my ($exit) = @_;
1834
1835 my $guard = cf::lock_acquire "exit_prepare:$exit";
1834 1836
1835 # all this does is basically replace the /! path by 1837 # all this does is basically replace the /! path by
1836 # a new random map path (?random/...) with a seed 1838 # a new random map path (?random/...) with a seed
1837 # that depends on the exit object 1839 # that depends on the exit object
1838 1840
… …
1847 1849
1848 $rmp->{random_seed} ||= $exit->random_seed; 1850 $rmp->{random_seed} ||= $exit->random_seed;
1849 1851
1850 my $data = cf::to_json $rmp; 1852 my $data = cf::to_json $rmp;
1851 my $md5 = Digest::MD5::md5_hex $data; 1853 my $md5 = Digest::MD5::md5_hex $data;
1854 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1852 1855
1853 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) {
1854 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;
1855 1860
1856 $exit->slaying ("?random/$md5"); 1861 $exit->slaying ("?random/$md5");
1857 $exit->msg (undef); 1862 $exit->msg (undef);
1858 } 1863 }
1859} 1864}
… …
2229 2234
2230sub main { 2235sub main {
2231 # we must not ever block the main coroutine 2236 # we must not ever block the main coroutine
2232 local $Coro::idle = sub { 2237 local $Coro::idle = sub {
2233 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 {
2234 async { Event::one_event }; 2240 Event::one_event;
2241 })->prio (Coro::PRIO_MAX);
2235 }; 2242 };
2236 2243
2237 cfg_load; 2244 cfg_load;
2238 db_load; 2245 db_load;
2239 load_extensions; 2246 load_extensions;
… …
2387 } 2394 }
2388 2395
2389 warn "reloaded"; 2396 warn "reloaded";
2390}; 2397};
2391 2398
2399our $RELOAD_WATCHER; # used only during reload
2400
2392register_command "reload" => sub { 2401register_command "reload" => sub {
2393 my ($who, $arg) = @_; 2402 my ($who, $arg) = @_;
2394 2403
2395 if ($who->flag (FLAG_WIZ)) { 2404 if ($who->flag (FLAG_WIZ)) {
2396 $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 {
2397 reload; 2411 reload;
2398 $who->message ("end of reload."); 2412 undef $RELOAD_WATCHER;
2413 });
2399 } 2414 }
2400}; 2415};
2401 2416
2402unshift @INC, $LIBDIR; 2417unshift @INC, $LIBDIR;
2403 2418

Diff Legend

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