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.207 by root, Sun Feb 11 22:42:09 2007 UTC vs.
Revision 1.231 by root, Wed Apr 4 00:02:06 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Storable; 8use Storable;
9use Event;
9use Opcode; 10use Opcode;
10use Safe; 11use Safe;
11use Safe::Hole; 12use Safe::Hole;
12 13
13use Coro 3.5 (); 14use Coro 3.52 ();
15use Coro::State;
14use Coro::Event; 16use Coro::Event;
15use Coro::Timer; 17use Coro::Timer;
16use Coro::Signal; 18use Coro::Signal;
17use Coro::Semaphore; 19use Coro::Semaphore;
18use Coro::AIO; 20use Coro::AIO;
19 21
20use BDB (); 22use BDB ();
21use Data::Dumper; 23use Data::Dumper;
22use Digest::MD5; 24use Digest::MD5;
23use Fcntl; 25use Fcntl;
26use YAML::Syck ();
24use IO::AIO 2.32 (); 27use IO::AIO 2.32 ();
25use YAML::Syck ();
26use Time::HiRes; 28use Time::HiRes;
29use Compress::LZF;
27 30
31# configure various modules to our taste
32#
33Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35
28use Event; $Event::Eval = 1; # no idea why this is required, but it is 36$Event::Eval = 1; # no idea why this is required, but it is
29
30sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
31 37
32# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 38# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
33$YAML::Syck::ImplicitUnicode = 1; 39$YAML::Syck::ImplicitUnicode = 1;
34 40
35$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 41$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
42
43sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
36 44
37our %COMMAND = (); 45our %COMMAND = ();
38our %COMMAND_TIME = (); 46our %COMMAND_TIME = ();
39 47
40our @EXTS = (); # list of extension package names 48our @EXTS = (); # list of extension package names
41our %EXTCMD = (); 49our %EXTCMD = ();
42our %EXT_CORO = (); # coroutines bound to extensions 50our %EXT_CORO = (); # coroutines bound to extensions
43our %EXT_MAP = (); # pluggable maps 51our %EXT_MAP = (); # pluggable maps
44 52
53our $RELOAD; # number of reloads so far
45our @EVENT; 54our @EVENT;
46our $LIBDIR = datadir . "/ext"; 55our $LIBDIR = datadir . "/ext";
47 56
48our $TICK = MAX_TIME * 1e-6; 57our $TICK = MAX_TIME * 1e-6;
49our $TICK_WATCHER; 58our $TICK_WATCHER;
50our $AIO_POLL_WATCHER; 59our $AIO_POLL_WATCHER;
51our $WRITE_RUNTIME_WATCHER; 60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
52our $NEXT_TICK; 61our $NEXT_TICK;
53our $NOW; 62our $NOW;
54our $USE_FSYNC = 1; # use fsync to write maps - default off 63our $USE_FSYNC = 1; # use fsync to write maps - default off
55 64
56our $BDB_POLL_WATCHER; 65our $BDB_POLL_WATCHER;
… …
199 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 208 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
200 $d 209 $d
201 } || "[unable to dump $_[0]: '$@']"; 210 } || "[unable to dump $_[0]: '$@']";
202} 211}
203 212
204use JSON::Syck (); # TODO# replace by JSON::PC once working 213use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
205 214
206=item $ref = cf::from_json $json 215=item $ref = cf::from_json $json
207 216
208Converts a JSON string into the corresponding perl data structure. 217Converts a JSON string into the corresponding perl data structure.
209 218
210=cut
211
212sub from_json($) {
213 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
214 JSON::Syck::Load $_[0]
215}
216
217=item $json = cf::to_json $ref 219=item $json = cf::to_json $ref
218 220
219Converts a perl data structure into its JSON representation. 221Converts a perl data structure into its JSON representation.
220
221=cut
222
223sub to_json($) {
224 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
225 JSON::Syck::Dump $_[0]
226}
227 222
228=item cf::lock_wait $string 223=item cf::lock_wait $string
229 224
230Wait until the given lock is available. See cf::lock_acquire. 225Wait until the given lock is available. See cf::lock_acquire.
231 226
… …
270sub freeze_mainloop { 265sub freeze_mainloop {
271 return unless $TICK_WATCHER->is_active; 266 return unless $TICK_WATCHER->is_active;
272 267
273 my $guard = Coro::guard { 268 my $guard = Coro::guard {
274 $TICK_WATCHER->start; 269 $TICK_WATCHER->start;
275 $WRITE_RUNTIME_WATCHER->start;
276 }; 270 };
277 $WRITE_RUNTIME_WATCHER->stop;
278 $TICK_WATCHER->stop; 271 $TICK_WATCHER->stop;
279 $guard 272 $guard
280} 273}
281 274
282=item cf::async { BLOCK } 275=item cf::async { BLOCK }
… …
353 346
354 $coro 347 $coro
355} 348}
356 349
357sub write_runtime { 350sub write_runtime {
351 my $guard = cf::lock_acquire "write_runtime";
352
358 my $runtime = cf::localdir . "/runtime"; 353 my $runtime = cf::localdir . "/runtime";
359 354
360 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
361 or return; 356 or return;
362 357
… …
376 371
377 aio_rename "$runtime~", $runtime 372 aio_rename "$runtime~", $runtime
378 and return; 373 and return;
379 374
380 1 375 1
376}
377
378=item cf::datalog type => key => value, ...
379
380Log a datalog packet of the given type with the given key-value pairs.
381
382=cut
383
384sub datalog($@) {
385 my ($type, %kv) = @_;
386 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
381} 387}
382 388
383=back 389=back
384 390
385=cut 391=cut
… …
784 } 790 }
785 } else { 791 } else {
786 aio_unlink $filename; 792 aio_unlink $filename;
787 aio_unlink "$filename.pst"; 793 aio_unlink "$filename.pst";
788 } 794 }
789
790 #d##TODO# nuke non .map-files if exist
791 if ($filename =~ s/\.map$//) {
792 aio_unlink $filename;
793 aio_unlink "$filename.pst";
794 }
795 } 795 }
796} 796}
797 797
798sub object_freezer_as_string { 798sub object_freezer_as_string {
799 my ($rdata, $objs) = @_; 799 my ($rdata, $objs) = @_;
… …
805 805
806sub object_thawer_load { 806sub object_thawer_load {
807 my ($filename) = @_; 807 my ($filename) = @_;
808 808
809 my ($data, $av); 809 my ($data, $av);
810
811 #d#TODO remove .map if file does not exist
812 aio_stat $filename and $filename =~ s/\.map$//;
813 810
814 (aio_load $filename, $data) >= 0 811 (aio_load $filename, $data) >= 0
815 or return; 812 or return;
816 813
817 unless (aio_stat "$filename.pst") { 814 unless (aio_stat "$filename.pst") {
… …
1036=cut 1033=cut
1037 1034
1038sub quit_character { 1035sub quit_character {
1039 my ($pl) = @_; 1036 my ($pl) = @_;
1040 1037
1038 my $name = $pl->ob->name;
1039
1041 $pl->{deny_save} = 1; 1040 $pl->{deny_save} = 1;
1042 $pl->password ("*"); # this should lock out the player until we nuked the dir 1041 $pl->password ("*"); # this should lock out the player until we nuked the dir
1043 1042
1044 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1043 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1045 $pl->deactivate; 1044 $pl->deactivate;
… …
1049 my $path = playerdir $pl; 1048 my $path = playerdir $pl;
1050 my $temp = "$path~$cf::RUNTIME~deleting~"; 1049 my $temp = "$path~$cf::RUNTIME~deleting~";
1051 aio_rename $path, $temp; 1050 aio_rename $path, $temp;
1052 delete $cf::PLAYER{$pl->ob->name}; 1051 delete $cf::PLAYER{$pl->ob->name};
1053 $pl->destroy; 1052 $pl->destroy;
1053
1054 my $prefix = qr<^~\Q$name\E/>;
1055
1056 # nuke player maps
1057 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1058
1054 IO::AIO::aio_rmtree $temp; 1059 IO::AIO::aio_rmtree $temp;
1060}
1061
1062=item $pl->kick
1063
1064Kicks a player out of the game. This destroys the connection.
1065
1066=cut
1067
1068sub kick {
1069 my ($pl, $kicker) = @_;
1070
1071 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1072 $pl->killer ("kicked");
1073 $pl->ns->destroy;
1055} 1074}
1056 1075
1057=item cf::player::list_logins 1076=item cf::player::list_logins
1058 1077
1059Returns am arrayref of all valid playernames in the system, can take a 1078Returns am arrayref of all valid playernames in the system, can take a
… …
1105 } 1124 }
1106 1125
1107 \@paths 1126 \@paths
1108} 1127}
1109 1128
1110=item $player->ext_reply ($msgid, $msgtype, %msg) 1129=item $player->ext_reply ($msgid, %msg)
1111 1130
1112Sends an ext reply to the player. 1131Sends an ext reply to the player.
1113 1132
1114=cut 1133=cut
1115 1134
1116sub ext_reply($$$%) { 1135sub ext_reply($$%) {
1117 my ($self, $id, %msg) = @_; 1136 my ($self, $id, %msg) = @_;
1118 1137
1119 $msg{msgid} = $id; 1138 $msg{msgid} = $id;
1139
1140 $self->send ("ext " . cf::to_json \%msg);
1141}
1142
1143=item $player->ext_event ($type, %msg)
1144
1145Sends an ext event to the client.
1146
1147=cut
1148
1149sub ext_event($$%) {
1150 my ($self, $type, %msg) = @_;
1151
1152 delete $msg{msgid};
1153 $msg{msgtype} = "event";
1154 $msg{eventtype} = $type;
1120 1155
1121 $self->send ("ext " . cf::to_json \%msg); 1156 $self->send ("ext " . cf::to_json \%msg);
1122} 1157}
1123 1158
1124package cf; 1159package cf;
… …
1304 my ($self) = @_; 1339 my ($self) = @_;
1305 1340
1306 utf8::encode (my $save = $self->save_path); 1341 utf8::encode (my $save = $self->save_path);
1307 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1342 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1343 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1309
1310 #d#TODO remove .map and also nuke
1311 $save =~ s/\.map// or return;#d#
1312 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1314} 1344}
1315 1345
1316sub load_header_from($) { 1346sub load_header_from($) {
1317 my ($self, $path) = @_; 1347 my ($self, $path) = @_;
1318 1348
… …
1606 return if $self->players; 1636 return if $self->players;
1607 return if $self->isa ("ext::map_per_player");#d# 1637 return if $self->isa ("ext::map_per_player");#d#
1608 1638
1609 warn "resetting map ", $self->path;#d# 1639 warn "resetting map ", $self->path;#d#
1610 1640
1641 $self->in_memory (cf::MAP_SWAPPED);
1642
1643 # need to save uniques path
1644 unless ($self->{deny_save}) {
1645 my $uniq = $self->uniq_path; utf8::encode $uniq;
1646
1647 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1648 if $uniq;
1649 }
1650
1611 delete $cf::MAP{$self->path}; 1651 delete $cf::MAP{$self->path};
1612 1652
1613 $self->in_memory (cf::MAP_SWAPPED);
1614 $self->clear; 1653 $self->clear;
1615 1654
1616 $_->clear_links_to ($self) for values %cf::MAP; 1655 $_->clear_links_to ($self) for values %cf::MAP;
1617 1656
1618 $self->unlink_save; 1657 $self->unlink_save;
… …
1808 $map->load; 1847 $map->load;
1809 $map->load_diag; 1848 $map->load_diag;
1810 1849
1811 return unless $self->contr->active; 1850 return unless $self->contr->active;
1812 $self->activate_recursive; 1851 $self->activate_recursive;
1852
1853 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1813 $self->enter_map ($map, $x, $y); 1854 $self->enter_map ($map, $x, $y);
1814} 1855}
1815 1856
1816cf::player->attach ( 1857cf::player->attach (
1817 on_logout => sub { 1858 on_logout => sub {
… …
1830 # try to abort aborted map switching on player login :) 1871 # try to abort aborted map switching on player login :)
1831 # should happen only on crashes 1872 # should happen only on crashes
1832 if ($pl->ob->{_link_pos}) { 1873 if ($pl->ob->{_link_pos}) {
1833 $pl->ob->enter_link; 1874 $pl->ob->enter_link;
1834 (async { 1875 (async {
1835 # we need this sleep as the login has a concurrent enter_exit running
1836 # and this sleep increases chances of the player not ending up in scorn
1837 $pl->ob->reply (undef, 1876 $pl->ob->reply (undef,
1838 "There was an internal problem at your last logout, " 1877 "There was an internal problem at your last logout, "
1839 . "the server will try to bring you to your intended destination in a second.", 1878 . "the server will try to bring you to your intended destination in a second.",
1840 cf::NDI_RED); 1879 cf::NDI_RED);
1880 # we need this sleep as the login has a concurrent enter_exit running
1881 # and this sleep increases chances of the player not ending up in scorn
1841 Coro::Timer::sleep 1; 1882 Coro::Timer::sleep 1;
1842 $pl->ob->leave_link; 1883 $pl->ob->leave_link;
1843 })->prio (2); 1884 })->prio (2);
1844 } 1885 }
1845 }, 1886 },
… …
1970 2011
1971sub cf::client::send_drawinfo { 2012sub cf::client::send_drawinfo {
1972 my ($self, $text, $flags) = @_; 2013 my ($self, $text, $flags) = @_;
1973 2014
1974 utf8::encode $text; 2015 utf8::encode $text;
1975 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2016 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1976} 2017}
1977 2018
1978 2019
1979=item $success = $client->query ($flags, "text", \&cb) 2020=item $success = $client->query ($flags, "text", \&cb)
1980 2021
… …
2079 2120
2080# here we export the classes and methods available to script code 2121# here we export the classes and methods available to script code
2081 2122
2082=pod 2123=pod
2083 2124
2084The following fucntions and emthods are available within a safe environment: 2125The following functions and methods are available within a safe environment:
2085 2126
2086 cf::object contr pay_amount pay_player map 2127 cf::object contr pay_amount pay_player map
2087 cf::object::player player 2128 cf::object::player player
2088 cf::player peaceful 2129 cf::player peaceful
2089 cf::map trigger 2130 cf::map trigger
… …
2182The parameter C<$family> should best start with the name of the extension 2223The parameter C<$family> should best start with the name of the extension
2183using it, it should be unique. 2224using it, it should be unique.
2184 2225
2185=over 4 2226=over 4
2186 2227
2187=item $hashref = cf::db_get $family
2188
2189Return a hashref for use by the extension C<$family>, which can be
2190modified. After modifications, you have to call C<cf::db_dirty> or
2191C<cf::db_sync>.
2192
2193=item $value = cf::db_get $family => $key 2228=item $value = cf::db_get $family => $key
2194 2229
2195Returns a single value from the database 2230Returns a single value from the database.
2196
2197=item cf::db_put $family => $hashref
2198
2199Stores the given family hashref into the database. Updates are delayed, if
2200you want the data to be synced to disk immediately, use C<cf::db_sync>.
2201 2231
2202=item cf::db_put $family => $key => $value 2232=item cf::db_put $family => $key => $value
2203 2233
2204Stores the given C<$value> in the family hash. Updates are delayed, if you 2234Stores the given C<$value> in the family.
2205want the data to be synced to disk immediately, use C<cf::db_sync>.
2206
2207=item cf::db_dirty
2208
2209Marks the database as dirty, to be updated at a later time.
2210
2211=item cf::db_sync
2212
2213Immediately write the database to disk I<if it is dirty>.
2214 2235
2215=cut 2236=cut
2216 2237
2217our $DB; 2238our $DB;
2218 2239
2219{ 2240sub db_init {
2241 unless ($DB) {
2242 $DB = BDB::db_create $DB_ENV;
2243
2244 cf::sync_job {
2245 eval {
2246 $DB->set_flags (BDB::CHKSUM);
2247
2248 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2249 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2250 cf::cleanup "db_open(db): $!" if $!;
2251 };
2252 cf::cleanup "db_open(db): $@" if $@;
2253 };
2254
2220 my $path = cf::localdir . "/database.pst"; 2255 my $path = cf::localdir . "/database.pst";
2256 if (stat $path) {
2257 cf::sync_job {
2258 my $pst = Storable::retrieve $path;
2221 2259
2222 sub db_load() { 2260 cf::db_put (board => data => $pst->{board});
2223 $DB = stat $path ? Storable::retrieve $path : { }; 2261 cf::db_put (guildrules => data => $pst->{guildrules});
2224 } 2262 cf::db_put (rent => balance => $pst->{rent}{balance});
2263 BDB::db_env_txn_checkpoint $DB_ENV;
2225 2264
2226 my $pid; 2265 unlink $path;
2227
2228 sub db_save() {
2229 waitpid $pid, 0 if $pid;
2230 if (0 == ($pid = fork)) {
2231 $DB->{_meta}{version} = 1;
2232 Storable::nstore $DB, "$path~";
2233 rename "$path~", $path;
2234 cf::_exit 0 if defined $pid;
2235 } 2266 };
2236 }
2237
2238 my $dirty;
2239
2240 sub db_sync() {
2241 db_save if $dirty;
2242 undef $dirty;
2243 }
2244
2245 my $idle = Event->idle (
2246 reentrant => 0,
2247 min => 10,
2248 max => 20,
2249 repeat => 0,
2250 data => WF_AUTOCANCEL,
2251 cb => \&db_sync,
2252 );
2253
2254 sub db_dirty() {
2255 $dirty = 1;
2256 $idle->start;
2257 }
2258
2259 sub db_get($;$) {
2260 @_ >= 2
2261 ? $DB->{$_[0]}{$_[1]}
2262 : ($DB->{$_[0]} ||= { })
2263 }
2264
2265 sub db_put($$;$) {
2266 if (@_ >= 3) {
2267 $DB->{$_[0]}{$_[1]} = $_[2];
2268 } else {
2269 $DB->{$_[0]} = $_[1];
2270 }
2271 db_dirty;
2272 }
2273
2274 cf::global->attach (
2275 prio => 10000,
2276 on_cleanup => sub {
2277 db_sync;
2278 }, 2267 }
2279 ); 2268 }
2269}
2270
2271sub db_get($$) {
2272 my $key = "$_[0]/$_[1]";
2273
2274 cf::sync_job {
2275 BDB::db_get $DB, undef, $key, my $data;
2276
2277 $! ? ()
2278 : Compress::LZF::sthaw $data
2279 }
2280}
2281
2282sub db_put($$$) {
2283 BDB::dbreq_pri 4;
2284 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2280} 2285}
2281 2286
2282############################################################################# 2287#############################################################################
2283# the server's init and main functions 2288# the server's init and main functions
2284 2289
2290sub load_facedata {
2291 my $path = sprintf "%s/facedata", cf::datadir;
2292
2293 warn "loading facedata from $path\n";
2294
2295 my $faces;
2296 0 < aio_load $path, $faces
2297 or die "$path: $!";
2298
2299 Coro::cede;
2300 $faces = Storable::thaw $faces;
2301 Coro::cede;
2302
2303 my $meta = delete $faces->{""};
2304 $meta->{version} == 1
2305 or cf::cleanup "$path: version mismatch, cannot proceed.";
2306
2307 while (my ($face, $info) = each %$faces) {
2308 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2309 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2310 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2311 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2312 Coro::cede;
2313 }
2314
2315 while (my ($face, $info) = each %$faces) {
2316 next unless $info->{smooth};
2317 my $idx = cf::face::find $face
2318 or next;
2319 if (my $smooth = cf::face::find $info->{smooth}) {
2320 cf::face::set_smooth $idx, $smooth;
2321 } else {
2322 warn "smooth face '$info->{smooth}' not found for face '$face'";
2323 }
2324 Coro::cede;
2325 }
2326
2327 1
2328}
2329
2285sub load_resources { 2330sub reload_resources {
2286 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2331 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2287 or die "unable to load regions file\n";#d# 2332 or die "unable to load regions file\n";#d#
2333 load_facedata
2334 or die "unable to load facedata\n";#d#
2335}
2336
2337sub init {
2338 reload_resources;
2288} 2339}
2289 2340
2290sub cfg_load { 2341sub cfg_load {
2291 open my $fh, "<:utf8", cf::confdir . "/config" 2342 open my $fh, "<:utf8", cf::confdir . "/config"
2292 or return; 2343 or return;
… …
2304 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2355 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2305 and die "WARNING: m(un)lockall failed: $!\n"; 2356 and die "WARNING: m(un)lockall failed: $!\n";
2306 }; 2357 };
2307 warn $@ if $@; 2358 warn $@ if $@;
2308 } 2359 }
2309}
2310
2311sub init {
2312 load_resources;
2313} 2360}
2314 2361
2315sub main { 2362sub main {
2316 # we must not ever block the main coroutine 2363 # we must not ever block the main coroutine
2317 local $Coro::idle = sub { 2364 local $Coro::idle = sub {
… …
2320 Event::one_event; 2367 Event::one_event;
2321 })->prio (Coro::PRIO_MAX); 2368 })->prio (Coro::PRIO_MAX);
2322 }; 2369 };
2323 2370
2324 cfg_load; 2371 cfg_load;
2325 db_load; 2372 db_init;
2326 load_extensions; 2373 load_extensions;
2327 2374
2328 $TICK_WATCHER->start; 2375 $TICK_WATCHER->start;
2329 Event::loop; 2376 Event::loop;
2330} 2377}
… …
2369 my $map = $cf::MAP{$path} or next; 2416 my $map = $cf::MAP{$path} or next;
2370 $map->valid or next; 2417 $map->valid or next;
2371 $map->save; 2418 $map->save;
2372 } 2419 }
2373 warn "end emergency map save\n"; 2420 warn "end emergency map save\n";
2421
2422 warn "begin emergency database checkpoint\n";
2423 BDB::db_env_txn_checkpoint $DB_ENV;
2424 warn "end emergency database checkpoint\n";
2374 }; 2425 };
2375 2426
2376 warn "leave emergency perl save\n"; 2427 warn "leave emergency perl save\n";
2428}
2429
2430sub post_cleanup {
2431 my ($make_core) = @_;
2432
2433 warn Carp::longmess "post_cleanup backtrace"
2434 if $make_core;
2377} 2435}
2378 2436
2379sub reload() { 2437sub reload() {
2380 # can/must only be called in main 2438 # can/must only be called in main
2381 if ($Coro::current != $Coro::main) { 2439 if ($Coro::current != $Coro::main) {
… …
2383 return; 2441 return;
2384 } 2442 }
2385 2443
2386 warn "reloading..."; 2444 warn "reloading...";
2387 2445
2388 warn "cancelling server ticker"; 2446 warn "entering sync_job";
2389 $TICK_WATCHER->cancel;
2390 2447
2448 cf::sync_job {
2449 cf::write_runtime; # external watchdog should not bark
2391 cf::emergency_save; 2450 cf::emergency_save;
2451 cf::write_runtime; # external watchdog should not bark
2392 2452
2393 eval { 2453 warn "syncing database to disk";
2454 BDB::db_env_txn_checkpoint $DB_ENV;
2455
2394 # if anything goes wrong in here, we should simply crash as we already saved 2456 # if anything goes wrong in here, we should simply crash as we already saved
2395
2396 warn "syncing database to disk";
2397 cf::db_sync;
2398 2457
2399 warn "cancelling all WF_AUTOCANCEL watchers"; 2458 warn "cancelling all WF_AUTOCANCEL watchers";
2400 for (Event::all_watchers) { 2459 for (Event::all_watchers) {
2401 $_->cancel if $_->data & WF_AUTOCANCEL; 2460 $_->cancel if $_->data & WF_AUTOCANCEL;
2402 } 2461 }
2403 2462
2404 warn "flushing outstanding aio requests"; 2463 warn "flushing outstanding aio requests";
2405 for (;;) { 2464 for (;;) {
2465 BDB::flush;
2406 IO::AIO::flush; 2466 IO::AIO::flush;
2407 Coro::cede; 2467 Coro::cede;
2408 last unless IO::AIO::nreqs; 2468 last unless IO::AIO::nreqs || BDB::nreqs;
2409 warn "iterate..."; 2469 warn "iterate...";
2410 } 2470 }
2471
2472 ++$RELOAD;
2411 2473
2412 warn "cancelling all extension coros"; 2474 warn "cancelling all extension coros";
2413 $_->cancel for values %EXT_CORO; 2475 $_->cancel for values %EXT_CORO;
2414 %EXT_CORO = (); 2476 %EXT_CORO = ();
2415 2477
… …
2468 require cf; 2530 require cf;
2469 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2531 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2470 2532
2471 warn "loading config and database again"; 2533 warn "loading config and database again";
2472 cf::cfg_load; 2534 cf::cfg_load;
2473 cf::db_load;
2474 2535
2475 warn "loading extensions"; 2536 warn "loading extensions";
2476 cf::load_extensions; 2537 cf::load_extensions;
2477 2538
2478 warn "reattaching attachments to objects/players"; 2539 warn "reattaching attachments to objects/players";
2479 _global_reattach; 2540 _global_reattach; # objects, sockets
2480 warn "reattaching attachments to maps"; 2541 warn "reattaching attachments to maps";
2481 reattach $_ for values %MAP; 2542 reattach $_ for values %MAP;
2543 warn "reattaching attachments to players";
2544 reattach $_ for values %PLAYER;
2482 2545
2483 warn "loading reloadable resources"; 2546 warn "loading reloadable resources";
2484 load_resources; 2547 reload_resources;
2485 2548
2486 warn "restarting server ticker"; 2549 warn "leaving sync_job";
2487 2550
2488 $TICK_WATCHER->start; 2551 1
2489 }; 2552 } or do {
2490
2491 if ($@) {
2492 warn $@; 2553 warn $@;
2493 warn "error while reloading, exiting."; 2554 warn "error while reloading, exiting.";
2494 exit 1; 2555 exit 1;
2495 } 2556 };
2496 2557
2497 warn "reloaded"; 2558 warn "reloaded";
2498}; 2559};
2499 2560
2500our $RELOAD_WATCHER; # used only during reload 2561our $RELOAD_WATCHER; # used only during reload
… …
2541 2602
2542 cf::server_tick; # one server iteration 2603 cf::server_tick; # one server iteration
2543 $RUNTIME += $TICK; 2604 $RUNTIME += $TICK;
2544 $NEXT_TICK += $TICK; 2605 $NEXT_TICK += $TICK;
2545 2606
2607 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2608 $NEXT_RUNTIME_WRITE = $NOW + 10;
2609 Coro::async_pool {
2610 write_runtime
2611 or warn "ERROR: unable to write runtime file: $!";
2612 };
2613 }
2614
2546 $WAIT_FOR_TICK->broadcast; 2615 $WAIT_FOR_TICK->broadcast;
2547 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2616 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2548 2617
2549 Event::sweep;
2550 Coro::cede_notself;
2551
2552# my $AFTER = Event::time; 2618# my $AFTER = Event::time;
2553# warn $AFTER - $NOW;#d# 2619# warn $AFTER - $NOW;#d#
2554 2620
2555 # if we are delayed by four ticks or more, skip them all 2621 # if we are delayed by four ticks or more, skip them all
2556 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2622 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2589 2655
2590 unless ($DB_ENV) { 2656 unless ($DB_ENV) {
2591 $DB_ENV = BDB::db_env_create; 2657 $DB_ENV = BDB::db_env_create;
2592 2658
2593 cf::sync_job { 2659 cf::sync_job {
2660 eval {
2594 BDB::db_env_open 2661 BDB::db_env_open
2595 $DB_ENV, 2662 $DB_ENV,
2596 $BDB_ENV_DIR, 2663 $BDB_ENV_DIR,
2597 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2664 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2598 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2665 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2599 0666; 2666 0666;
2600 2667
2601 cf::cleanup "$!" if $!; 2668 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2602 2669
2603 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2670 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2604 $DB_ENV->set_lk_detect; 2671 $DB_ENV->set_lk_detect;
2672 };
2673
2674 cf::cleanup "db_env_open(db): $@" if $@;
2605 }; 2675 };
2606 } 2676 }
2607} 2677}
2608 2678
2609{ 2679{
… …
2611 2681
2612 undef $Coro::AIO::WATCHER; 2682 undef $Coro::AIO::WATCHER;
2613 IO::AIO::max_poll_time $TICK * 0.1; 2683 IO::AIO::max_poll_time $TICK * 0.1;
2614 $AIO_POLL_WATCHER = Event->io ( 2684 $AIO_POLL_WATCHER = Event->io (
2615 reentrant => 0, 2685 reentrant => 0,
2686 data => WF_AUTOCANCEL,
2616 fd => IO::AIO::poll_fileno, 2687 fd => IO::AIO::poll_fileno,
2617 poll => 'r', 2688 poll => 'r',
2618 prio => 6, 2689 prio => 6,
2619 data => WF_AUTOCANCEL,
2620 cb => \&IO::AIO::poll_cb, 2690 cb => \&IO::AIO::poll_cb,
2621 ); 2691 );
2622} 2692}
2623 2693
2624$WRITE_RUNTIME_WATCHER = Event->timer (
2625 reentrant => 0,
2626 data => WF_AUTOCANCEL,
2627 after => 1,
2628 interval => 10,
2629 prio => 6, # keep it lowest so it acts like a watchdog
2630 cb => Coro::unblock_sub {
2631 write_runtime
2632 or warn "ERROR: unable to write runtime file: $!";
2633 },
2634);
2635
2636END { cf::emergency_save } 2694END { cf::emergency_save }
2637 2695
26381 26961
2639 2697

Diff Legend

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