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.168 by root, Sun Jan 14 00:37:14 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
… …
683# object support 689# object support
684 690
685sub reattach { 691sub reattach {
686 # basically do the same as instantiate, without calling instantiate 692 # basically do the same as instantiate, without calling instantiate
687 my ($obj) = @_; 693 my ($obj) = @_;
694
695 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
688 696
689 my $registry = $obj->registry; 697 my $registry = $obj->registry;
690 698
691 @$registry = (); 699 @$registry = ();
692 700
… …
1105 1113
1106use Fcntl; 1114use Fcntl;
1107use Coro::AIO; 1115use Coro::AIO;
1108 1116
1109use overload 1117use overload
1110 '""' => \&as_string; 1118 '""' => \&as_string,
1119 fallback => 1;
1111 1120
1112our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1113our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1114 1123
1115sub generate_random_map { 1124sub generate_random_map {
1116 my ($self, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1117
1118 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1119 $self->_create_random_map ( 1127 $self->_create_random_map (
1120 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1121 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1122 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1142} 1150}
1143 1151
1144# also paths starting with '/' 1152# also paths starting with '/'
1145$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1153$EXT_MAP{"cf::map"} = qr{^(?=/)};
1146 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
1147sub normalise { 1167sub normalise {
1148 my ($path, $base) = @_; 1168 my ($path, $base) = @_;
1149 1169
1150 # map plan: 1170 # map plan:
1151 # 1171 #
… …
1247 1267
1248sub unlink_save { 1268sub unlink_save {
1249 my ($self) = @_; 1269 my ($self) = @_;
1250 1270
1251 utf8::encode (my $save = $self->save_path); 1271 utf8::encode (my $save = $self->save_path);
1252 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1272 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1253 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1254} 1274}
1255 1275
1256sub load_header_from($) { 1276sub load_header_from($) {
1257 my ($self, $path) = @_; 1277 my ($self, $path) = @_;
1258 1278
… …
1319 1339
1320 $map->load_header 1340 $map->load_header
1321 or return; 1341 or return;
1322 1342
1323 if ($map->should_reset) { 1343 if ($map->should_reset) {
1344 $cf::WAIT_FOR_TICK->wait;
1324 $map->reset; 1345 $map->reset;
1325 undef $guard; 1346 undef $guard;
1326 $map = find $path 1347 $map = find $path
1327 or return; 1348 or return;
1328 } 1349 }
… …
1498 1519
1499sub reset_at { 1520sub reset_at {
1500 my ($self) = @_; 1521 my ($self) = @_;
1501 1522
1502 # TODO: safety, remove and allow resettable per-player maps 1523 # TODO: safety, remove and allow resettable per-player maps
1503 return 1e99 if $self->isa ("ext::map_per_player"); 1524 return 1e99 if $self->isa ("ext::map_per_player");#d#
1504 return 1e99 if $self->{deny_reset}; 1525 return 1e99 if $self->{deny_reset};
1505 1526
1506 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1527 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1507 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;
1508 1529
… …
1513 my ($self) = @_; 1534 my ($self) = @_;
1514 1535
1515 $self->reset_at <= $cf::RUNTIME 1536 $self->reset_at <= $cf::RUNTIME
1516} 1537}
1517 1538
1518sub rename {
1519 my ($self, $new_path) = @_;
1520
1521 normalise $new_path;
1522
1523 $self->unlink_save;
1524
1525 delete $cf::MAP{$self->path};
1526 $self->{path} = $new_path; $self->path ($self->{path});
1527 $cf::MAP{$self->path} = $self;
1528
1529 $self->save;
1530}
1531
1532sub reset { 1539sub reset {
1533 my ($self) = @_; 1540 my ($self) = @_;
1534 1541
1535 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1542 my $lock = cf::lock_acquire "map_data:$self->{path}";
1536 1543
… …
1553my $nuke_counter = "aaaa"; 1560my $nuke_counter = "aaaa";
1554 1561
1555sub nuke { 1562sub nuke {
1556 my ($self) = @_; 1563 my ($self) = @_;
1557 1564
1565 delete $cf::MAP{$self->path};
1566
1567 $self->unlink_save;
1568
1569 bless $self, "cf::map";
1570 delete $self->{deny_reset};
1558 $self->{deny_save} = 1; 1571 $self->{deny_save} = 1;
1559 $self->reset_timeout (1); 1572 $self->reset_timeout (1);
1560 $self->rename ("{nuke}/" . ($nuke_counter++)); 1573 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1574
1575 $cf::MAP{$self->path} = $self;
1576
1561 $self->reset; # polite request, might not happen 1577 $self->reset; # polite request, might not happen
1562} 1578}
1563 1579
1564=item cf::map::unique_maps 1580=item cf::map::unique_maps
1565 1581
… …
1796 1812
1797sub parse_random_map_params { 1813sub parse_random_map_params {
1798 my ($spec) = @_; 1814 my ($spec) = @_;
1799 1815
1800 my $rmp = { # defaults 1816 my $rmp = { # defaults
1801 xsize => 10, 1817 xsize => -1,
1802 ysize => 10, 1818 ysize => -1,
1803 }; 1819 };
1804 1820
1805 for (split /\n/, $spec) { 1821 for (split /\n/, $spec) {
1806 my ($k, $v) = split /\s+/, $_, 2; 1822 my ($k, $v) = split /\s+/, $_, 2;
1807 1823
… …
1829 1845
1830 $rmp->{random_seed} ||= $exit->random_seed; 1846 $rmp->{random_seed} ||= $exit->random_seed;
1831 1847
1832 my $data = cf::to_json $rmp; 1848 my $data = cf::to_json $rmp;
1833 my $md5 = Digest::MD5::md5_hex $data; 1849 my $md5 = Digest::MD5::md5_hex $data;
1850 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1834 1851
1835 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) {
1836 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;
1837 1856
1838 $exit->slaying ("?random/$md5"); 1857 $exit->slaying ("?random/$md5");
1839 $exit->msg (undef); 1858 $exit->msg (undef);
1840 } 1859 }
1841} 1860}
… …
2211 2230
2212sub main { 2231sub main {
2213 # we must not ever block the main coroutine 2232 # we must not ever block the main coroutine
2214 local $Coro::idle = sub { 2233 local $Coro::idle = sub {
2215 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 {
2216 async { Event::one_event }; 2236 Event::one_event;
2237 })->prio (Coro::PRIO_MAX);
2217 }; 2238 };
2218 2239
2219 cfg_load; 2240 cfg_load;
2220 db_load; 2241 db_load;
2221 load_extensions; 2242 load_extensions;
… …
2369 } 2390 }
2370 2391
2371 warn "reloaded"; 2392 warn "reloaded";
2372}; 2393};
2373 2394
2395our $RELOAD_WATCHER; # used only during reload
2396
2374register_command "reload" => sub { 2397register_command "reload" => sub {
2375 my ($who, $arg) = @_; 2398 my ($who, $arg) = @_;
2376 2399
2377 if ($who->flag (FLAG_WIZ)) { 2400 if ($who->flag (FLAG_WIZ)) {
2378 $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 {
2379 reload; 2407 reload;
2380 $who->message ("end of reload."); 2408 undef $RELOAD_WATCHER;
2409 });
2381 } 2410 }
2382}; 2411};
2383 2412
2384unshift @INC, $LIBDIR; 2413unshift @INC, $LIBDIR;
2385 2414

Diff Legend

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