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.215 by root, Thu Feb 15 03:19:02 2007 UTC vs.
Revision 1.240 by root, Mon Apr 16 10:14:25 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;
21use Coro::Storable;
19 22
20use BDB (); 23use BDB ();
21use Data::Dumper; 24use Data::Dumper;
22use Digest::MD5; 25use Digest::MD5;
23use Fcntl; 26use Fcntl;
27use YAML::Syck ();
24use IO::AIO 2.32 (); 28use IO::AIO 2.32 ();
25use YAML::Syck ();
26use Time::HiRes; 29use Time::HiRes;
27use Compress::LZF; 30use Compress::LZF;
28 31
32# configure various modules to our taste
33#
34$Storable::canonical = 1; # reduce rsync transfers
35Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 36Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
30 37
31use Event; $Event::Eval = 1; # no idea why this is required, but it is 38$Event::Eval = 1; # no idea why this is required, but it is
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 39
35# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 40# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
36$YAML::Syck::ImplicitUnicode = 1; 41$YAML::Syck::ImplicitUnicode = 1;
37 42
38$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 43$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
44
45sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
39 46
40our %COMMAND = (); 47our %COMMAND = ();
41our %COMMAND_TIME = (); 48our %COMMAND_TIME = ();
42 49
43our @EXTS = (); # list of extension package names 50our @EXTS = (); # list of extension package names
44our %EXTCMD = (); 51our %EXTCMD = ();
45our %EXT_CORO = (); # coroutines bound to extensions 52our %EXT_CORO = (); # coroutines bound to extensions
46our %EXT_MAP = (); # pluggable maps 53our %EXT_MAP = (); # pluggable maps
47 54
55our $RELOAD; # number of reloads so far
48our @EVENT; 56our @EVENT;
49our $LIBDIR = datadir . "/ext"; 57our $LIBDIR = datadir . "/ext";
50 58
51our $TICK = MAX_TIME * 1e-6; 59our $TICK = MAX_TIME * 1e-6;
52our $TICK_WATCHER; 60our $TICK_WATCHER;
… …
68our %MAP; # all maps 76our %MAP; # all maps
69our $LINK_MAP; # the special {link} map, which is always available 77our $LINK_MAP; # the special {link} map, which is always available
70our $RANDOM_MAPS = cf::localdir . "/random"; 78our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db"; 79our $BDB_ENV_DIR = cf::localdir . "/db";
72 80
73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
75
76# used to convert map paths into valid unix filenames by replacing / by ∕ 81# used to convert map paths into valid unix filenames by replacing / by ∕
77our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
78 83
79binmode STDOUT; 84binmode STDOUT;
80binmode STDERR; 85binmode STDERR;
… …
128=item %cf::CFG 133=item %cf::CFG
129 134
130Configuration for the server, loaded from C</etc/crossfire/config>, or 135Configuration for the server, loaded from C</etc/crossfire/config>, or
131from wherever your confdir points to. 136from wherever your confdir points to.
132 137
133=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 138=item cf::wait_for_tick, cf::wait_for_tick_begin
134 139
135These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 140These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
136or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 141returns directly I<after> the tick processing (and consequently, can only wake one process
137processing has been done. Call C<< ->wait >> on them to maximise the 142per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
138window of cpu time available, or simply to synchronise to the server tick.
139 143
140=back 144=back
141 145
142=cut 146=cut
143 147
… …
202 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 206 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
203 $d 207 $d
204 } || "[unable to dump $_[0]: '$@']"; 208 } || "[unable to dump $_[0]: '$@']";
205} 209}
206 210
207use JSON::Syck (); # TODO# replace by JSON::PC once working 211use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
208 212
209=item $ref = cf::from_json $json 213=item $ref = cf::from_json $json
210 214
211Converts a JSON string into the corresponding perl data structure. 215Converts a JSON string into the corresponding perl data structure.
212 216
213=cut
214
215sub from_json($) {
216 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
217 JSON::Syck::Load $_[0]
218}
219
220=item $json = cf::to_json $ref 217=item $json = cf::to_json $ref
221 218
222Converts a perl data structure into its JSON representation. 219Converts a perl data structure into its JSON representation.
223
224=cut
225
226sub to_json($) {
227 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
228 JSON::Syck::Dump $_[0]
229}
230 220
231=item cf::lock_wait $string 221=item cf::lock_wait $string
232 222
233Wait until the given lock is available. See cf::lock_acquire. 223Wait until the given lock is available. See cf::lock_acquire.
234 224
… …
354 344
355 $coro 345 $coro
356} 346}
357 347
358sub write_runtime { 348sub write_runtime {
349 my $guard = cf::lock_acquire "write_runtime";
350
359 my $runtime = cf::localdir . "/runtime"; 351 my $runtime = cf::localdir . "/runtime";
360 352
361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
362 or return; 354 or return;
363 355
… …
377 369
378 aio_rename "$runtime~", $runtime 370 aio_rename "$runtime~", $runtime
379 and return; 371 and return;
380 372
381 1 373 1
374}
375
376=item cf::datalog type => key => value, ...
377
378Log a datalog packet of the given type with the given key-value pairs.
379
380=cut
381
382sub datalog($@) {
383 my ($type, %kv) = @_;
384 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
382} 385}
383 386
384=back 387=back
385 388
386=cut 389=cut
… …
785 } 788 }
786 } else { 789 } else {
787 aio_unlink $filename; 790 aio_unlink $filename;
788 aio_unlink "$filename.pst"; 791 aio_unlink "$filename.pst";
789 } 792 }
790
791 #d##TODO# nuke non .map-files if exist
792 if ($filename =~ s/\.map$//) {
793 aio_unlink $filename;
794 aio_unlink "$filename.pst";
795 }
796 } 793 }
797} 794}
798 795
799sub object_freezer_as_string { 796sub object_freezer_as_string {
800 my ($rdata, $objs) = @_; 797 my ($rdata, $objs) = @_;
… …
806 803
807sub object_thawer_load { 804sub object_thawer_load {
808 my ($filename) = @_; 805 my ($filename) = @_;
809 806
810 my ($data, $av); 807 my ($data, $av);
811
812 #d#TODO remove .map if file does not exist
813 aio_stat $filename and $filename =~ s/\.map$//;
814 808
815 (aio_load $filename, $data) >= 0 809 (aio_load $filename, $data) >= 0
816 or return; 810 or return;
817 811
818 unless (aio_stat "$filename.pst") { 812 unless (aio_stat "$filename.pst") {
… …
967} 961}
968 962
969sub path($) { 963sub path($) {
970 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
971 965
972 (playerdir $login) . "/$login.pl" 966 (playerdir $login) . "/playerdata"
973} 967}
974 968
975sub find_active($) { 969sub find_active($) {
976 $cf::PLAYER{$_[0]} 970 $cf::PLAYER{$_[0]}
977 and $cf::PLAYER{$_[0]}->active 971 and $cf::PLAYER{$_[0]}->active
… …
990 my $login = $_[0]; 984 my $login = $_[0];
991 985
992 my $guard = cf::lock_acquire "user_find:$login"; 986 my $guard = cf::lock_acquire "user_find:$login";
993 987
994 $cf::PLAYER{$_[0]} || do { 988 $cf::PLAYER{$_[0]} || do {
989 # rename old playerfiles to new ones
990 #TODO: remove when no longer required
991 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
992 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
993 aio_unlink +(playerdir $login) . "/$login.pl.pst";
994 aio_unlink +(playerdir $login) . "/$login.pl";
995
995 my $pl = load_pl path $login 996 my $pl = load_pl path $login
996 or return; 997 or return;
997 $cf::PLAYER{$login} = $pl 998 $cf::PLAYER{$login} = $pl
998 } 999 }
999 } 1000 }
… …
1036 1037
1037=cut 1038=cut
1038 1039
1039sub quit_character { 1040sub quit_character {
1040 my ($pl) = @_; 1041 my ($pl) = @_;
1042
1043 my $name = $pl->ob->name;
1041 1044
1042 $pl->{deny_save} = 1; 1045 $pl->{deny_save} = 1;
1043 $pl->password ("*"); # this should lock out the player until we nuked the dir 1046 $pl->password ("*"); # this should lock out the player until we nuked the dir
1044 1047
1045 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1048 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
… …
1050 my $path = playerdir $pl; 1053 my $path = playerdir $pl;
1051 my $temp = "$path~$cf::RUNTIME~deleting~"; 1054 my $temp = "$path~$cf::RUNTIME~deleting~";
1052 aio_rename $path, $temp; 1055 aio_rename $path, $temp;
1053 delete $cf::PLAYER{$pl->ob->name}; 1056 delete $cf::PLAYER{$pl->ob->name};
1054 $pl->destroy; 1057 $pl->destroy;
1058
1059 my $prefix = qr<^~\Q$name\E/>;
1060
1061 # nuke player maps
1062 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1063
1055 IO::AIO::aio_rmtree $temp; 1064 IO::AIO::aio_rmtree $temp;
1065}
1066
1067=item $pl->kick
1068
1069Kicks a player out of the game. This destroys the connection.
1070
1071=cut
1072
1073sub kick {
1074 my ($pl, $kicker) = @_;
1075
1076 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1077 $pl->killer ("kicked");
1078 $pl->ns->destroy;
1056} 1079}
1057 1080
1058=item cf::player::list_logins 1081=item cf::player::list_logins
1059 1082
1060Returns am arrayref of all valid playernames in the system, can take a 1083Returns am arrayref of all valid playernames in the system, can take a
… …
1106 } 1129 }
1107 1130
1108 \@paths 1131 \@paths
1109} 1132}
1110 1133
1111=item $player->ext_reply ($msgid, $msgtype, %msg) 1134=item $player->ext_reply ($msgid, %msg)
1112 1135
1113Sends an ext reply to the player. 1136Sends an ext reply to the player.
1114 1137
1115=cut 1138=cut
1116 1139
1117sub ext_reply($$$%) { 1140sub ext_reply($$%) {
1118 my ($self, $id, %msg) = @_; 1141 my ($self, $id, %msg) = @_;
1119 1142
1120 $msg{msgid} = $id; 1143 $msg{msgid} = $id;
1121 1144
1122 $self->send ("ext " . cf::to_json \%msg); 1145 $self->send ("ext " . cf::to_json \%msg);
1123} 1146}
1124 1147
1125package cf; 1148=item $player->ext_event ($type, %msg)
1149
1150Sends an ext event to the client.
1151
1152=cut
1153
1154sub ext_event($$%) {
1155 my ($self, $type, %msg) = @_;
1156
1157 $self->ns->ext_event ($type, %msg);
1158}
1159
1160=head3 cf::region
1161
1162=over 4
1163
1164=cut
1165
1166package cf::region;
1167
1168=item cf::region::find_by_path $path
1169
1170Tries to decuce the probable region for a map knowing only its path.
1171
1172=cut
1173
1174sub find_by_path($) {
1175 my ($path) = @_;
1176
1177 my ($match, $specificity);
1178
1179 for my $region (list) {
1180 if ($region->match && $path =~ $region->match) {
1181 ($match, $specificity) = ($region, $region->specificity)
1182 if $region->specificity > $specificity;
1183 }
1184 }
1185
1186 $match
1187}
1126 1188
1127=back 1189=back
1128
1129 1190
1130=head3 cf::map 1191=head3 cf::map
1131 1192
1132=over 4 1193=over 4
1133 1194
… …
1305 my ($self) = @_; 1366 my ($self) = @_;
1306 1367
1307 utf8::encode (my $save = $self->save_path); 1368 utf8::encode (my $save = $self->save_path);
1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1369 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1370 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1310
1311 #d#TODO remove .map and also nuke
1312 $save =~ s/\.map// or return;#d#
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1314 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1315} 1371}
1316 1372
1317sub load_header_from($) { 1373sub load_header_from($) {
1318 my ($self, $path) = @_; 1374 my ($self, $path) = @_;
1319 1375
… …
1369 $self->load_header_orig 1425 $self->load_header_orig
1370 or return; 1426 or return;
1371 $self->prepare_orig; 1427 $self->prepare_orig;
1372 } 1428 }
1373 1429
1430 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region;
1432
1374 1 1433 1
1375} 1434}
1376 1435
1377sub find; 1436sub find;
1378sub find { 1437sub find {
… …
1420 $self->in_memory (cf::MAP_LOADING); 1479 $self->in_memory (cf::MAP_LOADING);
1421 1480
1422 $self->alloc; 1481 $self->alloc;
1423 1482
1424 $self->pre_load; 1483 $self->pre_load;
1484 Coro::cede;
1425 1485
1426 $self->_load_objects ($self->{load_path}, 1) 1486 $self->_load_objects ($self->{load_path}, 1)
1427 or return; 1487 or return;
1428 1488
1429 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1436 $self->_load_objects ($uniq, 0); 1496 $self->_load_objects ($uniq, 0);
1437 } 1497 }
1438 } 1498 }
1439 1499
1440 Coro::cede; 1500 Coro::cede;
1441
1442 # now do the right thing for maps 1501 # now do the right thing for maps
1443 $self->link_multipart_objects; 1502 $self->link_multipart_objects;
1503 Coro::cede;
1444 1504
1445 unless ($self->{deny_activate}) { 1505 unless ($self->{deny_activate}) {
1446 $self->decay_objects; 1506 $self->decay_objects;
1447 $self->fix_auto_apply; 1507 $self->fix_auto_apply;
1448 $self->update_buttons; 1508 $self->update_buttons;
… …
1450 $self->set_darkness_map; 1510 $self->set_darkness_map;
1451 $self->difficulty ($self->estimate_difficulty) 1511 $self->difficulty ($self->estimate_difficulty)
1452 unless $self->difficulty; 1512 unless $self->difficulty;
1453 Coro::cede; 1513 Coro::cede;
1454 $self->activate; 1514 $self->activate;
1515 Coro::cede;
1455 } 1516 }
1456 1517
1457 $self->post_load; 1518 $self->post_load;
1519 Coro::cede;
1458 1520
1459 $self->in_memory (cf::MAP_IN_MEMORY); 1521 $self->in_memory (cf::MAP_IN_MEMORY);
1460} 1522}
1461 1523
1462sub customise_for { 1524sub customise_for {
… …
1940 2002
1941 return unless $self->type == cf::PLAYER; 2003 return unless $self->type == cf::PLAYER;
1942 2004
1943 if ($exit->slaying eq "/!") { 2005 if ($exit->slaying eq "/!") {
1944 #TODO: this should de-fi-ni-te-ly not be a sync-job 2006 #TODO: this should de-fi-ni-te-ly not be a sync-job
2007 # the problem is that $exit might not survive long enough
2008 # so it needs to be done right now, right here
1945 cf::sync_job { prepare_random_map $exit }; 2009 cf::sync_job { prepare_random_map $exit };
1946 } 2010 }
1947 2011
1948 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2012 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1949 my $hp = $exit->stats->hp; 2013 my $hp = $exit->stats->hp;
… …
1957 $self->goto ($slaying, $hp, $sp); 2021 $self->goto ($slaying, $hp, $sp);
1958 2022
1959 1; 2023 1;
1960 }) { 2024 }) {
1961 $self->message ("Something went wrong deep within the crossfire server. " 2025 $self->message ("Something went wrong deep within the crossfire server. "
1962 . "I'll try to bring you back to the map you were before. " 2026 . "I'll try to bring you back to the map you were before. "
1963 . "Please report this to the dungeon master!", 2027 . "Please report this to the dungeon master!",
1964 cf::NDI_UNIQUE | cf::NDI_RED); 2028 cf::NDI_UNIQUE | cf::NDI_RED);
1965 2029
1966 warn "ERROR in enter_exit: $@"; 2030 warn "ERROR in enter_exit: $@";
1967 $self->leave_link; 2031 $self->leave_link;
1968 } 2032 }
1969 })->prio (1); 2033 })->prio (1);
… …
1982 2046
1983sub cf::client::send_drawinfo { 2047sub cf::client::send_drawinfo {
1984 my ($self, $text, $flags) = @_; 2048 my ($self, $text, $flags) = @_;
1985 2049
1986 utf8::encode $text; 2050 utf8::encode $text;
1987 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2051 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1988} 2052}
1989 2053
2054=item $client->ext_event ($type, %msg)
2055
2056Sends an exti event to the client.
2057
2058=cut
2059
2060sub cf::client::ext_event($$%) {
2061 my ($self, $type, %msg) = @_;
2062
2063 $msg{msgtype} = "event_$type";
2064 $self->send_packet ("ext " . cf::to_json \%msg);
2065}
1990 2066
1991=item $success = $client->query ($flags, "text", \&cb) 2067=item $success = $client->query ($flags, "text", \&cb)
1992 2068
1993Queues a query to the client, calling the given callback with 2069Queues a query to the client, calling the given callback with
1994the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2070the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
… …
2091 2167
2092# here we export the classes and methods available to script code 2168# here we export the classes and methods available to script code
2093 2169
2094=pod 2170=pod
2095 2171
2096The following fucntions and emthods are available within a safe environment: 2172The following functions and methods are available within a safe environment:
2097 2173
2098 cf::object contr pay_amount pay_player map 2174 cf::object contr pay_amount pay_player map
2099 cf::object::player player 2175 cf::object::player player
2100 cf::player peaceful 2176 cf::player peaceful
2101 cf::map trigger 2177 cf::map trigger
… …
2256} 2332}
2257 2333
2258############################################################################# 2334#############################################################################
2259# the server's init and main functions 2335# the server's init and main functions
2260 2336
2337sub load_facedata {
2338 my $path = sprintf "%s/facedata", cf::datadir;
2339
2340 warn "loading facedata from $path\n";
2341
2342 my $facedata;
2343 0 < aio_load $path, $facedata
2344 or die "$path: $!";
2345
2346 $facedata = Coro::Storable::thaw $facedata;
2347
2348 $facedata->{version} == 2
2349 or cf::cleanup "$path: version mismatch, cannot proceed.";
2350
2351 {
2352 my $faces = $facedata->{faceinfo};
2353
2354 while (my ($face, $info) = each %$faces) {
2355 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2356 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2357 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2358 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2359 Coro::cede;
2360 }
2361
2362 while (my ($face, $info) = each %$faces) {
2363 next unless $info->{smooth};
2364 my $idx = cf::face::find $face
2365 or next;
2366 if (my $smooth = cf::face::find $info->{smooth}) {
2367 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2368 } else {
2369 warn "smooth face '$info->{smooth}' not found for face '$face'";
2370 }
2371 Coro::cede;
2372 }
2373 }
2374
2375 {
2376 my $anims = $facedata->{animinfo};
2377
2378 while (my ($anim, $info) = each %$anims) {
2379 cf::anim::set $anim, $info->{frames}, $info->{facings};
2380 Coro::cede;
2381 }
2382
2383 cf::anim::invalidate_all; # d'oh
2384 }
2385
2386 1
2387}
2388
2261sub load_resources { 2389sub reload_resources {
2262 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2390 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2263 or die "unable to load regions file\n";#d# 2391 or die "unable to load regions file\n";#d#
2392 load_facedata
2393 or die "unable to load facedata\n";#d#
2394}
2395
2396sub init {
2397 reload_resources;
2264} 2398}
2265 2399
2266sub cfg_load { 2400sub cfg_load {
2267 open my $fh, "<:utf8", cf::confdir . "/config" 2401 open my $fh, "<:utf8", cf::confdir . "/config"
2268 or return; 2402 or return;
… …
2280 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2414 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2281 and die "WARNING: m(un)lockall failed: $!\n"; 2415 and die "WARNING: m(un)lockall failed: $!\n";
2282 }; 2416 };
2283 warn $@ if $@; 2417 warn $@ if $@;
2284 } 2418 }
2285}
2286
2287sub init {
2288 load_resources;
2289} 2419}
2290 2420
2291sub main { 2421sub main {
2292 # we must not ever block the main coroutine 2422 # we must not ever block the main coroutine
2293 local $Coro::idle = sub { 2423 local $Coro::idle = sub {
… …
2396 Coro::cede; 2526 Coro::cede;
2397 last unless IO::AIO::nreqs || BDB::nreqs; 2527 last unless IO::AIO::nreqs || BDB::nreqs;
2398 warn "iterate..."; 2528 warn "iterate...";
2399 } 2529 }
2400 2530
2531 ++$RELOAD;
2532
2401 warn "cancelling all extension coros"; 2533 warn "cancelling all extension coros";
2402 $_->cancel for values %EXT_CORO; 2534 $_->cancel for values %EXT_CORO;
2403 %EXT_CORO = (); 2535 %EXT_CORO = ();
2404 2536
2405 warn "removing commands"; 2537 warn "removing commands";
… …
2462 2594
2463 warn "loading extensions"; 2595 warn "loading extensions";
2464 cf::load_extensions; 2596 cf::load_extensions;
2465 2597
2466 warn "reattaching attachments to objects/players"; 2598 warn "reattaching attachments to objects/players";
2467 _global_reattach; 2599 _global_reattach; # objects, sockets
2468 warn "reattaching attachments to maps"; 2600 warn "reattaching attachments to maps";
2469 reattach $_ for values %MAP; 2601 reattach $_ for values %MAP;
2602 warn "reattaching attachments to players";
2603 reattach $_ for values %PLAYER;
2470 2604
2471 warn "loading reloadable resources"; 2605 warn "loading reloadable resources";
2472 load_resources; 2606 reload_resources;
2473 2607
2474 warn "leaving sync_job"; 2608 warn "leaving sync_job";
2475 2609
2476 1 2610 1
2477 } or do { 2611 } or do {
… …
2507}; 2641};
2508 2642
2509unshift @INC, $LIBDIR; 2643unshift @INC, $LIBDIR;
2510 2644
2511my $bug_warning = 0; 2645my $bug_warning = 0;
2646
2647our @WAIT_FOR_TICK;
2648our @WAIT_FOR_TICK_BEGIN;
2649
2650sub wait_for_tick {
2651 return unless $TICK_WATCHER->is_active;
2652 my $signal = new Coro::Signal;
2653 push @WAIT_FOR_TICK, $signal;
2654 $signal->wait;
2655}
2656
2657sub wait_for_tick_begin {
2658 return unless $TICK_WATCHER->is_active;
2659 my $signal = new Coro::Signal;
2660 push @WAIT_FOR_TICK_BEGIN, $signal;
2661 $signal->wait;
2662}
2512 2663
2513$TICK_WATCHER = Event->timer ( 2664$TICK_WATCHER = Event->timer (
2514 reentrant => 0, 2665 reentrant => 0,
2515 parked => 1, 2666 parked => 1,
2516 prio => 0, 2667 prio => 0,
… …
2535 write_runtime 2686 write_runtime
2536 or warn "ERROR: unable to write runtime file: $!"; 2687 or warn "ERROR: unable to write runtime file: $!";
2537 }; 2688 };
2538 } 2689 }
2539 2690
2540 2691 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2541 $WAIT_FOR_TICK->broadcast; 2692 $sig->send;
2542 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2693 }
2694 while (my $sig = shift @WAIT_FOR_TICK) {
2695 $sig->send;
2696 }
2543 2697
2544# my $AFTER = Event::time; 2698# my $AFTER = Event::time;
2545# warn $AFTER - $NOW;#d# 2699# warn $AFTER - $NOW;#d#
2546 2700
2547 # if we are delayed by four ticks or more, skip them all 2701 # if we are delayed by four ticks or more, skip them all

Diff Legend

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