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.167 by root, Sat Jan 13 23:32:43 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;
… …
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
… …
1101 1113
1102use Fcntl; 1114use Fcntl;
1103use Coro::AIO; 1115use Coro::AIO;
1104 1116
1105use overload 1117use overload
1106 '""' => \&as_string; 1118 '""' => \&as_string,
1119 fallback => 1;
1107 1120
1108our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1109our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1110 1123
1111sub generate_random_map { 1124sub generate_random_map {
1112 my ($self, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1113
1114 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1115 $self->_create_random_map ( 1127 $self->_create_random_map (
1116 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1117 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1118 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1138} 1150}
1139 1151
1140# also paths starting with '/' 1152# also paths starting with '/'
1141$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1153$EXT_MAP{"cf::map"} = qr{^(?=/)};
1142 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
1143sub normalise { 1167sub normalise {
1144 my ($path, $base) = @_; 1168 my ($path, $base) = @_;
1145 1169
1146 # map plan: 1170 # map plan:
1147 # 1171 #
… …
1243 1267
1244sub unlink_save { 1268sub unlink_save {
1245 my ($self) = @_; 1269 my ($self) = @_;
1246 1270
1247 utf8::encode (my $save = $self->save_path); 1271 utf8::encode (my $save = $self->save_path);
1248 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1272 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1249 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1250} 1274}
1251 1275
1252sub load_header_from($) { 1276sub load_header_from($) {
1253 my ($self, $path) = @_; 1277 my ($self, $path) = @_;
1254 1278
… …
1315 1339
1316 $map->load_header 1340 $map->load_header
1317 or return; 1341 or return;
1318 1342
1319 if ($map->should_reset) { 1343 if ($map->should_reset) {
1344 $cf::WAIT_FOR_TICK->wait;
1320 $map->reset; 1345 $map->reset;
1321 undef $guard; 1346 undef $guard;
1322 $map = find $path 1347 $map = find $path
1323 or return; 1348 or return;
1324 } 1349 }
… …
1494 1519
1495sub reset_at { 1520sub reset_at {
1496 my ($self) = @_; 1521 my ($self) = @_;
1497 1522
1498 # TODO: safety, remove and allow resettable per-player maps 1523 # TODO: safety, remove and allow resettable per-player maps
1499 return 1e99 if $self->isa ("ext::map_per_player"); 1524 return 1e99 if $self->isa ("ext::map_per_player");#d#
1500 return 1e99 if $self->{deny_reset}; 1525 return 1e99 if $self->{deny_reset};
1501 1526
1502 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1527 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1503 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;
1504 1529
… …
1509 my ($self) = @_; 1534 my ($self) = @_;
1510 1535
1511 $self->reset_at <= $cf::RUNTIME 1536 $self->reset_at <= $cf::RUNTIME
1512} 1537}
1513 1538
1514sub rename {
1515 my ($self, $new_path) = @_;
1516
1517 normalise $new_path;
1518
1519 $self->unlink_save;
1520
1521 delete $cf::MAP{$self->path};
1522 $self->{path} = $new_path; $self->path ($self->{path});
1523 $cf::MAP{$self->path} = $self;
1524
1525 $self->save;
1526}
1527
1528sub reset { 1539sub reset {
1529 my ($self) = @_; 1540 my ($self) = @_;
1530 1541
1531 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1542 my $lock = cf::lock_acquire "map_data:$self->{path}";
1532 1543
… …
1549my $nuke_counter = "aaaa"; 1560my $nuke_counter = "aaaa";
1550 1561
1551sub nuke { 1562sub nuke {
1552 my ($self) = @_; 1563 my ($self) = @_;
1553 1564
1565 delete $cf::MAP{$self->path};
1566
1567 $self->unlink_save;
1568
1569 bless $self, "cf::map";
1570 delete $self->{deny_reset};
1554 $self->{deny_save} = 1; 1571 $self->{deny_save} = 1;
1555 $self->reset_timeout (1); 1572 $self->reset_timeout (1);
1556 $self->rename ("{nuke}/" . ($nuke_counter++)); 1573 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1574
1575 $cf::MAP{$self->path} = $self;
1576
1557 $self->reset; # polite request, might not happen 1577 $self->reset; # polite request, might not happen
1558} 1578}
1559 1579
1560=item cf::map::unique_maps 1580=item cf::map::unique_maps
1561 1581
… …
1792 1812
1793sub parse_random_map_params { 1813sub parse_random_map_params {
1794 my ($spec) = @_; 1814 my ($spec) = @_;
1795 1815
1796 my $rmp = { # defaults 1816 my $rmp = { # defaults
1797 xsize => 10, 1817 xsize => -1,
1798 ysize => 10, 1818 ysize => -1,
1799 }; 1819 };
1800 1820
1801 for (split /\n/, $spec) { 1821 for (split /\n/, $spec) {
1802 my ($k, $v) = split /\s+/, $_, 2; 1822 my ($k, $v) = split /\s+/, $_, 2;
1803 1823
… …
1825 1845
1826 $rmp->{random_seed} ||= $exit->random_seed; 1846 $rmp->{random_seed} ||= $exit->random_seed;
1827 1847
1828 my $data = cf::to_json $rmp; 1848 my $data = cf::to_json $rmp;
1829 my $md5 = Digest::MD5::md5_hex $data; 1849 my $md5 = Digest::MD5::md5_hex $data;
1850 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1830 1851
1831 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) {
1832 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;
1833 1856
1834 $exit->slaying ("?random/$md5"); 1857 $exit->slaying ("?random/$md5");
1835 $exit->msg (undef); 1858 $exit->msg (undef);
1836 } 1859 }
1837} 1860}
… …
2207 2230
2208sub main { 2231sub main {
2209 # we must not ever block the main coroutine 2232 # we must not ever block the main coroutine
2210 local $Coro::idle = sub { 2233 local $Coro::idle = sub {
2211 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 {
2212 async { Event::one_event }; 2236 Event::one_event;
2237 })->prio (Coro::PRIO_MAX);
2213 }; 2238 };
2214 2239
2215 cfg_load; 2240 cfg_load;
2216 db_load; 2241 db_load;
2217 load_extensions; 2242 load_extensions;
… …
2365 } 2390 }
2366 2391
2367 warn "reloaded"; 2392 warn "reloaded";
2368}; 2393};
2369 2394
2395our $RELOAD_WATCHER; # used only during reload
2396
2370register_command "reload" => sub { 2397register_command "reload" => sub {
2371 my ($who, $arg) = @_; 2398 my ($who, $arg) = @_;
2372 2399
2373 if ($who->flag (FLAG_WIZ)) { 2400 if ($who->flag (FLAG_WIZ)) {
2374 $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 {
2375 reload; 2407 reload;
2376 $who->message ("end of reload."); 2408 undef $RELOAD_WATCHER;
2409 });
2377 } 2410 }
2378}; 2411};
2379 2412
2380unshift @INC, $LIBDIR; 2413unshift @INC, $LIBDIR;
2381 2414
… …
2402 }, 2435 },
2403); 2436);
2404 2437
2405IO::AIO::max_poll_time $TICK * 0.2; 2438IO::AIO::max_poll_time $TICK * 0.2;
2406 2439
2407Event->io ( 2440$AIO_POLL_WATCHER = Event->io (
2408 fd => IO::AIO::poll_fileno, 2441 fd => IO::AIO::poll_fileno,
2409 poll => 'r', 2442 poll => 'r',
2410 prio => 5, 2443 prio => 5,
2411 data => WF_AUTOCANCEL, 2444 data => WF_AUTOCANCEL,
2412 cb => \&IO::AIO::poll_cb, 2445 cb => \&IO::AIO::poll_cb,
2413); 2446);
2414 2447
2415Event->timer ( 2448$WRITE_RUNTIME_WATCHER = Event->timer (
2416 data => WF_AUTOCANCEL, 2449 data => WF_AUTOCANCEL,
2417 after => 0, 2450 after => 0,
2418 interval => 10, 2451 interval => 10,
2419 cb => sub { 2452 cb => sub {
2420 (Coro::unblock_sub { 2453 (Coro::unblock_sub {

Diff Legend

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