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.110 by root, Mon Jan 1 11:21:55 2007 UTC vs.
Revision 1.139 by root, Fri Jan 5 19:12:03 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;
… …
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
… …
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %MAP; # all maps 52our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 53our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 54our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 55our %EXT_CORO;
57 56
58binmode STDOUT; 57binmode STDOUT;
59binmode STDERR; 58binmode STDERR;
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 70mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 71mkdir $RANDOM_MAPS;
73 72
74# a special map that is always available 73# a special map that is always available
75our $LINK_MAP; 74our $LINK_MAP;
76 75our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 76
79############################################################################# 77#############################################################################
80 78
81=head2 GLOBAL VARIABLES 79=head2 GLOBAL VARIABLES
82 80
… …
181sub to_json($) { 179sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 181 JSON::Syck::Dump $_[0]
184} 182}
185 183
184=item cf::lock_wait $string
185
186Wait until the given lock is available. See cf::lock_acquire.
187
188=item my $lock = cf::lock_acquire $string
189
190Wait until the given lock is available and then acquires it and returns
191a Coro::guard object. If the guard object gets destroyed (goes out of scope,
192for example when the coroutine gets canceled), the lock is automatically
193returned.
194
195Lock names should begin with a unique identifier (for example, cf::map::find
196uses map_find and cf::map::load uses map_load).
197
198=cut
199
200our %LOCK;
201
202sub lock_wait($) {
203 my ($key) = @_;
204
205 # wait for lock, if any
206 while ($LOCK{$key}) {
207 push @{ $LOCK{$key} }, $Coro::current;
208 Coro::schedule;
209 }
210}
211
212sub lock_acquire($) {
213 my ($key) = @_;
214
215 # wait, to be sure we are not locked
216 lock_wait $key;
217
218 $LOCK{$key} = [];
219
220 Coro::guard {
221 # wake up all waiters, to be on the safe side
222 $_->ready for @{ delete $LOCK{$key} };
223 }
224}
225
226sub freeze_mainloop {
227 return unless $TICK_WATCHER->is_active;
228
229 my $guard = Coro::guard { $TICK_WATCHER->start };
230 $TICK_WATCHER->stop;
231 $guard
232}
233
186=item cf::sync_job { BLOCK } 234=item cf::sync_job { BLOCK }
187 235
188The design of crossfire+ requires that the main coro ($Coro::main) is 236The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 237always able to handle events or runnable, as crossfire+ is only partly
190reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 238reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
197=cut 245=cut
198 246
199sub sync_job(&) { 247sub sync_job(&) {
200 my ($job) = @_; 248 my ($job) = @_;
201 249
202 my $busy = 1;
203 my @res;
204
205 my $coro = Coro::async {
206 @res = eval { $job->() };
207 warn $@ if $@;
208 undef $busy;
209 };
210
211 if ($Coro::current == $Coro::main) { 250 if ($Coro::current == $Coro::main) {
251 # this is the main coro, too bad, we have to block
252 # till the operation succeeds, freezing the server :/
253
212 # TODO: use suspend/resume instead 254 # TODO: use suspend/resume instead
213 local $FREEZE = 1; 255 # (but this is cancel-safe)
256 my $freeze_guard = freeze_mainloop;
257
258 my $busy = 1;
259 my @res;
260
261 (Coro::async_pool {
262 @res = eval { $job->() };
263 warn $@ if $@;
264 undef $busy;
214 $coro->prio (Coro::PRIO_MAX); 265 })->prio (Coro::PRIO_MAX);
266
215 while ($busy) { 267 while ($busy) {
216 Coro::cede_notself; 268 unless (Coro::cede) {
217 Event::one_event unless Coro::nready; 269 Coro::nready ? Event::one_event 0 : Event::one_event;
270 Coro::cede_notself unless Coro::cede;
218 } 271 }
272 }
273
274 wantarray ? @res : $res[0]
219 } else { 275 } else {
220 $coro->join; 276 # we are in another coroutine, how wonderful, everything just works
277
278 $job->()
221 } 279 }
222
223 wantarray ? @res : $res[0]
224} 280}
225 281
226=item $coro = cf::coro { BLOCK } 282=item $coro = cf::coro { BLOCK }
227 283
228Creates and returns a new coro. This coro is automcatially being canceled 284Creates (and readies) and returns a new coro. This coro is automcatially
229when the extension calling this is being unloaded. 285being canceled when the extension calling this is being unloaded.
230 286
231=cut 287=cut
232 288
233sub coro(&) { 289sub coro(&) {
234 my $cb = shift; 290 my $cb = shift;
235 291
236 my $coro; $coro = async { 292 my $coro = &Coro::async_pool ($cb);
237 eval {
238 $cb->();
239 };
240 warn $@ if $@;
241 };
242 293
243 $coro->on_destroy (sub { 294 $coro->on_destroy (sub {
244 delete $EXT_CORO{$coro+0}; 295 delete $EXT_CORO{$coro+0};
245 }); 296 });
246 $EXT_CORO{$coro+0} = $coro; 297 $EXT_CORO{$coro+0} = $coro;
… …
252 my $runtime = cf::localdir . "/runtime"; 303 my $runtime = cf::localdir . "/runtime";
253 304
254 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 305 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
255 or return; 306 or return;
256 307
257 my $value = $cf::RUNTIME; 308 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock
258 (aio_write $fh, 0, (length $value), $value, 0) <= 0 309 (aio_write $fh, 0, (length $value), $value, 0) <= 0
259 and return; 310 and return;
260 311
261 aio_fsync $fh 312 aio_fsync $fh
262 and return; 313 and return;
… …
283 334
284 $path = $path->as_string if ref $path; 335 $path = $path->as_string if ref $path;
285 336
286 my $self = bless { }, $class; 337 my $self = bless { }, $class;
287 338
339 # {... are special paths that are not touched
340 # ?xxx/... are special absolute paths
341 # ?random/... random maps
342 # /! non-realised random map exit
343 # /... normal maps
344 # ~/... per-player maps without a specific player (DO NOT USE)
345 # ~user/... per-player map of a specific user
346
347 if ($path =~ /^{/) {
348 # fine as it is
288 if ($path =~ s{^\?random/}{}) { 349 } elsif ($path =~ s{^\?random/}{}) {
289 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 350 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
290 $self->{random} = cf::from_json $data; 351 $self->{random} = cf::from_json $data;
291 } else { 352 } else {
292 if ($path =~ s{^~([^/]+)?}{}) { 353 if ($path =~ s{^~([^/]+)?}{}) {
293 $self->{user_rel} = 1; 354 $self->{user_rel} = 1;
… …
798 or return; 859 or return;
799 860
800 unless (aio_stat "$filename.pst") { 861 unless (aio_stat "$filename.pst") {
801 (aio_load "$filename.pst", $av) >= 0 862 (aio_load "$filename.pst", $av) >= 0
802 or return; 863 or return;
803 $av = eval { (Storable::thaw <$av>)->{objs} }; 864 $av = eval { (Storable::thaw $av)->{objs} };
804 } 865 }
805 866
867 warn sprintf "loading %s (%d)\n",
868 $filename, length $data, scalar @{$av || []};#d#
806 return ($data, $av); 869 return ($data, $av);
807} 870}
808 871
809############################################################################# 872#############################################################################
810# command handling &c 873# command handling &c
… …
1044package cf::map; 1107package cf::map;
1045 1108
1046use Fcntl; 1109use Fcntl;
1047use Coro::AIO; 1110use Coro::AIO;
1048 1111
1049our $MAX_RESET = 7200; 1112our $MAX_RESET = 3600;
1050our $DEFAULT_RESET = 3600; 1113our $DEFAULT_RESET = 3000;
1051$MAX_RESET = 10;#d#
1052$DEFAULT_RESET = 10;#d#
1053 1114
1054sub generate_random_map { 1115sub generate_random_map {
1055 my ($path, $rmp) = @_; 1116 my ($path, $rmp) = @_;
1056 1117
1057 # mit "rum" bekleckern, nicht 1118 # mit "rum" bekleckern, nicht
… …
1073# and all this just because we cannot iterate over 1134# and all this just because we cannot iterate over
1074# all maps in C++... 1135# all maps in C++...
1075sub change_all_map_light { 1136sub change_all_map_light {
1076 my ($change) = @_; 1137 my ($change) = @_;
1077 1138
1078 $_->change_map_light ($change) for values %cf::MAP; 1139 $_->change_map_light ($change)
1140 for grep $_->outdoor, values %cf::MAP;
1079} 1141}
1080 1142
1081sub try_load_header($) { 1143sub try_load_header($) {
1082 my ($path) = @_; 1144 my ($path) = @_;
1083 1145
… …
1086 or return; 1148 or return;
1087 1149
1088 my $map = cf::map::new 1150 my $map = cf::map::new
1089 or return; 1151 or return;
1090 1152
1153 # for better error messages only, will be overwritten
1154 $map->path ($path);
1155
1091 $map->load_header ($path) 1156 $map->load_header ($path)
1092 or return; 1157 or return;
1093 1158
1094 $map->{load_path} = $path; 1159 $map->{load_path} = $path;
1095 use Data::Dumper; warn Dumper $map;#d#
1096 1160
1097 $map 1161 $map
1098} 1162}
1099 1163
1164sub find;
1100sub find_map { 1165sub find {
1101 my ($path, $origin) = @_; 1166 my ($path, $origin) = @_;
1102 1167
1103 #warn "find_map<$path,$origin>\n";#d# 1168 #warn "find<$path,$origin>\n";#d#
1104 1169
1105 $path = ref $path ? $path : new cf::path $path, $origin && $origin->path; 1170 $path = new cf::path $path, $origin && $origin->path;
1106 my $key = $path->as_string; 1171 my $key = $path->as_string;
1107 1172
1173 cf::lock_wait "map_find:$key";
1174
1108 $cf::MAP{$key} || do { 1175 $cf::MAP{$key} || do {
1176 my $guard = cf::lock_acquire "map_find:$key";
1177
1109 # do it the slow way 1178 # do it the slow way
1110 my $map = try_load_header $path->save_path; 1179 my $map = try_load_header $path->save_path;
1111 1180
1181 Coro::cede;
1182
1112 if ($map) { 1183 if ($map) {
1184 $map->last_access ((delete $map->{last_access})
1185 || $cf::RUNTIME); #d#
1113 # safety 1186 # safety
1114 $map->{instantiate_time} = $cf::RUNTIME 1187 $map->{instantiate_time} = $cf::RUNTIME
1115 if $map->{instantiate_time} > $cf::RUNTIME; 1188 if $map->{instantiate_time} > $cf::RUNTIME;
1116 } else { 1189 } else {
1117 if (my $rmp = $path->random_map_params) { 1190 if (my $rmp = $path->random_map_params) {
… …
1120 $map = try_load_header $path->load_path; 1193 $map = try_load_header $path->load_path;
1121 } 1194 }
1122 1195
1123 $map or return; 1196 $map or return;
1124 1197
1198 $map->{load_original} = 1;
1125 $map->{instantiate_time} = $cf::RUNTIME; 1199 $map->{instantiate_time} = $cf::RUNTIME;
1200 $map->last_access ($cf::RUNTIME);
1126 $map->instantiate; 1201 $map->instantiate;
1127 1202
1128 # per-player maps become, after loading, normal maps 1203 # per-player maps become, after loading, normal maps
1129 $map->per_player (0) if $path->{user_rel}; 1204 $map->per_player (0) if $path->{user_rel};
1130 } 1205 }
1131 1206
1132 $map->path ($key); 1207 $map->path ($key);
1133 $map->{path} = $path; 1208 $map->{path} = $path;
1134 $map->last_access ($cf::RUNTIME); 1209 $map->{last_save} = $cf::RUNTIME;
1135 1210
1211 Coro::cede;
1212
1136 $map->reset if $map->should_reset; 1213 if ($map->should_reset) {
1214 $map->reset;
1215 undef $guard;
1216 $map = find $path
1217 or return;
1218 }
1137 1219
1138 $cf::MAP{$key} = $map 1220 $cf::MAP{$key} = $map
1139 } 1221 }
1140} 1222}
1141 1223
1142sub load { 1224sub load {
1143 my ($self) = @_; 1225 my ($self) = @_;
1144 1226
1227 my $path = $self->{path};
1228 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1229
1145 return if $self->in_memory != cf::MAP_SWAPPED; 1230 return if $self->in_memory != cf::MAP_SWAPPED;
1146 1231
1147 $self->in_memory (cf::MAP_LOADING); 1232 $self->in_memory (cf::MAP_LOADING);
1148
1149 my $path = $self->{path};
1150 1233
1151 $self->alloc; 1234 $self->alloc;
1152 $self->load_objects ($self->{load_path}, 1) 1235 $self->load_objects ($self->{load_path}, 1)
1153 or return; 1236 or return;
1237
1238 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1239 if delete $self->{load_original};
1154 1240
1155 if (my $uniq = $path->uniq_path) { 1241 if (my $uniq = $path->uniq_path) {
1156 utf8::encode $uniq; 1242 utf8::encode $uniq;
1157 if (aio_open $uniq, O_RDONLY, 0) { 1243 if (aio_open $uniq, O_RDONLY, 0) {
1158 $self->clear_unique_items; 1244 $self->clear_unique_items;
1159 $self->load_objects ($uniq, 0); 1245 $self->load_objects ($uniq, 0);
1160 } 1246 }
1161 } 1247 }
1248
1249 Coro::cede;
1162 1250
1163 # now do the right thing for maps 1251 # now do the right thing for maps
1164 $self->link_multipart_objects; 1252 $self->link_multipart_objects;
1165 1253
1166 if ($self->{path}->is_style_map) { 1254 if ($self->{path}->is_style_map) {
… …
1174 $self->difficulty ($self->estimate_difficulty) 1262 $self->difficulty ($self->estimate_difficulty)
1175 unless $self->difficulty; 1263 unless $self->difficulty;
1176 $self->activate; 1264 $self->activate;
1177 } 1265 }
1178 1266
1267 Coro::cede;
1268
1179 $self->in_memory (cf::MAP_IN_MEMORY); 1269 $self->in_memory (cf::MAP_IN_MEMORY);
1180} 1270}
1181 1271
1182sub load_map_sync { 1272sub find_sync {
1183 my ($path, $origin) = @_; 1273 my ($path, $origin) = @_;
1184 1274
1185 #warn "load_map_sync<$path, $origin>\n";#d#
1186
1187 cf::sync_job { 1275 cf::sync_job {
1188 my $map = cf::map::find_map $path, $origin 1276 my $map = cf::map::find $path, $origin;
1189 or return;
1190 $map->load;
1191 $map 1277 $map
1192 } 1278 }
1279}
1280
1281sub do_load_sync {
1282 my ($map) = @_;
1283
1284 cf::sync_job { $map->load };
1193} 1285}
1194 1286
1195sub save { 1287sub save {
1196 my ($self) = @_; 1288 my ($self) = @_;
1197 1289
1290 my $lock = cf::lock_acquire "map_data:" . $self->path;
1291
1292 $self->{last_save} = $cf::RUNTIME;
1293
1294 return unless $self->dirty;
1295
1198 my $save = $self->{path}->save_path; utf8::encode $save; 1296 my $save = $self->{path}->save_path; utf8::encode $save;
1199 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1297 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1200 1298
1201 $self->{last_save} = $cf::RUNTIME;
1202
1203 return unless $self->dirty;
1204
1205 $self->{load_path} = $save; 1299 $self->{load_path} = $save;
1206 1300
1207 return if $self->{deny_save}; 1301 return if $self->{deny_save};
1208 1302
1209 warn "saving map ", $self->path; 1303 local $self->{last_access} = $self->last_access;#d#
1210 1304
1211 if ($uniq) { 1305 if ($uniq) {
1212 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1306 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1213 $self->save_objects ($uniq, cf::IO_UNIQUES); 1307 $self->save_objects ($uniq, cf::IO_UNIQUES);
1214 } else { 1308 } else {
… …
1217} 1311}
1218 1312
1219sub swap_out { 1313sub swap_out {
1220 my ($self) = @_; 1314 my ($self) = @_;
1221 1315
1316 # save first because save cedes
1317 $self->save;
1318
1319 my $lock = cf::lock_acquire "map_data:" . $self->path;
1320
1222 return if $self->players; 1321 return if $self->players;
1223 return if $self->in_memory != cf::MAP_IN_MEMORY; 1322 return if $self->in_memory != cf::MAP_IN_MEMORY;
1224 return if $self->{deny_save}; 1323 return if $self->{deny_save};
1225 1324
1226 $self->save;
1227 $self->clear; 1325 $self->clear;
1228 $self->in_memory (cf::MAP_SWAPPED); 1326 $self->in_memory (cf::MAP_SWAPPED);
1229} 1327}
1230 1328
1329sub reset_at {
1330 my ($self) = @_;
1331
1332 # TODO: safety, remove and allow resettable per-player maps
1333 return 1e99 if $self->{path}{user_rel};
1334 return 1e99 if $self->{deny_reset};
1335
1336 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1337 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1338
1339 $time + $to
1340}
1341
1231sub should_reset { 1342sub should_reset {
1232 my ($map) = @_;
1233
1234 # TODO: safety, remove and allow resettable per-player maps
1235 return if $map->{path}{user_rel};#d#
1236 return if $map->{deny_reset};
1237 #return unless $map->reset_timeout;
1238
1239 my $time = $map->fixed_resettime ? $map->{instantiate_time} : $map->last_access;
1240
1241 $time + ($map->reset_timeout || $DEFAULT_RESET) < $cf::RUNTIME
1242}
1243
1244sub reset {
1245 my ($self) = @_; 1343 my ($self) = @_;
1246 1344
1247 return if $self->players; 1345 $self->reset_at <= $cf::RUNTIME
1248 return if $self->{path}{user_rel};#d# 1346}
1249 1347
1250 warn "resetting map ", $self->path;#d# 1348sub unlink_save {
1349 my ($self) = @_;
1251 1350
1252 utf8::encode (my $save = $self->{path}->save_path); 1351 utf8::encode (my $save = $self->{path}->save_path);
1253 aioreq_pri 3; IO::AIO::aio_unlink $save; 1352 aioreq_pri 3; IO::AIO::aio_unlink $save;
1254 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst"; 1353 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1354}
1355
1356sub rename {
1357 my ($self, $new_path) = @_;
1358
1359 $self->unlink_save;
1360
1361 delete $cf::MAP{$self->path};
1362 $self->{path} = new cf::path $new_path;
1363 $self->path ($self->{path}->as_string);
1364 $cf::MAP{$self->path} = $self;
1365
1366 $self->save;
1367}
1368
1369sub reset {
1370 my ($self) = @_;
1371
1372 my $lock = cf::lock_acquire "map_data:" . $self->path;
1373
1374 return if $self->players;
1375 return if $self->{path}{user_rel};#d#
1376
1377 warn "resetting map ", $self->path;#d#
1378
1379 delete $cf::MAP{$self->path};
1255 1380
1256 $_->clear_links_to ($self) for values %cf::MAP; 1381 $_->clear_links_to ($self) for values %cf::MAP;
1257 1382
1383 $self->unlink_save;
1258 $self->clear; 1384 $self->destroy;
1259 $self->in_memory (cf::MAP_SWAPPED); 1385}
1260 utf8::encode ($self->{load_path} = $self->{path}->load_path); 1386
1387my $nuke_counter = "aaaa";
1388
1389sub nuke {
1390 my ($self) = @_;
1391
1392 $self->{deny_save} = 1;
1393 $self->reset_timeout (1);
1394 $self->rename ("{nuke}/" . ($nuke_counter++));
1395 $self->reset; # polite request, might not happen
1261} 1396}
1262 1397
1263sub customise_for { 1398sub customise_for {
1264 my ($map, $ob) = @_; 1399 my ($map, $ob) = @_;
1265 1400
1266 if ($map->per_player) { 1401 if ($map->per_player) {
1267 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1402 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1268 } 1403 }
1269 1404
1270 $map 1405 $map
1271} 1406}
1272 1407
1273sub emergency_save { 1408sub emergency_save {
1274 local $cf::FREEZE = 1; 1409 my $freeze_guard = cf::freeze_mainloop;
1275 1410
1276 warn "enter emergency map save\n"; 1411 warn "enter emergency map save\n";
1277 1412
1278 cf::sync_job { 1413 cf::sync_job {
1279 warn "begin emergency map save\n"; 1414 warn "begin emergency map save\n";
… …
1330 (ref $cf::CFG{"may_$access"} 1465 (ref $cf::CFG{"may_$access"}
1331 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1466 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1332 : $cf::CFG{"may_$access"}) 1467 : $cf::CFG{"may_$access"})
1333} 1468}
1334 1469
1470=item $player_object->enter_link
1471
1472Freezes the player and moves him/her to a special map (C<{link}>).
1473
1474The player should be reaosnably safe there for short amounts of time. You
1475I<MUST> call C<leave_link> as soon as possible, though.
1476
1477=item $player_object->leave_link ($map, $x, $y)
1478
1479Moves the player out of the specila link map onto the given map. If the
1480map is not valid (or omitted), the player will be moved back to the
1481location he/she was before the call to C<enter_link>, or, if that fails,
1482to the emergency map position.
1483
1484Might block.
1485
1486=cut
1487
1335sub cf::object::player::enter_link { 1488sub cf::object::player::enter_link {
1336 my ($self) = @_; 1489 my ($self) = @_;
1337 1490
1491 $self->deactivate_recursive;
1492
1338 return if $self->map == $LINK_MAP; 1493 return if $self->map == $LINK_MAP;
1339 1494
1340 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1495 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1341 if $self->map; 1496 if $self->map;
1342 1497
1343 $self->enter_map ($LINK_MAP, 20, 20); 1498 $self->enter_map ($LINK_MAP, 20, 20);
1344 $self->deactivate_recursive;
1345} 1499}
1346 1500
1347sub cf::object::player::leave_link { 1501sub cf::object::player::leave_link {
1348 my ($self, $map, $x, $y) = @_; 1502 my ($self, $map, $x, $y) = @_;
1349 1503
1350 my $link_pos = delete $self->{_link_pos}; 1504 my $link_pos = delete $self->{_link_pos};
1351 1505
1352 unless ($map) { 1506 unless ($map) {
1353 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1354
1355 # restore original map position 1507 # restore original map position
1356 ($map, $x, $y) = @{ $link_pos || [] }; 1508 ($map, $x, $y) = @{ $link_pos || [] };
1357 $map = cf::map::find_map $map; 1509 $map = cf::map::find $map;
1358 1510
1359 unless ($map) { 1511 unless ($map) {
1360 ($map, $x, $y) = @$EMERGENCY_POSITION; 1512 ($map, $x, $y) = @$EMERGENCY_POSITION;
1361 $map = cf::map::find_map $map 1513 $map = cf::map::find $map
1362 or die "FATAL: cannot load emergency map\n"; 1514 or die "FATAL: cannot load emergency map\n";
1363 } 1515 }
1364 } 1516 }
1365 1517
1366 ($x, $y) = (-1, -1) 1518 ($x, $y) = (-1, -1)
… …
1374 1526
1375 $self->activate_recursive; 1527 $self->activate_recursive;
1376 $self->enter_map ($map, $x, $y); 1528 $self->enter_map ($map, $x, $y);
1377} 1529}
1378 1530
1531cf::player->attach (
1532 on_logout => sub {
1533 my ($pl) = @_;
1534
1535 # abort map switching before logout
1536 if ($pl->ob->{_link_pos}) {
1537 cf::sync_job {
1538 $pl->ob->leave_link
1539 };
1540 }
1541 },
1542 on_login => sub {
1543 my ($pl) = @_;
1544
1545 # try to abort aborted map switching on player login :)
1546 # should happen only on crashes
1547 if ($pl->ob->{_link_pos}) {
1548
1549 $pl->ob->enter_link;
1550 (Coro::async_pool {
1551 # we need this sleep as the login has a concurrent enter_exit running
1552 # and this sleep increases chances of the player not ending up in scorn
1553 Coro::Timer::sleep 1;
1554 $pl->ob->leave_link;
1555 })->prio (2);
1556 }
1557 },
1558);
1559
1379=item $player_object->goto_map ($map, $x, $y) 1560=item $player_object->goto ($path, $x, $y)
1380 1561
1381=cut 1562=cut
1382 1563
1383sub cf::object::player::goto_map { 1564sub cf::object::player::goto {
1384 my ($self, $path, $x, $y) = @_; 1565 my ($self, $path, $x, $y) = @_;
1385 1566
1386 $self->enter_link; 1567 $self->enter_link;
1387 1568
1388 (Coro::async { 1569 (Coro::async_pool {
1389 $path = new cf::path $path; 1570 $path = new cf::path $path;
1390 1571
1391 my $map = cf::map::find_map $path->as_string; 1572 my $map = cf::map::find $path->as_string;
1392 $map = $map->customise_for ($self) if $map; 1573 $map = $map->customise_for ($self) if $map;
1393 1574
1394 warn "entering ", $map->path, " at ($x, $y)\n" 1575# warn "entering ", $map->path, " at ($x, $y)\n"
1395 if $map; 1576# if $map;
1577
1578 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1396 1579
1397 $self->leave_link ($map, $x, $y); 1580 $self->leave_link ($map, $x, $y);
1398 })->prio (1); 1581 })->prio (1);
1399} 1582}
1400 1583
… …
1453 1636
1454 return unless $self->type == cf::PLAYER; 1637 return unless $self->type == cf::PLAYER;
1455 1638
1456 $self->enter_link; 1639 $self->enter_link;
1457 1640
1458 (Coro::async { 1641 (Coro::async_pool {
1642 $self->deactivate_recursive; # just to be sure
1459 unless (eval { 1643 unless (eval {
1460
1461 prepare_random_map $exit 1644 prepare_random_map $exit
1462 if $exit->slaying eq "/!"; 1645 if $exit->slaying eq "/!";
1463 1646
1464 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1647 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1465 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1648 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1466 1649
1467 1; 1650 1;
1468 }) { 1651 }) {
1469 $self->message ("Something went wrong deep within the crossfire server. " 1652 $self->message ("Something went wrong deep within the crossfire server. "
1470 . "I'll try to bring you back to the map you were before. " 1653 . "I'll try to bring you back to the map you were before. "
… …
1527 on_reply => sub { 1710 on_reply => sub {
1528 my ($ns, $msg) = @_; 1711 my ($ns, $msg) = @_;
1529 1712
1530 # this weird shuffling is so that direct followup queries 1713 # this weird shuffling is so that direct followup queries
1531 # get handled first 1714 # get handled first
1532 my $queue = delete $ns->{query_queue}; 1715 my $queue = delete $ns->{query_queue}
1716 or return; # be conservative, not sure how that can happen, but we saw a crash here
1533 1717
1534 (shift @$queue)->[1]->($msg); 1718 (shift @$queue)->[1]->($msg);
1535 1719
1536 push @{ $ns->{query_queue} }, @$queue; 1720 push @{ $ns->{query_queue} }, @$queue;
1537 1721
… …
1554=cut 1738=cut
1555 1739
1556sub cf::client::coro { 1740sub cf::client::coro {
1557 my ($self, $cb) = @_; 1741 my ($self, $cb) = @_;
1558 1742
1559 my $coro; $coro = async { 1743 my $coro = &Coro::async_pool ($cb);
1560 eval {
1561 $cb->();
1562 };
1563 warn $@ if $@;
1564 };
1565 1744
1566 $coro->on_destroy (sub { 1745 $coro->on_destroy (sub {
1567 delete $self->{_coro}{$coro+0}; 1746 delete $self->{_coro}{$coro+0};
1568 }); 1747 });
1569 1748
… …
1741 1920
1742{ 1921{
1743 my $path = cf::localdir . "/database.pst"; 1922 my $path = cf::localdir . "/database.pst";
1744 1923
1745 sub db_load() { 1924 sub db_load() {
1746 warn "loading database $path\n";#d# remove later
1747 $DB = stat $path ? Storable::retrieve $path : { }; 1925 $DB = stat $path ? Storable::retrieve $path : { };
1748 } 1926 }
1749 1927
1750 my $pid; 1928 my $pid;
1751 1929
1752 sub db_save() { 1930 sub db_save() {
1753 warn "saving database $path\n";#d# remove later
1754 waitpid $pid, 0 if $pid; 1931 waitpid $pid, 0 if $pid;
1755 if (0 == ($pid = fork)) { 1932 if (0 == ($pid = fork)) {
1756 $DB->{_meta}{version} = 1; 1933 $DB->{_meta}{version} = 1;
1757 Storable::nstore $DB, "$path~"; 1934 Storable::nstore $DB, "$path~";
1758 rename "$path~", $path; 1935 rename "$path~", $path;
… …
1806 open my $fh, "<:utf8", cf::confdir . "/config" 1983 open my $fh, "<:utf8", cf::confdir . "/config"
1807 or return; 1984 or return;
1808 1985
1809 local $/; 1986 local $/;
1810 *CFG = YAML::Syck::Load <$fh>; 1987 *CFG = YAML::Syck::Load <$fh>;
1988
1989 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1990
1991 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
1992 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
1993
1994 if (exists $CFG{mlockall}) {
1995 eval {
1996 $CFG{mlockall} ? &mlockall : &munlockall
1997 and die "WARNING: m(un)lockall failed: $!\n";
1998 };
1999 warn $@ if $@;
2000 }
1811} 2001}
1812 2002
1813sub main { 2003sub main {
1814 # we must not ever block the main coroutine 2004 # we must not ever block the main coroutine
1815 local $Coro::idle = sub { 2005 local $Coro::idle = sub {
1816 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 2006 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1817 (Coro::unblock_sub { 2007 Coro::async_pool { Event::one_event };
1818 Event::one_event;
1819 })->();
1820 }; 2008 };
1821 2009
1822 cfg_load; 2010 cfg_load;
1823 db_load; 2011 db_load;
1824 load_extensions; 2012 load_extensions;
… …
1826} 2014}
1827 2015
1828############################################################################# 2016#############################################################################
1829# initialisation 2017# initialisation
1830 2018
1831sub perl_reload() { 2019sub reload() {
1832 # can/must only be called in main 2020 # can/must only be called in main
1833 if ($Coro::current != $Coro::main) { 2021 if ($Coro::current != $Coro::main) {
1834 warn "can only reload from main coroutine\n"; 2022 warn "can only reload from main coroutine\n";
1835 return; 2023 return;
1836 } 2024 }
1837 2025
1838 warn "reloading..."; 2026 warn "reloading...";
1839 2027
1840 local $FREEZE = 1; 2028 my $guard = freeze_mainloop;
1841 cf::emergency_save; 2029 cf::emergency_save;
1842 2030
1843 eval { 2031 eval {
1844 # if anything goes wrong in here, we should simply crash as we already saved 2032 # if anything goes wrong in here, we should simply crash as we already saved
1845 2033
… …
1963 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2151 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
1964} 2152}
1965 2153
1966register "<global>", __PACKAGE__; 2154register "<global>", __PACKAGE__;
1967 2155
1968register_command "perl-reload" => sub { 2156register_command "reload" => sub {
1969 my ($who, $arg) = @_; 2157 my ($who, $arg) = @_;
1970 2158
1971 if ($who->flag (FLAG_WIZ)) { 2159 if ($who->flag (FLAG_WIZ)) {
1972 $who->message ("start of reload."); 2160 $who->message ("start of reload.");
1973 perl_reload; 2161 reload;
1974 $who->message ("end of reload."); 2162 $who->message ("end of reload.");
1975 } 2163 }
1976}; 2164};
1977 2165
1978unshift @INC, $LIBDIR; 2166unshift @INC, $LIBDIR;
… …
1981 reentrant => 0, 2169 reentrant => 0,
1982 prio => 0, 2170 prio => 0,
1983 at => $NEXT_TICK || $TICK, 2171 at => $NEXT_TICK || $TICK,
1984 data => WF_AUTOCANCEL, 2172 data => WF_AUTOCANCEL,
1985 cb => sub { 2173 cb => sub {
1986 unless ($FREEZE) {
1987 cf::server_tick; # one server iteration 2174 cf::server_tick; # one server iteration
1988 $RUNTIME += $TICK; 2175 $RUNTIME += $TICK;
1989 }
1990
1991 $NEXT_TICK += $TICK; 2176 $NEXT_TICK += $TICK;
1992 2177
1993 # if we are delayed by four ticks or more, skip them all 2178 # if we are delayed by four ticks or more, skip them all
1994 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2179 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
1995 2180
… …
2018 or warn "ERROR: unable to write runtime file: $!"; 2203 or warn "ERROR: unable to write runtime file: $!";
2019 })->(); 2204 })->();
2020 }, 2205 },
2021); 2206);
2022 2207
2208END { cf::emergency_save }
2209
20231 22101
2024 2211

Diff Legend

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