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.169 by root, Sun Jan 14 01:09:46 2007 UTC vs.
Revision 1.178 by root, Thu Jan 18 00:06:55 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;
… …
503our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
504our @CB_MAP = (); 504our @CB_MAP = ();
505 505
506my %attachment; 506my %attachment;
507 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
508sub _attach_cb($$$$) { 514sub _attach_cb($$$$) {
509 my ($registry, $event, $prio, $cb) = @_; 515 my ($registry, $event, $prio, $cb) = @_;
510 516
511 use sort 'stable'; 517 use sort 'stable';
512 518
… …
1107 1113
1108use Fcntl; 1114use Fcntl;
1109use Coro::AIO; 1115use Coro::AIO;
1110 1116
1111use overload 1117use overload
1112 '""' => \&as_string; 1118 '""' => \&as_string,
1119 fallback => 1;
1113 1120
1114our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1115our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1116 1123
1117sub generate_random_map { 1124sub generate_random_map {
1118 my ($self, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1119
1120 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1121 $self->_create_random_map ( 1127 $self->_create_random_map (
1122 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1123 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1124 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1144} 1150}
1145 1151
1146# also paths starting with '/' 1152# also paths starting with '/'
1147$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1153$EXT_MAP{"cf::map"} = qr{^(?=/)};
1148 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
1149sub normalise { 1167sub normalise {
1150 my ($path, $base) = @_; 1168 my ($path, $base) = @_;
1151 1169
1152 # map plan: 1170 # map plan:
1153 # 1171 #
… …
1249 1267
1250sub unlink_save { 1268sub unlink_save {
1251 my ($self) = @_; 1269 my ($self) = @_;
1252 1270
1253 utf8::encode (my $save = $self->save_path); 1271 utf8::encode (my $save = $self->save_path);
1254 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1272 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1255 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1256} 1274}
1257 1275
1258sub load_header_from($) { 1276sub load_header_from($) {
1259 my ($self, $path) = @_; 1277 my ($self, $path) = @_;
1260 1278
… …
1321 1339
1322 $map->load_header 1340 $map->load_header
1323 or return; 1341 or return;
1324 1342
1325 if ($map->should_reset) { 1343 if ($map->should_reset) {
1344 $cf::WAIT_FOR_TICK->wait;
1326 $map->reset; 1345 $map->reset;
1327 undef $guard; 1346 undef $guard;
1328 $map = find $path 1347 $map = find $path
1329 or return; 1348 or return;
1330 } 1349 }
… …
1515 my ($self) = @_; 1534 my ($self) = @_;
1516 1535
1517 $self->reset_at <= $cf::RUNTIME 1536 $self->reset_at <= $cf::RUNTIME
1518} 1537}
1519 1538
1520sub rename {
1521 my ($self, $new_path) = @_;
1522
1523 normalise $new_path;
1524
1525 $self->unlink_save;
1526
1527 delete $cf::MAP{$self->path};
1528 $self->{path} = $new_path; $self->path ($self->{path});
1529 $cf::MAP{$self->path} = $self;
1530
1531 $self->save;
1532}
1533
1534sub reset { 1539sub reset {
1535 my ($self) = @_; 1540 my ($self) = @_;
1536 1541
1537 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1542 my $lock = cf::lock_acquire "map_data:$self->{path}";
1538 1543
… …
1555my $nuke_counter = "aaaa"; 1560my $nuke_counter = "aaaa";
1556 1561
1557sub nuke { 1562sub nuke {
1558 my ($self) = @_; 1563 my ($self) = @_;
1559 1564
1565 delete $cf::MAP{$self->path};
1566
1567 $self->unlink_save;
1568
1569 bless $self, "cf::map";
1570 delete $self->{deny_reset};
1560 $self->{deny_save} = 1; 1571 $self->{deny_save} = 1;
1561 $self->reset_timeout (1); 1572 $self->reset_timeout (1);
1562 $self->rename ("{nuke}/" . ($nuke_counter++)); 1573 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1574
1575 $cf::MAP{$self->path} = $self;
1576
1563 $self->reset; # polite request, might not happen 1577 $self->reset; # polite request, might not happen
1564} 1578}
1565 1579
1566=item cf::map::unique_maps 1580=item cf::map::unique_maps
1567 1581
… …
1798 1812
1799sub parse_random_map_params { 1813sub parse_random_map_params {
1800 my ($spec) = @_; 1814 my ($spec) = @_;
1801 1815
1802 my $rmp = { # defaults 1816 my $rmp = { # defaults
1803 xsize => 10, 1817 xsize => -1,
1804 ysize => 10, 1818 ysize => -1,
1805 }; 1819 };
1806 1820
1807 for (split /\n/, $spec) { 1821 for (split /\n/, $spec) {
1808 my ($k, $v) = split /\s+/, $_, 2; 1822 my ($k, $v) = split /\s+/, $_, 2;
1809 1823
… …
1831 1845
1832 $rmp->{random_seed} ||= $exit->random_seed; 1846 $rmp->{random_seed} ||= $exit->random_seed;
1833 1847
1834 my $data = cf::to_json $rmp; 1848 my $data = cf::to_json $rmp;
1835 my $md5 = Digest::MD5::md5_hex $data; 1849 my $md5 = Digest::MD5::md5_hex $data;
1850 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1836 1851
1837 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1852 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1838 aio_write $fh, 0, (length $data), $data, 0; 1853 aio_write $fh, 0, (length $data), $data, 0;
1854 undef $fh;
1855 aio_rename "$meta~", $meta;
1839 1856
1840 $exit->slaying ("?random/$md5"); 1857 $exit->slaying ("?random/$md5");
1841 $exit->msg (undef); 1858 $exit->msg (undef);
1842 } 1859 }
1843} 1860}
… …
2213 2230
2214sub main { 2231sub main {
2215 # we must not ever block the main coroutine 2232 # we must not ever block the main coroutine
2216 local $Coro::idle = sub { 2233 local $Coro::idle = sub {
2217 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2234 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2235 (async {
2218 async { Event::one_event }; 2236 Event::one_event;
2237 })->prio (Coro::PRIO_MAX);
2219 }; 2238 };
2220 2239
2221 cfg_load; 2240 cfg_load;
2222 db_load; 2241 db_load;
2223 load_extensions; 2242 load_extensions;
… …
2371 } 2390 }
2372 2391
2373 warn "reloaded"; 2392 warn "reloaded";
2374}; 2393};
2375 2394
2395our $RELOAD_WATCHER; # used only during reload
2396
2376register_command "reload" => sub { 2397register_command "reload" => sub {
2377 my ($who, $arg) = @_; 2398 my ($who, $arg) = @_;
2378 2399
2379 if ($who->flag (FLAG_WIZ)) { 2400 if ($who->flag (FLAG_WIZ)) {
2380 $who->message ("start of reload."); 2401 $who->message ("reloading server.");
2402
2403 # doing reload synchronously and two reloads happen back-to-back,
2404 # coro crashes during coro_state_free->destroy here.
2405
2406 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2381 reload; 2407 reload;
2382 $who->message ("end of reload."); 2408 undef $RELOAD_WATCHER;
2409 });
2383 } 2410 }
2384}; 2411};
2385 2412
2386unshift @INC, $LIBDIR; 2413unshift @INC, $LIBDIR;
2387 2414

Diff Legend

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