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.112 by root, Mon Jan 1 13:31:47 2007 UTC vs.
Revision 1.157 by root, Wed Jan 10 01:16:54 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.3 ();
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;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.31 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
30 33
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
37our %EXTCMD = (); 38our %EXTCMD = ();
38 39
47our %CFG; 48our %CFG;
48 49
49our $UPTIME; $UPTIME ||= time; 50our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 51our $RUNTIME;
51 52
53our %PLAYER; # all users
52our %MAP; # all maps 54our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 55our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 56our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 57our %EXT_CORO; # coroutines bound to extensions
58
59our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
60our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
57 61
58binmode STDOUT; 62binmode STDOUT;
59binmode STDERR; 63binmode STDERR;
60 64
61# read virtual server time, if available 65# read virtual server time, if available
71mkdir cf::localdir . "/" . cf::uniquedir; 75mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 76mkdir $RANDOM_MAPS;
73 77
74# a special map that is always available 78# a special map that is always available
75our $LINK_MAP; 79our $LINK_MAP;
76 80our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 81
79############################################################################# 82#############################################################################
80 83
81=head2 GLOBAL VARIABLES 84=head2 GLOBAL VARIABLES
82 85
106 109
107=item %cf::CFG 110=item %cf::CFG
108 111
109Configuration for the server, loaded from C</etc/crossfire/config>, or 112Configuration for the server, loaded from C</etc/crossfire/config>, or
110from wherever your confdir points to. 113from wherever your confdir points to.
114
115=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
116
117These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
118or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
119processing has been done. Call C<< ->wait >> on them to maximise the
120window of cpu time available, or simply to synchronise to the server tick.
111 121
112=back 122=back
113 123
114=cut 124=cut
115 125
119 utf8::encode $msg; 129 utf8::encode $msg;
120 130
121 $msg .= "\n" 131 $msg .= "\n"
122 unless $msg =~ /\n$/; 132 unless $msg =~ /\n$/;
123 133
124 LOG llevError, "cfperl: $msg"; 134 LOG llevError, $msg;
125 }; 135 };
126} 136}
127 137
128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 138@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 139@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
155 165
156=head2 UTILITY FUNCTIONS 166=head2 UTILITY FUNCTIONS
157 167
158=over 4 168=over 4
159 169
170=item dumpval $ref
171
160=cut 172=cut
173
174sub dumpval {
175 eval {
176 local $SIG{__DIE__};
177 my $d;
178 if (1) {
179 $d = new Data::Dumper([$_[0]], ["*var"]);
180 $d->Terse(1);
181 $d->Indent(2);
182 $d->Quotekeys(0);
183 $d->Useqq(1);
184 #$d->Bless(...);
185 $d->Seen($_[1]) if @_ > 1;
186 $d = $d->Dump();
187 }
188 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189 $d
190 } || "[unable to dump $_[0]: '$@']";
191}
161 192
162use JSON::Syck (); # TODO# replace by JSON::PC once working 193use JSON::Syck (); # TODO# replace by JSON::PC once working
163 194
164=item $ref = cf::from_json $json 195=item $ref = cf::from_json $json
165 196
180 211
181sub to_json($) { 212sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 213 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 214 JSON::Syck::Dump $_[0]
184} 215}
216
217=item cf::lock_wait $string
218
219Wait until the given lock is available. See cf::lock_acquire.
220
221=item my $lock = cf::lock_acquire $string
222
223Wait until the given lock is available and then acquires it and returns
224a Coro::guard object. If the guard object gets destroyed (goes out of scope,
225for example when the coroutine gets canceled), the lock is automatically
226returned.
227
228Lock names should begin with a unique identifier (for example, cf::map::find
229uses map_find and cf::map::load uses map_load).
230
231=cut
232
233our %LOCK;
234
235sub lock_wait($) {
236 my ($key) = @_;
237
238 # wait for lock, if any
239 while ($LOCK{$key}) {
240 push @{ $LOCK{$key} }, $Coro::current;
241 Coro::schedule;
242 }
243}
244
245sub lock_acquire($) {
246 my ($key) = @_;
247
248 # wait, to be sure we are not locked
249 lock_wait $key;
250
251 $LOCK{$key} = [];
252
253 Coro::guard {
254 # wake up all waiters, to be on the safe side
255 $_->ready for @{ delete $LOCK{$key} };
256 }
257}
258
259sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active;
261
262 my $guard = Coro::guard { $TICK_WATCHER->start };
263 $TICK_WATCHER->stop;
264 $guard
265}
266
267=item cf::async { BLOCK }
268
269Currently the same as Coro::async_pool, meaning you cannot use
270C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
271thing you are allowed to do is call C<prio> on it.
272
273=cut
274
275BEGIN { *async = \&Coro::async_pool }
185 276
186=item cf::sync_job { BLOCK } 277=item cf::sync_job { BLOCK }
187 278
188The design of crossfire+ requires that the main coro ($Coro::main) is 279The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 280always able to handle events or runnable, as crossfire+ is only partly
203 # this is the main coro, too bad, we have to block 294 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 295 # till the operation succeeds, freezing the server :/
205 296
206 # TODO: use suspend/resume instead 297 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 298 # (but this is cancel-safe)
208 local $FREEZE = 1; 299 my $freeze_guard = freeze_mainloop;
209 300
210 my $busy = 1; 301 my $busy = 1;
211 my @res; 302 my @res;
212 303
213 (Coro::async { 304 (async {
214 @res = eval { $job->() }; 305 @res = eval { $job->() };
215 warn $@ if $@; 306 warn $@ if $@;
216 undef $busy; 307 undef $busy;
217 })->prio (Coro::PRIO_MAX); 308 })->prio (Coro::PRIO_MAX);
218 309
219 while ($busy) { 310 while ($busy) {
220 Coro::cede_notself; 311 Coro::cede or Event::one_event;
221 Event::one_event unless Coro::nready;
222 } 312 }
223 313
224 wantarray ? @res : $res[0] 314 wantarray ? @res : $res[0]
225 } else { 315 } else {
226 # we are in another coroutine, how wonderful, everything just works 316 # we are in another coroutine, how wonderful, everything just works
227 317
228 $job->() 318 $job->()
229 } 319 }
230} 320}
231 321
232=item $coro = cf::coro { BLOCK } 322=item $coro = cf::async_ext { BLOCK }
233 323
234Creates and returns a new coro. This coro is automcatially being canceled 324Like async, but this coro is automcatially being canceled when the
235when the extension calling this is being unloaded. 325extension calling this is being unloaded.
236 326
237=cut 327=cut
238 328
239sub coro(&) { 329sub async_ext(&) {
240 my $cb = shift; 330 my $cb = shift;
241 331
242 my $coro; $coro = async { 332 my $coro = &Coro::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 333
249 $coro->on_destroy (sub { 334 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 335 delete $EXT_CORO{$coro+0};
251 }); 336 });
252 $EXT_CORO{$coro+0} = $coro; 337 $EXT_CORO{$coro+0} = $coro;
282 367
283############################################################################# 368#############################################################################
284 369
285package cf::path; 370package cf::path;
286 371
372# used to convert map paths into valid unix filenames by repalcing / by ∕
373our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
374
287sub new { 375sub new {
288 my ($class, $path, $base) = @_; 376 my ($class, $path, $base) = @_;
289 377
290 $path = $path->as_string if ref $path; 378 $path = $path->as_string if ref $path;
291 379
292 my $self = bless { }, $class; 380 my $self = bless { }, $class;
293 381
382 # {... are special paths that are not touched
383 # ?xxx/... are special absolute paths
384 # ?random/... random maps
385 # /! non-realised random map exit
386 # /... normal maps
387 # ~/... per-player maps without a specific player (DO NOT USE)
388 # ~user/... per-player map of a specific user
389
390 if ($path =~ /^{/) {
391 # fine as it is
294 if ($path =~ s{^\?random/}{}) { 392 } elsif ($path =~ s{^\?random/}{}) {
295 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 393 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
296 $self->{random} = cf::from_json $data; 394 $self->{random} = cf::from_json $data;
297 } else { 395 } else {
298 if ($path =~ s{^~([^/]+)?}{}) { 396 if ($path =~ s{^~([^/]+)?}{}) {
299 $self->{user_rel} = 1; 397 $self->{user_rel} = 1;
344# } 442# }
345} 443}
346 444
347# escape the /'s in the path 445# escape the /'s in the path
348sub _escaped_path { 446sub _escaped_path {
349 # ∕ is U+2215
350 (my $path = $_[0]{path}) =~ s/\///g; 447 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
351 $path 448 $path
352} 449}
353 450
354# the original (read-only) location 451# the original (read-only) location
355sub load_path { 452sub load_path {
804 or return; 901 or return;
805 902
806 unless (aio_stat "$filename.pst") { 903 unless (aio_stat "$filename.pst") {
807 (aio_load "$filename.pst", $av) >= 0 904 (aio_load "$filename.pst", $av) >= 0
808 or return; 905 or return;
809 $av = eval { (Storable::thaw <$av>)->{objs} }; 906 $av = eval { (Storable::thaw $av)->{objs} };
810 } 907 }
811 908
909 warn sprintf "loading %s (%d)\n",
910 $filename, length $data, scalar @{$av || []};#d#
812 return ($data, $av); 911 return ($data, $av);
813} 912}
814 913
815############################################################################# 914#############################################################################
816# command handling &c 915# command handling &c
980}; 1079};
981 1080
982cf::map->attach (prio => -10000, package => cf::mapsupport::); 1081cf::map->attach (prio => -10000, package => cf::mapsupport::);
983 1082
984############################################################################# 1083#############################################################################
985# load/save perl data associated with player->ob objects
986
987sub all_objects(@) {
988 @_, map all_objects ($_->inv), @_
989}
990
991# TODO: compatibility cruft, remove when no longer needed
992cf::player->attach (
993 on_load => sub {
994 my ($pl, $path) = @_;
995
996 for my $o (all_objects $pl->ob) {
997 if (my $value = $o->get_ob_key_value ("_perl_data")) {
998 $o->set_ob_key_value ("_perl_data");
999
1000 %$o = %{ Storable::thaw pack "H*", $value };
1001 }
1002 }
1003 },
1004);
1005
1006#############################################################################
1007 1084
1008=head2 CORE EXTENSIONS 1085=head2 CORE EXTENSIONS
1009 1086
1010Functions and methods that extend core crossfire objects. 1087Functions and methods that extend core crossfire objects.
1011 1088
1089=cut
1090
1091package cf::player;
1092
1093use Coro::AIO;
1094
1012=head3 cf::player 1095=head3 cf::player
1013 1096
1014=over 4 1097=over 4
1015 1098
1016=item cf::player::exists $login 1099=item cf::player::find $login
1017 1100
1018Returns true when the given account exists. 1101Returns the given player object, loading it if necessary (might block).
1019 1102
1020=cut 1103=cut
1021 1104
1022sub cf::player::exists($) { 1105sub playerdir($) {
1023 cf::player::find $_[0] 1106 cf::localdir
1024 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1107 . "/"
1108 . cf::playerdir
1109 . "/"
1110 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1111}
1112
1113sub path($) {
1114 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1115
1116 (playerdir $login) . "/$login.pl"
1117}
1118
1119sub find_active($) {
1120 $cf::PLAYER{$_[0]}
1121 and $cf::PLAYER{$_[0]}->active
1122 and $cf::PLAYER{$_[0]}
1123}
1124
1125sub exists($) {
1126 my ($login) = @_;
1127
1128 $cf::PLAYER{$login}
1129 or cf::sync_job { !aio_stat $login }
1130}
1131
1132sub find($) {
1133 return $cf::PLAYER{$_[0]} || do {
1134 my $login = $_[0];
1135
1136 my $guard = cf::lock_acquire "user_find:$login";
1137
1138 $cf::PLAYER{$_[0]} || do {
1139 my $pl = load_pl path $login
1140 or return;
1141 $cf::PLAYER{$login} = $pl
1142 }
1143 }
1144}
1145
1146sub save($) {
1147 my ($pl) = @_;
1148
1149 return if $pl->{deny_save};
1150
1151 my $path = path $pl;
1152 my $guard = cf::lock_acquire "user_save:$path";
1153
1154 return if $pl->{deny_save};
1155
1156 aio_mkdir playerdir $pl, 0770;
1157 $pl->{last_save} = $cf::RUNTIME;
1158
1159 $pl->save_pl ($path);
1160 Coro::cede;
1161}
1162
1163sub new($) {
1164 my ($login) = @_;
1165
1166 my $self = create;
1167
1168 $self->ob->name ($login);
1169 $self->{deny_save} = 1;
1170
1171 $cf::PLAYER{$login} = $self;
1172
1173 $self
1174}
1175
1176=item $pl->quit_character
1177
1178Nukes the player without looking back. If logged in, the connection will
1179be destroyed. May block for a long time.
1180
1181=cut
1182
1183sub quit_character {
1184 my ($pl) = @_;
1185
1186 $pl->{deny_save} = 1;
1187 $pl->password ("*"); # this should lock out the player until we nuked the dir
1188
1189 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1190 $pl->deactivate;
1191 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1192 $pl->ns->destroy if $pl->ns;
1193
1194 my $path = playerdir $pl;
1195 my $temp = "$path~$cf::RUNTIME~deleting~";
1196 aio_rename $path, $temp;
1197 delete $cf::PLAYER{$pl->ob->name};
1198 $pl->destroy;
1199 IO::AIO::aio_rmtree $temp;
1200}
1201
1202=item cf::player::list_logins
1203
1204Returns am arrayref of all valid playernames in the system, can take a
1205while and may block, so not sync_job-capable, ever.
1206
1207=cut
1208
1209sub list_logins {
1210 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1211 or return [];
1212
1213 my @logins;
1214
1215 for my $login (@$dirs) {
1216 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1217 aio_read $fh, 0, 512, my $buf, 0 or next;
1218 $buf !~ /^password -------------$/m or next; # official not-valid tag
1219
1220 utf8::decode $login;
1221 push @logins, $login;
1222 }
1223
1224 \@logins
1225}
1226
1227=item $player->maps
1228
1229Returns an arrayref of cf::path's of all maps that are private for this
1230player. May block.
1231
1232=cut
1233
1234sub maps($) {
1235 my ($pl) = @_;
1236
1237 my $files = aio_readdir playerdir $pl
1238 or return;
1239
1240 my @paths;
1241
1242 for (@$files) {
1243 utf8::decode $_;
1244 next if /\.(?:pl|pst)$/;
1245 next unless /^$PATH_SEP/;
1246
1247 s/$PATH_SEP/\//g;
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1249 }
1250
1251 \@paths
1025} 1252}
1026 1253
1027=item $player->ext_reply ($msgid, $msgtype, %msg) 1254=item $player->ext_reply ($msgid, $msgtype, %msg)
1028 1255
1029Sends an ext reply to the player. 1256Sends an ext reply to the player.
1030 1257
1031=cut 1258=cut
1032 1259
1033sub cf::player::ext_reply($$$%) { 1260sub ext_reply($$$%) {
1034 my ($self, $id, %msg) = @_; 1261 my ($self, $id, %msg) = @_;
1035 1262
1036 $msg{msgid} = $id; 1263 $msg{msgid} = $id;
1037 1264
1038 $self->send ("ext " . to_json \%msg); 1265 $self->send ("ext " . cf::to_json \%msg);
1039} 1266}
1267
1268package cf;
1040 1269
1041=back 1270=back
1042 1271
1043 1272
1044=head3 cf::map 1273=head3 cf::map
1050package cf::map; 1279package cf::map;
1051 1280
1052use Fcntl; 1281use Fcntl;
1053use Coro::AIO; 1282use Coro::AIO;
1054 1283
1055our $MAX_RESET = 7200; 1284our $MAX_RESET = 3600;
1056our $DEFAULT_RESET = 3600; 1285our $DEFAULT_RESET = 3000;
1057 1286
1058sub generate_random_map { 1287sub generate_random_map {
1059 my ($path, $rmp) = @_; 1288 my ($path, $rmp) = @_;
1060 1289
1061 # mit "rum" bekleckern, nicht 1290 # mit "rum" bekleckern, nicht
1077# and all this just because we cannot iterate over 1306# and all this just because we cannot iterate over
1078# all maps in C++... 1307# all maps in C++...
1079sub change_all_map_light { 1308sub change_all_map_light {
1080 my ($change) = @_; 1309 my ($change) = @_;
1081 1310
1082 $_->change_map_light ($change) for values %cf::MAP; 1311 $_->change_map_light ($change)
1312 for grep $_->outdoor, values %cf::MAP;
1083} 1313}
1084 1314
1085sub try_load_header($) { 1315sub try_load_header($) {
1086 my ($path) = @_; 1316 my ($path) = @_;
1087 1317
1090 or return; 1320 or return;
1091 1321
1092 my $map = cf::map::new 1322 my $map = cf::map::new
1093 or return; 1323 or return;
1094 1324
1325 # for better error messages only, will be overwritten
1326 $map->path ($path);
1327
1095 $map->load_header ($path) 1328 $map->load_header ($path)
1096 or return; 1329 or return;
1097 1330
1098 $map->{load_path} = $path; 1331 $map->{load_path} = $path;
1099 1332
1100 $map 1333 $map
1101} 1334}
1102 1335
1336sub find;
1103sub find_map { 1337sub find {
1104 my ($path, $origin) = @_; 1338 my ($path, $origin) = @_;
1105 1339
1106 #warn "find_map<$path,$origin>\n";#d# 1340 #warn "find<$path,$origin>\n";#d#
1107 1341
1108 $path = new cf::path $path, $origin && $origin->path; 1342 $path = new cf::path $path, $origin && $origin->path;
1109 my $key = $path->as_string; 1343 my $key = $path->as_string;
1110 1344
1345 cf::lock_wait "map_find:$key";
1346
1111 $cf::MAP{$key} || do { 1347 $cf::MAP{$key} || do {
1348 my $guard = cf::lock_acquire "map_find:$key";
1349
1112 # do it the slow way 1350 # do it the slow way
1113 my $map = try_load_header $path->save_path; 1351 my $map = try_load_header $path->save_path;
1114 1352
1353 Coro::cede;
1354
1115 if ($map) { 1355 if ($map) {
1356 $map->last_access ((delete $map->{last_access})
1357 || $cf::RUNTIME); #d#
1116 # safety 1358 # safety
1117 $map->{instantiate_time} = $cf::RUNTIME 1359 $map->{instantiate_time} = $cf::RUNTIME
1118 if $map->{instantiate_time} > $cf::RUNTIME; 1360 if $map->{instantiate_time} > $cf::RUNTIME;
1119 } else { 1361 } else {
1120 if (my $rmp = $path->random_map_params) { 1362 if (my $rmp = $path->random_map_params) {
1125 1367
1126 $map or return; 1368 $map or return;
1127 1369
1128 $map->{load_original} = 1; 1370 $map->{load_original} = 1;
1129 $map->{instantiate_time} = $cf::RUNTIME; 1371 $map->{instantiate_time} = $cf::RUNTIME;
1372 $map->last_access ($cf::RUNTIME);
1130 $map->instantiate; 1373 $map->instantiate;
1131 1374
1132 # per-player maps become, after loading, normal maps 1375 # per-player maps become, after loading, normal maps
1133 $map->per_player (0) if $path->{user_rel}; 1376 $map->per_player (0) if $path->{user_rel};
1134 } 1377 }
1135 1378
1136 $map->path ($key); 1379 $map->path ($key);
1137 $map->{path} = $path; 1380 $map->{path} = $path;
1138 $map->last_access ($cf::RUNTIME); 1381 $map->{last_save} = $cf::RUNTIME;
1382
1383 Coro::cede;
1139 1384
1140 if ($map->should_reset) { 1385 if ($map->should_reset) {
1141 $map->reset; 1386 $map->reset;
1387 undef $guard;
1142 $map = find_map $path; 1388 $map = find $path
1389 or return;
1143 } 1390 }
1144 1391
1145 $cf::MAP{$key} = $map 1392 $cf::MAP{$key} = $map
1146 } 1393 }
1147} 1394}
1148 1395
1149sub load { 1396sub load {
1150 my ($self) = @_; 1397 my ($self) = @_;
1151 1398
1399 my $path = $self->{path};
1400 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1401
1152 return if $self->in_memory != cf::MAP_SWAPPED; 1402 return if $self->in_memory != cf::MAP_SWAPPED;
1153 1403
1154 $self->in_memory (cf::MAP_LOADING); 1404 $self->in_memory (cf::MAP_LOADING);
1155
1156 my $path = $self->{path};
1157 1405
1158 $self->alloc; 1406 $self->alloc;
1159 $self->load_objects ($self->{load_path}, 1) 1407 $self->load_objects ($self->{load_path}, 1)
1160 or return; 1408 or return;
1161 1409
1167 if (aio_open $uniq, O_RDONLY, 0) { 1415 if (aio_open $uniq, O_RDONLY, 0) {
1168 $self->clear_unique_items; 1416 $self->clear_unique_items;
1169 $self->load_objects ($uniq, 0); 1417 $self->load_objects ($uniq, 0);
1170 } 1418 }
1171 } 1419 }
1420
1421 Coro::cede;
1172 1422
1173 # now do the right thing for maps 1423 # now do the right thing for maps
1174 $self->link_multipart_objects; 1424 $self->link_multipart_objects;
1175 1425
1176 if ($self->{path}->is_style_map) { 1426 if ($self->{path}->is_style_map) {
1184 $self->difficulty ($self->estimate_difficulty) 1434 $self->difficulty ($self->estimate_difficulty)
1185 unless $self->difficulty; 1435 unless $self->difficulty;
1186 $self->activate; 1436 $self->activate;
1187 } 1437 }
1188 1438
1439 Coro::cede;
1440
1189 $self->in_memory (cf::MAP_IN_MEMORY); 1441 $self->in_memory (cf::MAP_IN_MEMORY);
1190} 1442}
1191 1443
1192sub load_map_sync { 1444# find and load all maps in the 3x3 area around a map
1445sub load_diag {
1446 my ($map) = @_;
1447
1448 my @diag; # diagonal neighbours
1449
1450 for (0 .. 3) {
1451 my $neigh = $map->tile_path ($_)
1452 or next;
1453 $neigh = find $neigh, $map
1454 or next;
1455 $neigh->load;
1456
1457 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1458 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1459 }
1460
1461 for (@diag) {
1462 my $neigh = find @$_
1463 or next;
1464 $neigh->load;
1465 }
1466}
1467
1468sub find_sync {
1193 my ($path, $origin) = @_; 1469 my ($path, $origin) = @_;
1194 1470
1195 #warn "load_map_sync<$path, $origin>\n";#d# 1471 cf::sync_job { find $path, $origin }
1472}
1196 1473
1197 cf::sync_job { 1474sub do_load_sync {
1198 my $map = cf::map::find_map $path, $origin 1475 my ($map) = @_;
1476
1477 cf::sync_job { $map->load };
1478}
1479
1480our %MAP_PREFETCH;
1481our $MAP_PREFETCHER = Coro::async {
1482 while () {
1483 while (%MAP_PREFETCH) {
1484 my $key = each %MAP_PREFETCH
1199 or return; 1485 or next;
1486 my $path = delete $MAP_PREFETCH{$key};
1487
1488 my $map = find $path
1489 or next;
1200 $map->load; 1490 $map->load;
1201 $map 1491 }
1492 Coro::schedule;
1202 } 1493 }
1494};
1495
1496sub find_async {
1497 my ($path, $origin) = @_;
1498
1499 $path = new cf::path $path, $origin && $origin->path;
1500 my $key = $path->as_string;
1501
1502 if (my $map = $cf::MAP{$key}) {
1503 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1504 }
1505
1506 $MAP_PREFETCH{$key} = $path;
1507 $MAP_PREFETCHER->ready;
1508
1509 ()
1203} 1510}
1204 1511
1205sub save { 1512sub save {
1206 my ($self) = @_; 1513 my ($self) = @_;
1207 1514
1515 my $lock = cf::lock_acquire "map_data:" . $self->path;
1516
1517 $self->{last_save} = $cf::RUNTIME;
1518
1519 return unless $self->dirty;
1520
1208 my $save = $self->{path}->save_path; utf8::encode $save; 1521 my $save = $self->{path}->save_path; utf8::encode $save;
1209 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1522 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1210 1523
1211 $self->{last_save} = $cf::RUNTIME;
1212
1213 return unless $self->dirty;
1214
1215 $self->{load_path} = $save; 1524 $self->{load_path} = $save;
1216 1525
1217 return if $self->{deny_save}; 1526 return if $self->{deny_save};
1527
1528 local $self->{last_access} = $self->last_access;#d#
1529
1530 cf::async {
1531 $_->contr->save for $self->players;
1532 };
1218 1533
1219 if ($uniq) { 1534 if ($uniq) {
1220 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1535 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1221 $self->save_objects ($uniq, cf::IO_UNIQUES); 1536 $self->save_objects ($uniq, cf::IO_UNIQUES);
1222 } else { 1537 } else {
1225} 1540}
1226 1541
1227sub swap_out { 1542sub swap_out {
1228 my ($self) = @_; 1543 my ($self) = @_;
1229 1544
1545 # save first because save cedes
1546 $self->save;
1547
1548 my $lock = cf::lock_acquire "map_data:" . $self->path;
1549
1230 return if $self->players; 1550 return if $self->players;
1231 return if $self->in_memory != cf::MAP_IN_MEMORY; 1551 return if $self->in_memory != cf::MAP_IN_MEMORY;
1232 return if $self->{deny_save}; 1552 return if $self->{deny_save};
1233 1553
1234 $self->save;
1235 $self->clear; 1554 $self->clear;
1236 $self->in_memory (cf::MAP_SWAPPED); 1555 $self->in_memory (cf::MAP_SWAPPED);
1237} 1556}
1238 1557
1239sub reset_at { 1558sub reset_at {
1240 my ($self) = @_; 1559 my ($self) = @_;
1241 1560
1242 # TODO: safety, remove and allow resettable per-player maps 1561 # TODO: safety, remove and allow resettable per-player maps
1243 return 1e100 if $self->{path}{user_rel}; 1562 return 1e99 if $self->{path}{user_rel};
1244 return 1e100 if $self->{deny_reset}; 1563 return 1e99 if $self->{deny_reset};
1245 1564
1246 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1565 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1247 my $to = $self->reset_timeout || $DEFAULT_RESET; 1566 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1248 $to = $MAX_RESET if $to > $MAX_RESET;
1249 1567
1250 $time + $to 1568 $time + $to
1251} 1569}
1252 1570
1253sub should_reset { 1571sub should_reset {
1262 utf8::encode (my $save = $self->{path}->save_path); 1580 utf8::encode (my $save = $self->{path}->save_path);
1263 aioreq_pri 3; IO::AIO::aio_unlink $save; 1581 aioreq_pri 3; IO::AIO::aio_unlink $save;
1264 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst"; 1582 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1265} 1583}
1266 1584
1585sub rename {
1586 my ($self, $new_path) = @_;
1587
1588 $self->unlink_save;
1589
1590 delete $cf::MAP{$self->path};
1591 $self->{path} = new cf::path $new_path;
1592 $self->path ($self->{path}->as_string);
1593 $cf::MAP{$self->path} = $self;
1594
1595 $self->save;
1596}
1597
1267sub reset { 1598sub reset {
1268 my ($self) = @_; 1599 my ($self) = @_;
1269 1600
1601 my $lock = cf::lock_acquire "map_data:" . $self->path;
1602
1270 return if $self->players; 1603 return if $self->players;
1271 return if $self->{path}{user_rel};#d# 1604 return if $self->{path}{user_rel};#d#
1272 1605
1273 warn "resetting map ", $self->path;#d# 1606 warn "resetting map ", $self->path;#d#
1274 1607
1278 1611
1279 $self->unlink_save; 1612 $self->unlink_save;
1280 $self->destroy; 1613 $self->destroy;
1281} 1614}
1282 1615
1616my $nuke_counter = "aaaa";
1617
1618sub nuke {
1619 my ($self) = @_;
1620
1621 $self->{deny_save} = 1;
1622 $self->reset_timeout (1);
1623 $self->rename ("{nuke}/" . ($nuke_counter++));
1624 $self->reset; # polite request, might not happen
1625}
1626
1283sub customise_for { 1627sub customise_for {
1284 my ($map, $ob) = @_; 1628 my ($map, $ob) = @_;
1285 1629
1286 if ($map->per_player) { 1630 if ($map->per_player) {
1287 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1631 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1288 } 1632 }
1289 1633
1290 $map 1634 $map
1291} 1635}
1292 1636
1293sub emergency_save {
1294 local $cf::FREEZE = 1;
1295
1296 warn "enter emergency map save\n";
1297
1298 cf::sync_job {
1299 warn "begin emergency map save\n";
1300 $_->save for values %cf::MAP;
1301 };
1302
1303 warn "end emergency map save\n";
1304}
1305
1306package cf; 1637package cf;
1307 1638
1308=back 1639=back
1309 1640
1641=head3 cf::object
1642
1643=cut
1644
1645package cf::object;
1646
1647=over 4
1648
1649=item $ob->inv_recursive
1650
1651Returns the inventory of the object _and_ their inventories, recursively.
1652
1653=cut
1654
1655sub inv_recursive_;
1656sub inv_recursive_ {
1657 map { $_, inv_recursive_ $_->inv } @_
1658}
1659
1660sub inv_recursive {
1661 inv_recursive_ inv $_[0]
1662}
1663
1664package cf;
1665
1666=back
1310 1667
1311=head3 cf::object::player 1668=head3 cf::object::player
1312 1669
1313=over 4 1670=over 4
1314 1671
1350 (ref $cf::CFG{"may_$access"} 1707 (ref $cf::CFG{"may_$access"}
1351 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1708 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1352 : $cf::CFG{"may_$access"}) 1709 : $cf::CFG{"may_$access"})
1353} 1710}
1354 1711
1712=item $player_object->enter_link
1713
1714Freezes the player and moves him/her to a special map (C<{link}>).
1715
1716The player should be reaosnably safe there for short amounts of time. You
1717I<MUST> call C<leave_link> as soon as possible, though.
1718
1719=item $player_object->leave_link ($map, $x, $y)
1720
1721Moves the player out of the specila link map onto the given map. If the
1722map is not valid (or omitted), the player will be moved back to the
1723location he/she was before the call to C<enter_link>, or, if that fails,
1724to the emergency map position.
1725
1726Might block.
1727
1728=cut
1729
1355sub cf::object::player::enter_link { 1730sub cf::object::player::enter_link {
1356 my ($self) = @_; 1731 my ($self) = @_;
1357 1732
1733 $self->deactivate_recursive;
1734
1358 return if $self->map == $LINK_MAP; 1735 return if $self->map == $LINK_MAP;
1359 1736
1360 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1361 if $self->map; 1738 if $self->map;
1362 1739
1363 $self->enter_map ($LINK_MAP, 20, 20); 1740 $self->enter_map ($LINK_MAP, 20, 20);
1364 $self->deactivate_recursive;
1365} 1741}
1366 1742
1367sub cf::object::player::leave_link { 1743sub cf::object::player::leave_link {
1368 my ($self, $map, $x, $y) = @_; 1744 my ($self, $map, $x, $y) = @_;
1369 1745
1370 my $link_pos = delete $self->{_link_pos}; 1746 my $link_pos = delete $self->{_link_pos};
1371 1747
1372 unless ($map) { 1748 unless ($map) {
1373 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1374
1375 # restore original map position 1749 # restore original map position
1376 ($map, $x, $y) = @{ $link_pos || [] }; 1750 ($map, $x, $y) = @{ $link_pos || [] };
1377 $map = cf::map::find_map $map; 1751 $map = cf::map::find $map;
1378 1752
1379 unless ($map) { 1753 unless ($map) {
1380 ($map, $x, $y) = @$EMERGENCY_POSITION; 1754 ($map, $x, $y) = @$EMERGENCY_POSITION;
1381 $map = cf::map::find_map $map 1755 $map = cf::map::find $map
1382 or die "FATAL: cannot load emergency map\n"; 1756 or die "FATAL: cannot load emergency map\n";
1383 } 1757 }
1384 } 1758 }
1385 1759
1386 ($x, $y) = (-1, -1) 1760 ($x, $y) = (-1, -1)
1389 # use -1 or undef as default coordinates, not 0, 0 1763 # use -1 or undef as default coordinates, not 0, 0
1390 ($x, $y) = ($map->enter_x, $map->enter_y) 1764 ($x, $y) = ($map->enter_x, $map->enter_y)
1391 if $x <=0 && $y <= 0; 1765 if $x <=0 && $y <= 0;
1392 1766
1393 $map->load; 1767 $map->load;
1768 $map->load_diag;
1394 1769
1770 return unless $self->contr->active;
1395 $self->activate_recursive; 1771 $self->activate_recursive;
1396 $self->enter_map ($map, $x, $y); 1772 $self->enter_map ($map, $x, $y);
1397} 1773}
1398 1774
1775cf::player->attach (
1776 on_logout => sub {
1777 my ($pl) = @_;
1778
1779 # abort map switching before logout
1780 if ($pl->ob->{_link_pos}) {
1781 cf::sync_job {
1782 $pl->ob->leave_link
1783 };
1784 }
1785 },
1786 on_login => sub {
1787 my ($pl) = @_;
1788
1789 # try to abort aborted map switching on player login :)
1790 # should happen only on crashes
1791 if ($pl->ob->{_link_pos}) {
1792 $pl->ob->enter_link;
1793 (async {
1794 # we need this sleep as the login has a concurrent enter_exit running
1795 # and this sleep increases chances of the player not ending up in scorn
1796 $pl->ob->reply (undef,
1797 "There was an internal problem at your last logout, "
1798 . "the server will try to bring you to your intended destination in a second.",
1799 cf::NDI_RED);
1800 Coro::Timer::sleep 1;
1801 $pl->ob->leave_link;
1802 })->prio (2);
1803 }
1804 },
1805);
1806
1399=item $player_object->goto_map ($map, $x, $y) 1807=item $player_object->goto ($path, $x, $y)
1400 1808
1401=cut 1809=cut
1402 1810
1403sub cf::object::player::goto_map { 1811sub cf::object::player::goto {
1404 my ($self, $path, $x, $y) = @_; 1812 my ($self, $path, $x, $y) = @_;
1405 1813
1814 $path = new cf::path $path;
1815 $path ne "/" or Carp::cluck ("oy");#d#
1816
1406 $self->enter_link; 1817 $self->enter_link;
1407 1818
1408 (Coro::async { 1819 (async {
1409 $path = new cf::path $path;
1410
1411 my $map = cf::map::find_map $path->as_string; 1820 my $map = cf::map::find $path->as_string;
1412 $map = $map->customise_for ($self) if $map; 1821 $map = $map->customise_for ($self) if $map;
1413 1822
1414 warn "entering ", $map->path, " at ($x, $y)\n" 1823# warn "entering ", $map->path, " at ($x, $y)\n"
1415 if $map; 1824# if $map;
1825
1826 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1416 1827
1417 $self->leave_link ($map, $x, $y); 1828 $self->leave_link ($map, $x, $y);
1418 })->prio (1); 1829 })->prio (1);
1419} 1830}
1420 1831
1473 1884
1474 return unless $self->type == cf::PLAYER; 1885 return unless $self->type == cf::PLAYER;
1475 1886
1476 $self->enter_link; 1887 $self->enter_link;
1477 1888
1478 (Coro::async { 1889 (async {
1890 $self->deactivate_recursive; # just to be sure
1479 unless (eval { 1891 unless (eval {
1480
1481 prepare_random_map $exit 1892 prepare_random_map $exit
1482 if $exit->slaying eq "/!"; 1893 if $exit->slaying eq "/!";
1483 1894
1484 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1895 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1485 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1896 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1486 1897
1487 1; 1898 1;
1488 }) { 1899 }) {
1489 $self->message ("Something went wrong deep within the crossfire server. " 1900 $self->message ("Something went wrong deep within the crossfire server. "
1490 . "I'll try to bring you back to the map you were before. " 1901 . "I'll try to bring you back to the map you were before. "
1547 on_reply => sub { 1958 on_reply => sub {
1548 my ($ns, $msg) = @_; 1959 my ($ns, $msg) = @_;
1549 1960
1550 # this weird shuffling is so that direct followup queries 1961 # this weird shuffling is so that direct followup queries
1551 # get handled first 1962 # get handled first
1552 my $queue = delete $ns->{query_queue}; 1963 my $queue = delete $ns->{query_queue}
1964 or return; # be conservative, not sure how that can happen, but we saw a crash here
1553 1965
1554 (shift @$queue)->[1]->($msg); 1966 (shift @$queue)->[1]->($msg);
1555 1967
1556 push @{ $ns->{query_queue} }, @$queue; 1968 push @{ $ns->{query_queue} }, @$queue;
1557 1969
1563 } 1975 }
1564 } 1976 }
1565 }, 1977 },
1566); 1978);
1567 1979
1568=item $client->coro (\&cb) 1980=item $client->async (\&cb)
1569 1981
1570Create a new coroutine, running the specified callback. The coroutine will 1982Create a new coroutine, running the specified callback. The coroutine will
1571be automatically cancelled when the client gets destroyed (e.g. on logout, 1983be automatically cancelled when the client gets destroyed (e.g. on logout,
1572or loss of connection). 1984or loss of connection).
1573 1985
1574=cut 1986=cut
1575 1987
1576sub cf::client::coro { 1988sub cf::client::async {
1577 my ($self, $cb) = @_; 1989 my ($self, $cb) = @_;
1578 1990
1579 my $coro; $coro = async { 1991 my $coro = &Coro::async ($cb);
1580 eval {
1581 $cb->();
1582 };
1583 warn $@ if $@;
1584 };
1585 1992
1586 $coro->on_destroy (sub { 1993 $coro->on_destroy (sub {
1587 delete $self->{_coro}{$coro+0}; 1994 delete $self->{_coro}{$coro+0};
1588 }); 1995 });
1589 1996
1761 2168
1762{ 2169{
1763 my $path = cf::localdir . "/database.pst"; 2170 my $path = cf::localdir . "/database.pst";
1764 2171
1765 sub db_load() { 2172 sub db_load() {
1766 warn "loading database $path\n";#d# remove later
1767 $DB = stat $path ? Storable::retrieve $path : { }; 2173 $DB = stat $path ? Storable::retrieve $path : { };
1768 } 2174 }
1769 2175
1770 my $pid; 2176 my $pid;
1771 2177
1772 sub db_save() { 2178 sub db_save() {
1773 warn "saving database $path\n";#d# remove later
1774 waitpid $pid, 0 if $pid; 2179 waitpid $pid, 0 if $pid;
1775 if (0 == ($pid = fork)) { 2180 if (0 == ($pid = fork)) {
1776 $DB->{_meta}{version} = 1; 2181 $DB->{_meta}{version} = 1;
1777 Storable::nstore $DB, "$path~"; 2182 Storable::nstore $DB, "$path~";
1778 rename "$path~", $path; 2183 rename "$path~", $path;
1826 open my $fh, "<:utf8", cf::confdir . "/config" 2231 open my $fh, "<:utf8", cf::confdir . "/config"
1827 or return; 2232 or return;
1828 2233
1829 local $/; 2234 local $/;
1830 *CFG = YAML::Syck::Load <$fh>; 2235 *CFG = YAML::Syck::Load <$fh>;
2236
2237 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2238
2239 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2240 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2241
2242 if (exists $CFG{mlockall}) {
2243 eval {
2244 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2245 and die "WARNING: m(un)lockall failed: $!\n";
2246 };
2247 warn $@ if $@;
2248 }
1831} 2249}
1832 2250
1833sub main { 2251sub main {
1834 # we must not ever block the main coroutine 2252 # we must not ever block the main coroutine
1835 local $Coro::idle = sub { 2253 local $Coro::idle = sub {
1836 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 2254 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1837 (Coro::unblock_sub {
1838 Event::one_event; 2255 async { Event::one_event };
1839 })->();
1840 }; 2256 };
1841 2257
1842 cfg_load; 2258 cfg_load;
1843 db_load; 2259 db_load;
1844 load_extensions; 2260 load_extensions;
1845 Event::loop; 2261 Event::loop;
1846} 2262}
1847 2263
1848############################################################################# 2264#############################################################################
1849# initialisation 2265# initialisation and cleanup
2266
2267# install some emergency cleanup handlers
2268BEGIN {
2269 for my $signal (qw(INT HUP TERM)) {
2270 Event->signal (
2271 data => WF_AUTOCANCEL,
2272 signal => $signal,
2273 cb => sub {
2274 cf::cleanup "SIG$signal";
2275 },
2276 );
2277 }
2278}
2279
2280sub emergency_save() {
2281 my $freeze_guard = cf::freeze_mainloop;
2282
2283 warn "enter emergency perl save\n";
2284
2285 cf::sync_job {
2286 # use a peculiar iteration method to avoid tripping on perl
2287 # refcount bugs in for. also avoids problems with players
2288 # and maps saved/Destroyed asynchronously.
2289 warn "begin emergency player save\n";
2290 for my $login (keys %cf::PLAYER) {
2291 my $pl = $cf::PLAYER{$login} or next;
2292 $pl->valid or next;
2293 $pl->save;
2294 }
2295 warn "end emergency player save\n";
2296
2297 warn "begin emergency map save\n";
2298 for my $path (keys %cf::MAP) {
2299 my $map = $cf::MAP{$path} or next;
2300 $map->valid or next;
2301 $map->save;
2302 }
2303 warn "end emergency map save\n";
2304 };
2305
2306 warn "leave emergency perl save\n";
2307}
1850 2308
1851sub reload() { 2309sub reload() {
1852 # can/must only be called in main 2310 # can/must only be called in main
1853 if ($Coro::current != $Coro::main) { 2311 if ($Coro::current != $Coro::main) {
1854 warn "can only reload from main coroutine\n"; 2312 warn "can only reload from main coroutine\n";
1855 return; 2313 return;
1856 } 2314 }
1857 2315
1858 warn "reloading..."; 2316 warn "reloading...";
1859 2317
1860 local $FREEZE = 1; 2318 my $guard = freeze_mainloop;
1861 cf::emergency_save; 2319 cf::emergency_save;
1862 2320
1863 eval { 2321 eval {
1864 # if anything goes wrong in here, we should simply crash as we already saved 2322 # if anything goes wrong in here, we should simply crash as we already saved
1865 2323
1927 cf::load_extensions; 2385 cf::load_extensions;
1928 2386
1929 # reattach attachments to objects 2387 # reattach attachments to objects
1930 warn "reattach"; 2388 warn "reattach";
1931 _global_reattach; 2389 _global_reattach;
2390 reattach $_ for values %MAP;
1932 }; 2391 };
1933 2392
1934 if ($@) { 2393 if ($@) {
1935 warn $@; 2394 warn $@;
1936 warn "error while reloading, exiting."; 2395 warn "error while reloading, exiting.";
1952 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2411 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
1953 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2412 $LINK_MAP->in_memory (MAP_IN_MEMORY);
1954 2413
1955 # dirty hack because... archetypes are not yet loaded 2414 # dirty hack because... archetypes are not yet loaded
1956 Event->timer ( 2415 Event->timer (
1957 after => 2, 2416 after => 10,
1958 cb => sub { 2417 cb => sub {
1959 $_[0]->w->cancel; 2418 $_[0]->w->cancel;
1960 2419
1961 # provide some exits "home" 2420 # provide some exits "home"
1962 my $exit = cf::object::new "exit"; 2421 my $exit = cf::object::new "exit";
2001 reentrant => 0, 2460 reentrant => 0,
2002 prio => 0, 2461 prio => 0,
2003 at => $NEXT_TICK || $TICK, 2462 at => $NEXT_TICK || $TICK,
2004 data => WF_AUTOCANCEL, 2463 data => WF_AUTOCANCEL,
2005 cb => sub { 2464 cb => sub {
2006 unless ($FREEZE) {
2007 cf::server_tick; # one server iteration 2465 cf::server_tick; # one server iteration
2008 $RUNTIME += $TICK; 2466 $RUNTIME += $TICK;
2009 }
2010
2011 $NEXT_TICK += $TICK; 2467 $NEXT_TICK += $TICK;
2468
2469 $WAIT_FOR_TICK->broadcast;
2470 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2012 2471
2013 # if we are delayed by four ticks or more, skip them all 2472 # if we are delayed by four ticks or more, skip them all
2014 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2473 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2015 2474
2016 $TICK_WATCHER->at ($NEXT_TICK); 2475 $TICK_WATCHER->at ($NEXT_TICK);
2038 or warn "ERROR: unable to write runtime file: $!"; 2497 or warn "ERROR: unable to write runtime file: $!";
2039 })->(); 2498 })->();
2040 }, 2499 },
2041); 2500);
2042 2501
2502END { cf::emergency_save }
2503
20431 25041
2044 2505

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines