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.237 by root, Fri Apr 13 05:08:51 2007 UTC vs.
Revision 1.257 by root, Sat Apr 21 17:34:24 2007 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
9use Event; 10use Event;
10use Opcode; 11use Opcode;
11use Safe; 12use Safe;
12use Safe::Hole; 13use Safe::Hole;
13 14
14use Coro 3.52 (); 15use Coro 3.61 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
… …
52our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
53our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
54 56
55our $RELOAD; # number of reloads so far 57our $RELOAD; # number of reloads so far
56our @EVENT; 58our @EVENT;
57our $LIBDIR = datadir . "/ext";
58 59
59our $TICK = MAX_TIME * 1e-6; 60our $CONFDIR = confdir;
61our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db";
71
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
60our $TICK_WATCHER; 73our $TICK_WATCHER;
61our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
63our $NEXT_TICK; 76our $NEXT_TICK;
64our $NOW; 77our $NOW;
… …
73our $RUNTIME; 86our $RUNTIME;
74 87
75our %PLAYER; # all users 88our %PLAYER; # all users
76our %MAP; # all maps 89our %MAP; # all maps
77our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
78our $RANDOM_MAPS = cf::localdir . "/random";
79our $BDB_ENV_DIR = cf::localdir . "/db";
80
81our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
82our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
83 91
84# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
85our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
86 94
87binmode STDOUT; 95binmode STDOUT;
88binmode STDERR; 96binmode STDERR;
89 97
90# read virtual server time, if available 98# read virtual server time, if available
91unless ($RUNTIME || !-e cf::localdir . "/runtime") { 99unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
92 open my $fh, "<", cf::localdir . "/runtime" 100 open my $fh, "<", "$LOCALDIR/runtime"
93 or die "unable to read runtime file: $!"; 101 or die "unable to read runtime file: $!";
94 $RUNTIME = <$fh> + 0.; 102 $RUNTIME = <$fh> + 0.;
95} 103}
96 104
97mkdir cf::localdir; 105mkdir $_
98mkdir cf::localdir . "/" . cf::playerdir; 106 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
99mkdir cf::localdir . "/" . cf::tmpdir;
100mkdir cf::localdir . "/" . cf::uniquedir;
101mkdir $RANDOM_MAPS;
102mkdir $BDB_ENV_DIR;
103 107
104our $EMERGENCY_POSITION; 108our $EMERGENCY_POSITION;
105 109
106sub cf::map::normalise; 110sub cf::map::normalise;
107 111
… …
118=item $cf::RUNTIME 122=item $cf::RUNTIME
119 123
120The time this server has run, starts at 0 and is increased by $cf::TICK on 124The time this server has run, starts at 0 and is increased by $cf::TICK on
121every server tick. 125every server tick.
122 126
123=item $cf::LIBDIR 127=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
128$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
129$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
124 130
125The perl library directory, where extensions and cf-specific modules can 131Various directories - "/etc", read-only install directory, perl-library
126be found. It will be added to C<@INC> automatically. 132directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
133unique-items directory, player file directory, random maps directory and
134database environment.
127 135
128=item $cf::NOW 136=item $cf::NOW
129 137
130The time of the last (current) server tick. 138The time of the last (current) server tick.
131 139
… …
136=item %cf::CFG 144=item %cf::CFG
137 145
138Configuration for the server, loaded from C</etc/crossfire/config>, or 146Configuration for the server, loaded from C</etc/crossfire/config>, or
139from wherever your confdir points to. 147from wherever your confdir points to.
140 148
141=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 149=item cf::wait_for_tick, cf::wait_for_tick_begin
142 150
143These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 151These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
144or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 152returns directly I<after> the tick processing (and consequently, can only wake one process
145processing has been done. Call C<< ->wait >> on them to maximise the 153per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
146window of cpu time available, or simply to synchronise to the server tick.
147 154
148=back 155=back
149 156
150=cut 157=cut
151 158
152BEGIN { 159BEGIN {
153 *CORE::GLOBAL::warn = sub { 160 *CORE::GLOBAL::warn = sub {
154 my $msg = join "", @_; 161 my $msg = join "", @_;
155 utf8::encode $msg;
156 162
157 $msg .= "\n" 163 $msg .= "\n"
158 unless $msg =~ /\n$/; 164 unless $msg =~ /\n$/;
159 165
166 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
167
168 utf8::encode $msg;
160 LOG llevError, $msg; 169 LOG llevError, $msg;
161 }; 170 };
162} 171}
163 172
164@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
234returned. 243returned.
235 244
236Lock names should begin with a unique identifier (for example, cf::map::find 245Lock names should begin with a unique identifier (for example, cf::map::find
237uses map_find and cf::map::load uses map_load). 246uses map_find and cf::map::load uses map_load).
238 247
248=item $locked = cf::lock_active $string
249
250Return true if the lock is currently active, i.e. somebody has locked it.
251
239=cut 252=cut
240 253
241our %LOCK; 254our %LOCK;
242 255
243sub lock_wait($) { 256sub lock_wait($) {
… …
260 273
261 Coro::guard { 274 Coro::guard {
262 # wake up all waiters, to be on the safe side 275 # wake up all waiters, to be on the safe side
263 $_->ready for @{ delete $LOCK{$key} }; 276 $_->ready for @{ delete $LOCK{$key} };
264 } 277 }
278}
279
280sub lock_active($) {
281 my ($key) = @_;
282
283 ! ! $LOCK{$key}
265} 284}
266 285
267sub freeze_mainloop { 286sub freeze_mainloop {
268 return unless $TICK_WATCHER->is_active; 287 return unless $TICK_WATCHER->is_active;
269 288
… …
350} 369}
351 370
352sub write_runtime { 371sub write_runtime {
353 my $guard = cf::lock_acquire "write_runtime"; 372 my $guard = cf::lock_acquire "write_runtime";
354 373
355 my $runtime = cf::localdir . "/runtime"; 374 my $runtime = "$LOCALDIR/runtime";
356 375
357 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
358 or return; 377 or return;
359 378
360 my $value = $cf::RUNTIME + 90 + 10; 379 my $value = $cf::RUNTIME + 90 + 10;
… …
955Returns the given player object, loading it if necessary (might block). 974Returns the given player object, loading it if necessary (might block).
956 975
957=cut 976=cut
958 977
959sub playerdir($) { 978sub playerdir($) {
960 cf::localdir 979 "$PLAYERDIR/"
961 . "/"
962 . cf::playerdir
963 . "/"
964 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 980 . (ref $_[0] ? $_[0]->ob->name : $_[0])
965} 981}
966 982
967sub path($) { 983sub path($) {
968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 984 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
… …
1088while and may block, so not sync_job-capable, ever. 1104while and may block, so not sync_job-capable, ever.
1089 1105
1090=cut 1106=cut
1091 1107
1092sub list_logins { 1108sub list_logins {
1093 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1109 my $dirs = aio_readdir $PLAYERDIR
1094 or return []; 1110 or return [];
1095 1111
1096 my @logins; 1112 my @logins;
1097 1113
1098 for my $login (@$dirs) { 1114 for my $login (@$dirs) {
… …
1159 my ($self, $type, %msg) = @_; 1175 my ($self, $type, %msg) = @_;
1160 1176
1161 $self->ns->ext_event ($type, %msg); 1177 $self->ns->ext_event ($type, %msg);
1162} 1178}
1163 1179
1164package cf; 1180=head3 cf::region
1181
1182=over 4
1183
1184=cut
1185
1186package cf::region;
1187
1188=item cf::region::find_by_path $path
1189
1190Tries to decuce the probable region for a map knowing only its path.
1191
1192=cut
1193
1194sub find_by_path($) {
1195 my ($path) = @_;
1196
1197 my ($match, $specificity);
1198
1199 for my $region (list) {
1200 if ($region->match && $path =~ $region->match) {
1201 ($match, $specificity) = ($region, $region->specificity)
1202 if $region->specificity > $specificity;
1203 }
1204 }
1205
1206 $match
1207}
1165 1208
1166=back 1209=back
1167
1168 1210
1169=head3 cf::map 1211=head3 cf::map
1170 1212
1171=over 4 1213=over 4
1172 1214
… …
1310 1352
1311# the original (read-only) location 1353# the original (read-only) location
1312sub load_path { 1354sub load_path {
1313 my ($self) = @_; 1355 my ($self) = @_;
1314 1356
1315 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1357 "$MAPDIR/$self->{path}.map"
1316} 1358}
1317 1359
1318# the temporary/swap location 1360# the temporary/swap location
1319sub save_path { 1361sub save_path {
1320 my ($self) = @_; 1362 my ($self) = @_;
1321 1363
1322 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1364 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1323 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1365 "$TMPDIR/$path.map"
1324} 1366}
1325 1367
1326# the unique path, undef == no special unique path 1368# the unique path, undef == no special unique path
1327sub uniq_path { 1369sub uniq_path {
1328 my ($self) = @_; 1370 my ($self) = @_;
1329 1371
1330 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1372 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1331 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1373 "$UNIQUEDIR/$path"
1332} 1374}
1333 1375
1334# and all this just because we cannot iterate over 1376# and all this just because we cannot iterate over
1335# all maps in C++... 1377# all maps in C++...
1336sub change_all_map_light { 1378sub change_all_map_light {
… …
1403 $self->load_header_orig 1445 $self->load_header_orig
1404 or return; 1446 or return;
1405 $self->prepare_orig; 1447 $self->prepare_orig;
1406 } 1448 }
1407 1449
1450 $self->default_region (cf::region::find_by_path $self->{path})
1451 unless $self->default_region;
1452
1408 1 1453 1
1409} 1454}
1410 1455
1411sub find; 1456sub find;
1412sub find { 1457sub find {
… …
1445 my ($self) = @_; 1490 my ($self) = @_;
1446 1491
1447 local $self->{deny_reset} = 1; # loading can take a long time 1492 local $self->{deny_reset} = 1; # loading can take a long time
1448 1493
1449 my $path = $self->{path}; 1494 my $path = $self->{path};
1495
1496 {
1450 my $guard = cf::lock_acquire "map_load:$path"; 1497 my $guard = cf::lock_acquire "map_load:$path";
1451 1498
1452 return if $self->in_memory != cf::MAP_SWAPPED; 1499 return if $self->in_memory != cf::MAP_SWAPPED;
1453 1500
1454 $self->in_memory (cf::MAP_LOADING); 1501 $self->in_memory (cf::MAP_LOADING);
1455 1502
1456 $self->alloc; 1503 $self->alloc;
1457 1504
1458 $self->pre_load; 1505 $self->pre_load;
1459
1460 $self->_load_objects ($self->{load_path}, 1)
1461 or return;
1462
1463 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1464 if delete $self->{load_original};
1465
1466 if (my $uniq = $self->uniq_path) {
1467 utf8::encode $uniq;
1468 if (aio_open $uniq, O_RDONLY, 0) {
1469 $self->clear_unique_items;
1470 $self->_load_objects ($uniq, 0);
1471 }
1472 }
1473
1474 Coro::cede;
1475
1476 # now do the right thing for maps
1477 $self->link_multipart_objects;
1478
1479 unless ($self->{deny_activate}) {
1480 $self->decay_objects;
1481 $self->fix_auto_apply;
1482 $self->update_buttons;
1483 Coro::cede; 1506 Coro::cede;
1484 $self->set_darkness_map; 1507
1508 $self->_load_objects ($self->{load_path}, 1)
1509 or return;
1510
1511 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1512 if delete $self->{load_original};
1513
1514 if (my $uniq = $self->uniq_path) {
1515 utf8::encode $uniq;
1516 if (aio_open $uniq, O_RDONLY, 0) {
1517 $self->clear_unique_items;
1518 $self->_load_objects ($uniq, 0);
1519 }
1520 }
1521
1522 Coro::cede;
1523 # now do the right thing for maps
1524 $self->link_multipart_objects;
1485 $self->difficulty ($self->estimate_difficulty) 1525 $self->difficulty ($self->estimate_difficulty)
1486 unless $self->difficulty; 1526 unless $self->difficulty;
1487 Coro::cede; 1527 Coro::cede;
1528
1529 unless ($self->{deny_activate}) {
1530 $self->decay_objects;
1531 $self->fix_auto_apply;
1532 $self->update_buttons;
1533 Coro::cede;
1534 $self->set_darkness_map;
1535 Coro::cede;
1488 $self->activate; 1536 $self->activate;
1537 }
1538
1539 $self->in_memory (cf::MAP_IN_MEMORY);
1489 } 1540 }
1490 1541
1491 $self->post_load; 1542 $self->post_load;
1492
1493 $self->in_memory (cf::MAP_IN_MEMORY);
1494} 1543}
1495 1544
1496sub customise_for { 1545sub customise_for {
1497 my ($self, $ob) = @_; 1546 my ($self, $ob) = @_;
1498 1547
… …
1689instantiated unique items. May block. 1738instantiated unique items. May block.
1690 1739
1691=cut 1740=cut
1692 1741
1693sub unique_maps() { 1742sub unique_maps() {
1694 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1743 my $files = aio_readdir $UNIQUEDIR
1695 or return; 1744 or return;
1696 1745
1697 my @paths; 1746 my @paths;
1698 1747
1699 for (@$files) { 1748 for (@$files) {
… …
1812 $LINK_MAP 1861 $LINK_MAP
1813} 1862}
1814 1863
1815sub cf::object::player::enter_link { 1864sub cf::object::player::enter_link {
1816 my ($self) = @_; 1865 my ($self) = @_;
1817
1818 $self->deactivate_recursive;
1819 1866
1820 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1867 return if UNIVERSAL::isa $self->map, "ext::map_link";
1821 1868
1822 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1869 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1823 if $self->map; 1870 if $self->map;
… …
1955 2002
1956 $rmp->{random_seed} ||= $exit->random_seed; 2003 $rmp->{random_seed} ||= $exit->random_seed;
1957 2004
1958 my $data = cf::to_json $rmp; 2005 my $data = cf::to_json $rmp;
1959 my $md5 = Digest::MD5::md5_hex $data; 2006 my $md5 = Digest::MD5::md5_hex $data;
1960 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2007 my $meta = "$RANDOMDIR/$md5.meta";
1961 2008
1962 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2009 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1963 aio_write $fh, 0, (length $data), $data, 0; 2010 aio_write $fh, 0, (length $data), $data, 0;
1964 undef $fh; 2011 undef $fh;
1965 aio_rename "$meta~", $meta; 2012 aio_rename "$meta~", $meta;
… …
2234############################################################################# 2281#############################################################################
2235 2282
2236=head2 EXTENSION DATABASE SUPPORT 2283=head2 EXTENSION DATABASE SUPPORT
2237 2284
2238Crossfire maintains a very simple database for extension use. It can 2285Crossfire maintains a very simple database for extension use. It can
2239currently store anything that can be serialised using Storable, which 2286currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2240excludes objects. 2287convert to/from binary).
2241 2288
2242The parameter C<$family> should best start with the name of the extension 2289The parameter C<$family> should best start with the name of the extension
2243using it, it should be unique. 2290using it, it should be unique.
2244 2291
2245=over 4 2292=over 4
… …
2268 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2315 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2269 cf::cleanup "db_open(db): $!" if $!; 2316 cf::cleanup "db_open(db): $!" if $!;
2270 }; 2317 };
2271 cf::cleanup "db_open(db): $@" if $@; 2318 cf::cleanup "db_open(db): $@" if $@;
2272 }; 2319 };
2273
2274 my $path = cf::localdir . "/database.pst";
2275 if (stat $path) {
2276 cf::sync_job {
2277 my $pst = Storable::retrieve $path;
2278
2279 cf::db_put (board => data => $pst->{board});
2280 cf::db_put (guildrules => data => $pst->{guildrules});
2281 cf::db_put (rent => balance => $pst->{rent}{balance});
2282 BDB::db_env_txn_checkpoint $DB_ENV;
2283
2284 unlink $path;
2285 };
2286 }
2287 } 2320 }
2288} 2321}
2289 2322
2290sub db_get($$) { 2323sub db_get($$) {
2291 my $key = "$_[0]/$_[1]"; 2324 my $key = "$_[0]/$_[1]";
2292 2325
2293 cf::sync_job { 2326 cf::sync_job {
2294 BDB::db_get $DB, undef, $key, my $data; 2327 BDB::db_get $DB, undef, $key, my $data;
2295 2328
2296 $! ? () 2329 $! ? ()
2297 : Compress::LZF::sthaw $data 2330 : $data
2298 } 2331 }
2299} 2332}
2300 2333
2301sub db_put($$$) { 2334sub db_put($$$) {
2302 BDB::dbreq_pri 4; 2335 BDB::dbreq_pri 4;
2303 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2336 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2304} 2337}
2338
2339=item cf::cache $id => [$paths...], $processversion => $process
2340
2341Generic caching function that returns the value of the resource $id,
2342caching and regenerating as required.
2343
2344This function can block.
2345
2346=cut
2347
2348sub cache {
2349 my ($id, $src, $processversion, $process) = @_;
2350
2351 my $meta =
2352 join "\x00",
2353 $processversion,
2354 map {
2355 aio_stat $_
2356 and Carp::croak "$_: $!";
2357
2358 ($_, (stat _)[7,9])
2359 } @$src;
2360
2361 my $dbmeta = db_get cache => "$id/meta";
2362 if ($dbmeta ne $meta) {
2363 # changed, we may need to process
2364
2365 my @data;
2366 my $md5;
2367
2368 for (0 .. $#$src) {
2369 0 <= aio_load $src->[$_], $data[$_]
2370 or Carp::croak "$src->[$_]: $!";
2371 }
2372
2373 # if processing is expensive, check
2374 # checksum first
2375 if (1) {
2376 $md5 =
2377 join "\x00",
2378 $processversion,
2379 map {
2380 Coro::cede;
2381 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2382 } 0.. $#$src;
2383
2384
2385 my $dbmd5 = db_get cache => "$id/md5";
2386 if ($dbmd5 eq $md5) {
2387 db_put cache => "$id/meta", $meta;
2388
2389 return db_get cache => "$id/data";
2390 }
2391 }
2392
2393 my $t1 = Time::HiRes::time;
2394 my $data = $process->(\@data);
2395 my $t2 = Time::HiRes::time;
2396
2397 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2398
2399 db_put cache => "$id/data", $data;
2400 db_put cache => "$id/md5" , $md5;
2401 db_put cache => "$id/meta", $meta;
2402
2403 return $data;
2404 }
2405
2406 db_get cache => "$id/data"
2407}
2408
2409=item fork_call { }, $args
2410
2411Executes the given code block with the given arguments in a seperate
2412process, returning the results. Everything must be serialisable with
2413Coro::Storable. May, of course, block. Note that the executed sub may
2414never block itself or use any form of Event handling.
2415
2416=cut
2417
2418sub fork_call(&@) {
2419 my ($cb, @args) = @_;
2420
2421# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2422# or die "socketpair: $!";
2423 pipe my $fh1, my $fh2
2424 or die "pipe: $!";
2425
2426 if (my $pid = fork) {
2427 close $fh2;
2428
2429 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2430 $res = Coro::Storable::thaw $res;
2431
2432 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2433
2434 die $$res unless "ARRAY" eq ref $res;
2435
2436 return wantarray ? @$res : $res->[-1];
2437 } else {
2438 local $SIG{__WARN__};
2439 eval {
2440 local $SIG{__DIE__};
2441 close $fh1;
2442
2443 my @res = eval { $cb->(@args) };
2444 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2445 };
2446
2447 warn $@ if $@;
2448 _exit 0;
2449 }
2450}
2451
2452
2305 2453
2306############################################################################# 2454#############################################################################
2307# the server's init and main functions 2455# the server's init and main functions
2308 2456
2309sub load_facedata { 2457sub load_facedata($) {
2310 my $path = sprintf "%s/facedata", cf::datadir; 2458 my ($path) = @_;
2311 2459
2312 warn "loading facedata from $path\n"; 2460 warn "loading facedata from $path\n";
2313 2461
2314 my $facedata; 2462 my $facedata;
2315 0 < aio_load $path, $facedata 2463 0 < aio_load $path, $facedata
… …
2356 } 2504 }
2357 2505
2358 1 2506 1
2359} 2507}
2360 2508
2509sub reload_regions {
2510 load_resource_file "$MAPDIR/regions"
2511 or die "unable to load regions file\n";
2512}
2513
2514sub reload_facedata {
2515 load_facedata "$DATADIR/facedata"
2516 or die "unable to load facedata\n";
2517}
2518
2519sub reload_archetypes {
2520 load_resource_file "$DATADIR/archetypes"
2521 or die "unable to load archetypes\n";
2522}
2523
2524sub reload_treasures {
2525 load_resource_file "$DATADIR/treasures"
2526 or die "unable to load treasurelists\n";
2527}
2528
2361sub reload_resources { 2529sub reload_resources {
2362 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2530 warn "reloading resource files...\n";
2363 or die "unable to load regions file\n";#d# 2531
2532 reload_regions;
2364 load_facedata 2533 reload_facedata;
2365 or die "unable to load facedata\n";#d# 2534 reload_archetypes;
2535 reload_treasures;
2536
2537 warn "finished reloading resource files\n";
2366} 2538}
2367 2539
2368sub init { 2540sub init {
2369 reload_resources; 2541 reload_resources;
2370} 2542}
2371 2543
2372sub cfg_load { 2544sub cfg_load {
2373 open my $fh, "<:utf8", cf::confdir . "/config" 2545 open my $fh, "<:utf8", "$CONFDIR/config"
2374 or return; 2546 or return;
2375 2547
2376 local $/; 2548 local $/;
2377 *CFG = YAML::Syck::Load <$fh>; 2549 *CFG = YAML::Syck::Load <$fh>;
2378 2550
… …
2463 2635
2464 warn Carp::longmess "post_cleanup backtrace" 2636 warn Carp::longmess "post_cleanup backtrace"
2465 if $make_core; 2637 if $make_core;
2466} 2638}
2467 2639
2468sub reload() { 2640sub do_reload_perl() {
2469 # can/must only be called in main 2641 # can/must only be called in main
2470 if ($Coro::current != $Coro::main) { 2642 if ($Coro::current != $Coro::main) {
2471 warn "can only reload from main coroutine"; 2643 warn "can only reload from main coroutine";
2472 return; 2644 return;
2473 } 2645 }
… …
2548 Symbol::delete_package "safe::$_" 2720 Symbol::delete_package "safe::$_"
2549 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2721 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2550 2722
2551 warn "unloading cf.pm \"a bit\""; 2723 warn "unloading cf.pm \"a bit\"";
2552 delete $INC{"cf.pm"}; 2724 delete $INC{"cf.pm"};
2725 delete $INC{"cf/pod.pm"};
2553 2726
2554 # don't, removes xs symbols, too, 2727 # don't, removes xs symbols, too,
2555 # and global variables created in xs 2728 # and global variables created in xs
2556 #Symbol::delete_package __PACKAGE__; 2729 #Symbol::delete_package __PACKAGE__;
2557 2730
… …
2572 warn "reattaching attachments to maps"; 2745 warn "reattaching attachments to maps";
2573 reattach $_ for values %MAP; 2746 reattach $_ for values %MAP;
2574 warn "reattaching attachments to players"; 2747 warn "reattaching attachments to players";
2575 reattach $_ for values %PLAYER; 2748 reattach $_ for values %PLAYER;
2576 2749
2577 warn "loading reloadable resources";
2578 reload_resources;
2579
2580 warn "leaving sync_job"; 2750 warn "leaving sync_job";
2581 2751
2582 1 2752 1
2583 } or do { 2753 } or do {
2584 warn $@; 2754 warn $@;
… …
2589 warn "reloaded"; 2759 warn "reloaded";
2590}; 2760};
2591 2761
2592our $RELOAD_WATCHER; # used only during reload 2762our $RELOAD_WATCHER; # used only during reload
2593 2763
2764sub reload_perl() {
2765 # doing reload synchronously and two reloads happen back-to-back,
2766 # coro crashes during coro_state_free->destroy here.
2767
2768 $RELOAD_WATCHER ||= Event->timer (
2769 reentrant => 0,
2770 after => 0,
2771 data => WF_AUTOCANCEL,
2772 cb => sub {
2773 do_reload_perl;
2774 undef $RELOAD_WATCHER;
2775 },
2776 );
2777}
2778
2594register_command "reload" => sub { 2779register_command "reload" => sub {
2595 my ($who, $arg) = @_; 2780 my ($who, $arg) = @_;
2596 2781
2597 if ($who->flag (FLAG_WIZ)) { 2782 if ($who->flag (FLAG_WIZ)) {
2598 $who->message ("reloading server."); 2783 $who->message ("reloading server.");
2599 2784 async { reload_perl };
2600 # doing reload synchronously and two reloads happen back-to-back,
2601 # coro crashes during coro_state_free->destroy here.
2602
2603 $RELOAD_WATCHER ||= Event->timer (
2604 reentrant => 0,
2605 after => 0,
2606 data => WF_AUTOCANCEL,
2607 cb => sub {
2608 reload;
2609 undef $RELOAD_WATCHER;
2610 },
2611 );
2612 } 2785 }
2613}; 2786};
2614 2787
2615unshift @INC, $LIBDIR; 2788unshift @INC, $LIBDIR;
2616 2789
2617my $bug_warning = 0; 2790my $bug_warning = 0;
2791
2792our @WAIT_FOR_TICK;
2793our @WAIT_FOR_TICK_BEGIN;
2794
2795sub wait_for_tick {
2796 return unless $TICK_WATCHER->is_active;
2797 return if $Coro::current == $Coro::main;
2798
2799 my $signal = new Coro::Signal;
2800 push @WAIT_FOR_TICK, $signal;
2801 $signal->wait;
2802}
2803
2804sub wait_for_tick_begin {
2805 return unless $TICK_WATCHER->is_active;
2806 return if $Coro::current == $Coro::main;
2807
2808 my $signal = new Coro::Signal;
2809 push @WAIT_FOR_TICK_BEGIN, $signal;
2810 $signal->wait;
2811}
2618 2812
2619$TICK_WATCHER = Event->timer ( 2813$TICK_WATCHER = Event->timer (
2620 reentrant => 0, 2814 reentrant => 0,
2621 parked => 1, 2815 parked => 1,
2622 prio => 0, 2816 prio => 0,
… …
2630 } 2824 }
2631 2825
2632 $NOW = Event::time; 2826 $NOW = Event::time;
2633 2827
2634 cf::server_tick; # one server iteration 2828 cf::server_tick; # one server iteration
2829
2635 $RUNTIME += $TICK; 2830 $RUNTIME += $TICK;
2636 $NEXT_TICK += $TICK; 2831 $NEXT_TICK += $TICK;
2637 2832
2638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2833 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2639 $NEXT_RUNTIME_WRITE = $NOW + 10; 2834 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2641 write_runtime 2836 write_runtime
2642 or warn "ERROR: unable to write runtime file: $!"; 2837 or warn "ERROR: unable to write runtime file: $!";
2643 }; 2838 };
2644 } 2839 }
2645 2840
2646 $WAIT_FOR_TICK->broadcast;
2647 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2648
2649# my $AFTER = Event::time; 2841# my $AFTER = Event::time;
2650# warn $AFTER - $NOW;#d# 2842# warn $AFTER - $NOW;#d#
2651 2843
2652 # if we are delayed by four ticks or more, skip them all 2844 # if we are delayed by four ticks or more, skip them all
2653 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2845 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2654 2846
2655 $TICK_WATCHER->at ($NEXT_TICK); 2847 $TICK_WATCHER->at ($NEXT_TICK);
2656 $TICK_WATCHER->start; 2848 $TICK_WATCHER->start;
2849
2850 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2851 $sig->send;
2852 }
2853 while (my $sig = shift @WAIT_FOR_TICK) {
2854 $sig->send;
2855 }
2856
2857 _post_tick;
2657 }, 2858 },
2658); 2859);
2659 2860
2660{ 2861{
2661 BDB::max_poll_time $TICK * 0.1; 2862 BDB::max_poll_time $TICK * 0.1;
… …
2689 2890
2690 cf::sync_job { 2891 cf::sync_job {
2691 eval { 2892 eval {
2692 BDB::db_env_open 2893 BDB::db_env_open
2693 $DB_ENV, 2894 $DB_ENV,
2694 $BDB_ENV_DIR, 2895 $BDBDIR,
2695 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2896 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2696 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2897 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2697 0666; 2898 0666;
2698 2899
2699 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 2900 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2700 2901
2701 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2902 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2702 $DB_ENV->set_lk_detect; 2903 $DB_ENV->set_lk_detect;
2703 }; 2904 };
2704 2905
… …
2720 prio => 6, 2921 prio => 6,
2721 cb => \&IO::AIO::poll_cb, 2922 cb => \&IO::AIO::poll_cb,
2722 ); 2923 );
2723} 2924}
2724 2925
2926# load additional modules
2927use cf::pod;
2928
2725END { cf::emergency_save } 2929END { cf::emergency_save }
2726 2930
27271 29311
2728 2932

Diff Legend

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