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.123 by root, Tue Jan 2 19:18:33 2007 UTC vs.
Revision 1.150 by root, Mon Jan 8 19:25:53 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 Digest::MD5; 20use Digest::MD5;
21use Fcntl; 21use Fcntl;
22use IO::AIO 2.31 (); 22use IO::AIO 2.32 ();
23use YAML::Syck (); 23use YAML::Syck ();
24use Time::HiRes; 24use Time::HiRes;
25 25
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 = ();
… …
47our %CFG; 47our %CFG;
48 48
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %PLAYER; # all users
52our %MAP; # all maps 53our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 54our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 55our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 56our %EXT_CORO; # coroutines bound to extensions
57 57
58binmode STDOUT; 58binmode STDOUT;
59binmode STDERR; 59binmode STDERR;
60 60
61# read virtual server time, if available 61# read virtual server time, if available
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 71mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 72mkdir $RANDOM_MAPS;
73 73
74# a special map that is always available 74# a special map that is always available
75our $LINK_MAP; 75our $LINK_MAP;
76 76our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 77
79############################################################################# 78#############################################################################
80 79
81=head2 GLOBAL VARIABLES 80=head2 GLOBAL VARIABLES
82 81
… …
119 utf8::encode $msg; 118 utf8::encode $msg;
120 119
121 $msg .= "\n" 120 $msg .= "\n"
122 unless $msg =~ /\n$/; 121 unless $msg =~ /\n$/;
123 122
124 LOG llevError, "cfperl: $msg"; 123 LOG llevError, $msg;
125 }; 124 };
126} 125}
127 126
128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 127@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 128@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
… …
181sub to_json($) { 180sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 182 JSON::Syck::Dump $_[0]
184} 183}
185 184
186=item my $guard = cf::guard { BLOCK }
187
188Run the given callback when the guard object gets destroyed (useful for
189coroutine cancellations).
190
191You can call C<< ->cancel >> on the guard object to stop the block from
192being executed.
193
194=cut
195
196sub guard(&) {
197 bless \(my $cb = $_[0]), cf::guard::;
198}
199
200sub cf::guard::cancel {
201 ${$_[0]} = sub { };
202}
203
204sub cf::guard::DESTROY {
205 ${$_[0]}->();
206}
207
208=item cf::lock_wait $string 185=item cf::lock_wait $string
209 186
210Wait until the given lock is available. See cf::lock_acquire. 187Wait until the given lock is available. See cf::lock_acquire.
211 188
212=item my $lock = cf::lock_acquire $string 189=item my $lock = cf::lock_acquire $string
213 190
214Wait until the given lock is available and then acquires it and returns 191Wait until the given lock is available and then acquires it and returns
215a guard object. If the guard object gets destroyed (goes out of scope, 192a Coro::guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically 193for example when the coroutine gets canceled), the lock is automatically
217returned. 194returned.
218 195
219Lock names should begin with a unique identifier (for example, find_map 196Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 197uses map_find and cf::map::load uses map_load).
221 198
222=cut 199=cut
223 200
224our %LOCK; 201our %LOCK;
225 202
… …
239 # wait, to be sure we are not locked 216 # wait, to be sure we are not locked
240 lock_wait $key; 217 lock_wait $key;
241 218
242 $LOCK{$key} = []; 219 $LOCK{$key} = [];
243 220
244 cf::guard { 221 Coro::guard {
245 # wake up all waiters, to be on the safe side 222 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 223 $_->ready for @{ delete $LOCK{$key} };
247 } 224 }
248} 225}
226
227sub freeze_mainloop {
228 return unless $TICK_WATCHER->is_active;
229
230 my $guard = Coro::guard { $TICK_WATCHER->start };
231 $TICK_WATCHER->stop;
232 $guard
233}
234
235=item cf::async { BLOCK }
236
237Currently the same as Coro::async_pool, meaning you cannot use
238C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
239thing you are allowed to do is call C<prio> on it.
240
241=cut
242
243BEGIN { *async = \&Coro::async_pool }
249 244
250=item cf::sync_job { BLOCK } 245=item cf::sync_job { BLOCK }
251 246
252The design of crossfire+ requires that the main coro ($Coro::main) is 247The design of crossfire+ requires that the main coro ($Coro::main) is
253always able to handle events or runnable, as crossfire+ is only partly 248always able to handle events or runnable, as crossfire+ is only partly
… …
267 # this is the main coro, too bad, we have to block 262 # this is the main coro, too bad, we have to block
268 # till the operation succeeds, freezing the server :/ 263 # till the operation succeeds, freezing the server :/
269 264
270 # TODO: use suspend/resume instead 265 # TODO: use suspend/resume instead
271 # (but this is cancel-safe) 266 # (but this is cancel-safe)
272 local $FREEZE = 1; 267 my $freeze_guard = freeze_mainloop;
273 268
274 my $busy = 1; 269 my $busy = 1;
275 my @res; 270 my @res;
276 271
277 (Coro::async { 272 (async {
278 @res = eval { $job->() }; 273 @res = eval { $job->() };
279 warn $@ if $@; 274 warn $@ if $@;
280 undef $busy; 275 undef $busy;
281 })->prio (Coro::PRIO_MAX); 276 })->prio (Coro::PRIO_MAX);
282 277
283 while ($busy) { 278 while ($busy) {
284 Coro::cede_notself; 279 Coro::cede or Event::one_event;
285 Event::one_event unless Coro::nready;
286 } 280 }
287 281
288 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
289 } else { 283 } else {
290 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
291 285
292 $job->() 286 $job->()
293 } 287 }
294} 288}
295 289
296=item $coro = cf::coro { BLOCK } 290=item $coro = cf::async_ext { BLOCK }
297 291
298Creates and returns a new coro. This coro is automcatially being canceled 292Like async, but this coro is automcatially being canceled when the
299when the extension calling this is being unloaded. 293extension calling this is being unloaded.
300 294
301=cut 295=cut
302 296
303sub coro(&) { 297sub async_ext(&) {
304 my $cb = shift; 298 my $cb = shift;
305 299
306 my $coro; $coro = async { 300 my $coro = &Coro::async ($cb);
307 eval {
308 $cb->();
309 };
310 warn $@ if $@;
311 };
312 301
313 $coro->on_destroy (sub { 302 $coro->on_destroy (sub {
314 delete $EXT_CORO{$coro+0}; 303 delete $EXT_CORO{$coro+0};
315 }); 304 });
316 $EXT_CORO{$coro+0} = $coro; 305 $EXT_CORO{$coro+0} = $coro;
… …
1083 1072
1084=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1085 1074
1086Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1087 1076
1077=cut
1078
1079package cf::player;
1080
1088=head3 cf::player 1081=head3 cf::player
1089 1082
1090=over 4 1083=over 4
1091 1084
1092=item cf::player::exists $login 1085=item cf::player::find $login
1093 1086
1094Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1095 1088
1096=cut 1089=cut
1097 1090
1098sub cf::player::exists($) { 1091sub playerdir($) {
1099 cf::player::find $_[0] 1092 cf::localdir
1100 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1093 . "/"
1094 . cf::playerdir
1095 . "/"
1096 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1097}
1098
1099sub path($) {
1100 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1101
1102 (playerdir $login) . "/$login.pl"
1103}
1104
1105sub find_active($) {
1106 $cf::PLAYER{$_[0]}
1107 and $cf::PLAYER{$_[0]}->active
1108 and $cf::PLAYER{$_[0]}
1109}
1110
1111sub exists($) {
1112 my ($login) = @_;
1113
1114 $cf::PLAYER{$login}
1115 or cf::sync_job { !aio_stat $login }
1116}
1117
1118sub find($) {
1119 return $cf::PLAYER{$_[0]} || do {
1120 my $login = $_[0];
1121
1122 my $guard = cf::lock_acquire "user_find:$login";
1123
1124 $cf::PLAYER{$login} ||= (load_pl path $login or return);
1125 };
1126}
1127
1128sub save($) {
1129 my ($pl) = @_;
1130
1131 return if $pl->{deny_save};
1132
1133 my $path = path $pl;
1134 my $guard = cf::lock_acquire "user_save:$path";
1135
1136 return if $pl->{deny_save};
1137
1138 Coro::AIO::aio_mkdir playerdir $pl, 0770;
1139 $pl->{last_save} = $cf::RUNTIME;
1140
1141 $pl->save_pl ($path);
1142 Coro::cede;
1143}
1144
1145sub new($) {
1146 my ($login) = @_;
1147
1148 my $self = create;
1149
1150 $self->ob->name ($login);
1151 $self->{deny_save} = 1;
1152
1153 $cf::PLAYER{$login} = $self;
1154
1155 $self
1156}
1157
1158sub quit_character {
1159 my ($pl) = @_;
1160
1161 $pl->{deny_save} = 1;
1162 $pl->password ("*"); # this should lock out the player until we nuked the dir
1163
1164 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1165 $pl->deactivate;
1166 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1167 $pl->ns->destroy if $pl->ns;
1168
1169 my $path = playerdir $pl;
1170 my $temp = "$path~$cf::RUNTIME~deleting~";
1171 Coro::AIO::aio_rename $path, $temp;
1172 delete $cf::PLAYER{$pl->ob->name};
1173 $pl->destroy;
1174 IO::AIO::aio_rmtree $temp;
1101} 1175}
1102 1176
1103=item $player->ext_reply ($msgid, $msgtype, %msg) 1177=item $player->ext_reply ($msgid, $msgtype, %msg)
1104 1178
1105Sends an ext reply to the player. 1179Sends an ext reply to the player.
1106 1180
1107=cut 1181=cut
1108 1182
1109sub cf::player::ext_reply($$$%) { 1183sub ext_reply($$$%) {
1110 my ($self, $id, %msg) = @_; 1184 my ($self, $id, %msg) = @_;
1111 1185
1112 $msg{msgid} = $id; 1186 $msg{msgid} = $id;
1113 1187
1114 $self->send ("ext " . to_json \%msg); 1188 $self->send ("ext " . cf::to_json \%msg);
1115} 1189}
1190
1191package cf;
1116 1192
1117=back 1193=back
1118 1194
1119 1195
1120=head3 cf::map 1196=head3 cf::map
… …
1126package cf::map; 1202package cf::map;
1127 1203
1128use Fcntl; 1204use Fcntl;
1129use Coro::AIO; 1205use Coro::AIO;
1130 1206
1131our $MAX_RESET = 7200; 1207our $MAX_RESET = 3600;
1132our $DEFAULT_RESET = 3600; 1208our $DEFAULT_RESET = 3000;
1133 1209
1134sub generate_random_map { 1210sub generate_random_map {
1135 my ($path, $rmp) = @_; 1211 my ($path, $rmp) = @_;
1136 1212
1137 # mit "rum" bekleckern, nicht 1213 # mit "rum" bekleckern, nicht
… …
1167 or return; 1243 or return;
1168 1244
1169 my $map = cf::map::new 1245 my $map = cf::map::new
1170 or return; 1246 or return;
1171 1247
1248 # for better error messages only, will be overwritten
1249 $map->path ($path);
1250
1172 $map->load_header ($path) 1251 $map->load_header ($path)
1173 or return; 1252 or return;
1174 1253
1175 $map->{load_path} = $path; 1254 $map->{load_path} = $path;
1176 1255
1177 $map 1256 $map
1178} 1257}
1179 1258
1259sub find;
1180sub find_map { 1260sub find {
1181 my ($path, $origin) = @_; 1261 my ($path, $origin) = @_;
1182 1262
1183 #warn "find_map<$path,$origin>\n";#d# 1263 #warn "find<$path,$origin>\n";#d#
1184 1264
1185 $path = new cf::path $path, $origin && $origin->path; 1265 $path = new cf::path $path, $origin && $origin->path;
1186 my $key = $path->as_string; 1266 my $key = $path->as_string;
1187 1267
1188 cf::lock_wait "map_find:$key"; 1268 cf::lock_wait "map_find:$key";
… …
1191 my $guard = cf::lock_acquire "map_find:$key"; 1271 my $guard = cf::lock_acquire "map_find:$key";
1192 1272
1193 # do it the slow way 1273 # do it the slow way
1194 my $map = try_load_header $path->save_path; 1274 my $map = try_load_header $path->save_path;
1195 1275
1276 Coro::cede;
1277
1196 if ($map) { 1278 if ($map) {
1279 $map->last_access ((delete $map->{last_access})
1280 || $cf::RUNTIME); #d#
1197 # safety 1281 # safety
1198 $map->{instantiate_time} = $cf::RUNTIME 1282 $map->{instantiate_time} = $cf::RUNTIME
1199 if $map->{instantiate_time} > $cf::RUNTIME; 1283 if $map->{instantiate_time} > $cf::RUNTIME;
1200 } else { 1284 } else {
1201 if (my $rmp = $path->random_map_params) { 1285 if (my $rmp = $path->random_map_params) {
… …
1206 1290
1207 $map or return; 1291 $map or return;
1208 1292
1209 $map->{load_original} = 1; 1293 $map->{load_original} = 1;
1210 $map->{instantiate_time} = $cf::RUNTIME; 1294 $map->{instantiate_time} = $cf::RUNTIME;
1295 $map->last_access ($cf::RUNTIME);
1211 $map->instantiate; 1296 $map->instantiate;
1212 1297
1213 # per-player maps become, after loading, normal maps 1298 # per-player maps become, after loading, normal maps
1214 $map->per_player (0) if $path->{user_rel}; 1299 $map->per_player (0) if $path->{user_rel};
1215 } 1300 }
1216 1301
1217 $map->path ($key); 1302 $map->path ($key);
1218 $map->{path} = $path; 1303 $map->{path} = $path;
1219 $map->{last_save} = $cf::RUNTIME; 1304 $map->{last_save} = $cf::RUNTIME;
1220 $map->last_access ($cf::RUNTIME); 1305
1306 Coro::cede;
1221 1307
1222 if ($map->should_reset) { 1308 if ($map->should_reset) {
1223 $map->reset; 1309 $map->reset;
1224 undef $guard; 1310 undef $guard;
1225 $map = find_map $path; 1311 $map = find $path
1312 or return;
1226 } 1313 }
1227 1314
1228 $cf::MAP{$key} = $map 1315 $cf::MAP{$key} = $map
1229 } 1316 }
1230} 1317}
… …
1251 if (aio_open $uniq, O_RDONLY, 0) { 1338 if (aio_open $uniq, O_RDONLY, 0) {
1252 $self->clear_unique_items; 1339 $self->clear_unique_items;
1253 $self->load_objects ($uniq, 0); 1340 $self->load_objects ($uniq, 0);
1254 } 1341 }
1255 } 1342 }
1343
1344 Coro::cede;
1256 1345
1257 # now do the right thing for maps 1346 # now do the right thing for maps
1258 $self->link_multipart_objects; 1347 $self->link_multipart_objects;
1259 1348
1260 if ($self->{path}->is_style_map) { 1349 if ($self->{path}->is_style_map) {
… …
1268 $self->difficulty ($self->estimate_difficulty) 1357 $self->difficulty ($self->estimate_difficulty)
1269 unless $self->difficulty; 1358 unless $self->difficulty;
1270 $self->activate; 1359 $self->activate;
1271 } 1360 }
1272 1361
1362 Coro::cede;
1363
1273 $self->in_memory (cf::MAP_IN_MEMORY); 1364 $self->in_memory (cf::MAP_IN_MEMORY);
1274} 1365}
1275 1366
1276sub load_map_sync { 1367sub find_sync {
1277 my ($path, $origin) = @_; 1368 my ($path, $origin) = @_;
1278 1369
1279 #warn "load_map_sync<$path, $origin>\n";#d# 1370 cf::sync_job { cf::map::find $path, $origin }
1371}
1280 1372
1281 cf::sync_job { 1373sub do_load_sync {
1282 my $map = cf::map::find_map $path, $origin 1374 my ($map) = @_;
1283 or return; 1375
1284 $map->load; 1376 cf::sync_job { $map->load };
1285 $map
1286 }
1287} 1377}
1288 1378
1289sub save { 1379sub save {
1290 my ($self) = @_; 1380 my ($self) = @_;
1291 1381
1382 my $lock = cf::lock_acquire "map_data:" . $self->path;
1383
1292 $self->{last_save} = $cf::RUNTIME; 1384 $self->{last_save} = $cf::RUNTIME;
1293 1385
1294 return unless $self->dirty; 1386 return unless $self->dirty;
1295 1387
1296 my $save = $self->{path}->save_path; utf8::encode $save; 1388 my $save = $self->{path}->save_path; utf8::encode $save;
1297 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1389 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1298 1390
1299 $self->{load_path} = $save; 1391 $self->{load_path} = $save;
1300 1392
1301 return if $self->{deny_save}; 1393 return if $self->{deny_save};
1394
1395 local $self->{last_access} = $self->last_access;#d#
1396
1397 cf::async {
1398 $_->contr->save for $self->players;
1399 };
1302 1400
1303 if ($uniq) { 1401 if ($uniq) {
1304 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1402 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1305 $self->save_objects ($uniq, cf::IO_UNIQUES); 1403 $self->save_objects ($uniq, cf::IO_UNIQUES);
1306 } else { 1404 } else {
… …
1309} 1407}
1310 1408
1311sub swap_out { 1409sub swap_out {
1312 my ($self) = @_; 1410 my ($self) = @_;
1313 1411
1412 # save first because save cedes
1413 $self->save;
1414
1415 my $lock = cf::lock_acquire "map_data:" . $self->path;
1416
1314 return if $self->players; 1417 return if $self->players;
1315 return if $self->in_memory != cf::MAP_IN_MEMORY; 1418 return if $self->in_memory != cf::MAP_IN_MEMORY;
1316 return if $self->{deny_save}; 1419 return if $self->{deny_save};
1317 1420
1318 $self->save;
1319 $self->clear; 1421 $self->clear;
1320 $self->in_memory (cf::MAP_SWAPPED); 1422 $self->in_memory (cf::MAP_SWAPPED);
1321} 1423}
1322 1424
1323sub reset_at { 1425sub reset_at {
… …
1361} 1463}
1362 1464
1363sub reset { 1465sub reset {
1364 my ($self) = @_; 1466 my ($self) = @_;
1365 1467
1468 my $lock = cf::lock_acquire "map_data:" . $self->path;
1469
1366 return if $self->players; 1470 return if $self->players;
1367 return if $self->{path}{user_rel};#d# 1471 return if $self->{path}{user_rel};#d#
1368 1472
1369 warn "resetting map ", $self->path;#d# 1473 warn "resetting map ", $self->path;#d#
1370 1474
… …
1389 1493
1390sub customise_for { 1494sub customise_for {
1391 my ($map, $ob) = @_; 1495 my ($map, $ob) = @_;
1392 1496
1393 if ($map->per_player) { 1497 if ($map->per_player) {
1394 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1498 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1395 } 1499 }
1396 1500
1397 $map 1501 $map
1398} 1502}
1399 1503
1400sub emergency_save { 1504sub emergency_save {
1401 local $cf::FREEZE = 1; 1505 my $freeze_guard = cf::freeze_mainloop;
1402 1506
1403 warn "enter emergency map save\n"; 1507 warn "enter emergency perl save\n";
1404 1508
1405 cf::sync_job { 1509 cf::sync_job {
1510 warn "begin emergency player save\n";
1511 $_->save for values %cf::PLAYER;
1512 warn "end emergency player save\n";
1513
1406 warn "begin emergency map save\n"; 1514 warn "begin emergency map save\n";
1407 $_->save for values %cf::MAP; 1515 $_->save for values %cf::MAP;
1516 warn "end emergency map save\n";
1408 }; 1517 };
1409 1518
1410 warn "end emergency map save\n"; 1519 warn "leave emergency perl save\n";
1411} 1520}
1412 1521
1413package cf; 1522package cf;
1414 1523
1415=back 1524=back
… …
1496 my $link_pos = delete $self->{_link_pos}; 1605 my $link_pos = delete $self->{_link_pos};
1497 1606
1498 unless ($map) { 1607 unless ($map) {
1499 # restore original map position 1608 # restore original map position
1500 ($map, $x, $y) = @{ $link_pos || [] }; 1609 ($map, $x, $y) = @{ $link_pos || [] };
1501 $map = cf::map::find_map $map; 1610 $map = cf::map::find $map;
1502 1611
1503 unless ($map) { 1612 unless ($map) {
1504 ($map, $x, $y) = @$EMERGENCY_POSITION; 1613 ($map, $x, $y) = @$EMERGENCY_POSITION;
1505 $map = cf::map::find_map $map 1614 $map = cf::map::find $map
1506 or die "FATAL: cannot load emergency map\n"; 1615 or die "FATAL: cannot load emergency map\n";
1507 } 1616 }
1508 } 1617 }
1509 1618
1510 ($x, $y) = (-1, -1) 1619 ($x, $y) = (-1, -1)
… …
1514 ($x, $y) = ($map->enter_x, $map->enter_y) 1623 ($x, $y) = ($map->enter_x, $map->enter_y)
1515 if $x <=0 && $y <= 0; 1624 if $x <=0 && $y <= 0;
1516 1625
1517 $map->load; 1626 $map->load;
1518 1627
1628 return unless $self->contr->active;
1519 $self->activate_recursive; 1629 $self->activate_recursive;
1520 $self->enter_map ($map, $x, $y); 1630 $self->enter_map ($map, $x, $y);
1521} 1631}
1522 1632
1523cf::player->attach ( 1633cf::player->attach (
… …
1536 1646
1537 # try to abort aborted map switching on player login :) 1647 # try to abort aborted map switching on player login :)
1538 # should happen only on crashes 1648 # should happen only on crashes
1539 if ($pl->ob->{_link_pos}) { 1649 if ($pl->ob->{_link_pos}) {
1540 $pl->ob->enter_link; 1650 $pl->ob->enter_link;
1541 Coro::async { 1651 (async {
1542 # we need this sleep as the login has a concurrent enter_exit running 1652 # we need this sleep as the login has a concurrent enter_exit running
1543 # and this sleep increases chances of the player not ending up in scorn 1653 # and this sleep increases chances of the player not ending up in scorn
1654 $pl->ob->reply (undef,
1655 "There was an internal problem at your last logout, "
1656 . "the server will try to bring you to your intended destination in a second.",
1657 cf::NDI_RED);
1544 Coro::Timer::sleep 1; 1658 Coro::Timer::sleep 1;
1545 $pl->ob->leave_link; 1659 $pl->ob->leave_link;
1546 }; 1660 })->prio (2);
1547 } 1661 }
1548 }, 1662 },
1549); 1663);
1550 1664
1551=item $player_object->goto_map ($path, $x, $y) 1665=item $player_object->goto ($path, $x, $y)
1552 1666
1553=cut 1667=cut
1554 1668
1555sub cf::object::player::goto_map { 1669sub cf::object::player::goto {
1556 my ($self, $path, $x, $y) = @_; 1670 my ($self, $path, $x, $y) = @_;
1557 1671
1558 $self->enter_link; 1672 $self->enter_link;
1559 1673
1560 (Coro::async { 1674 (async {
1561 $path = new cf::path $path; 1675 $path = new cf::path $path;
1562 1676
1563 my $map = cf::map::find_map $path->as_string; 1677 my $map = cf::map::find $path->as_string;
1564 $map = $map->customise_for ($self) if $map; 1678 $map = $map->customise_for ($self) if $map;
1565 1679
1566# warn "entering ", $map->path, " at ($x, $y)\n" 1680# warn "entering ", $map->path, " at ($x, $y)\n"
1567# if $map; 1681# if $map;
1568 1682
1683 $map or $map->cluck ("oy");#d#
1569 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1684 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1570 1685
1571 $self->leave_link ($map, $x, $y); 1686 $self->leave_link ($map, $x, $y);
1572 })->prio (1); 1687 })->prio (1);
1573} 1688}
1574 1689
… …
1627 1742
1628 return unless $self->type == cf::PLAYER; 1743 return unless $self->type == cf::PLAYER;
1629 1744
1630 $self->enter_link; 1745 $self->enter_link;
1631 1746
1632 (Coro::async { 1747 (async {
1748 $self->deactivate_recursive; # just to be sure
1633 unless (eval { 1749 unless (eval {
1634
1635 prepare_random_map $exit 1750 prepare_random_map $exit
1636 if $exit->slaying eq "/!"; 1751 if $exit->slaying eq "/!";
1637 1752
1638 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1753 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1639 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1754 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1640 1755
1641 1; 1756 1;
1642 }) { 1757 }) {
1643 $self->message ("Something went wrong deep within the crossfire server. " 1758 $self->message ("Something went wrong deep within the crossfire server. "
1644 . "I'll try to bring you back to the map you were before. " 1759 . "I'll try to bring you back to the map you were before. "
… …
1701 on_reply => sub { 1816 on_reply => sub {
1702 my ($ns, $msg) = @_; 1817 my ($ns, $msg) = @_;
1703 1818
1704 # this weird shuffling is so that direct followup queries 1819 # this weird shuffling is so that direct followup queries
1705 # get handled first 1820 # get handled first
1706 my $queue = delete $ns->{query_queue}; 1821 my $queue = delete $ns->{query_queue}
1822 or return; # be conservative, not sure how that can happen, but we saw a crash here
1707 1823
1708 (shift @$queue)->[1]->($msg); 1824 (shift @$queue)->[1]->($msg);
1709 1825
1710 push @{ $ns->{query_queue} }, @$queue; 1826 push @{ $ns->{query_queue} }, @$queue;
1711 1827
… …
1717 } 1833 }
1718 } 1834 }
1719 }, 1835 },
1720); 1836);
1721 1837
1722=item $client->coro (\&cb) 1838=item $client->async (\&cb)
1723 1839
1724Create a new coroutine, running the specified callback. The coroutine will 1840Create a new coroutine, running the specified callback. The coroutine will
1725be automatically cancelled when the client gets destroyed (e.g. on logout, 1841be automatically cancelled when the client gets destroyed (e.g. on logout,
1726or loss of connection). 1842or loss of connection).
1727 1843
1728=cut 1844=cut
1729 1845
1730sub cf::client::coro { 1846sub cf::client::async {
1731 my ($self, $cb) = @_; 1847 my ($self, $cb) = @_;
1732 1848
1733 my $coro; $coro = async { 1849 my $coro = &Coro::async ($cb);
1734 eval {
1735 $cb->();
1736 };
1737 warn $@ if $@;
1738 };
1739 1850
1740 $coro->on_destroy (sub { 1851 $coro->on_destroy (sub {
1741 delete $self->{_coro}{$coro+0}; 1852 delete $self->{_coro}{$coro+0};
1742 }); 1853 });
1743 1854
… …
1978 open my $fh, "<:utf8", cf::confdir . "/config" 2089 open my $fh, "<:utf8", cf::confdir . "/config"
1979 or return; 2090 or return;
1980 2091
1981 local $/; 2092 local $/;
1982 *CFG = YAML::Syck::Load <$fh>; 2093 *CFG = YAML::Syck::Load <$fh>;
2094
2095 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2096
2097 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2098 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2099
2100 if (exists $CFG{mlockall}) {
2101 eval {
2102 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2103 and die "WARNING: m(un)lockall failed: $!\n";
2104 };
2105 warn $@ if $@;
2106 }
1983} 2107}
1984 2108
1985sub main { 2109sub main {
1986 # we must not ever block the main coroutine 2110 # we must not ever block the main coroutine
1987 local $Coro::idle = sub { 2111 local $Coro::idle = sub {
1988 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2112 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1989 (Coro::unblock_sub {
1990 Event::one_event; 2113 async { Event::one_event };
1991 })->();
1992 }; 2114 };
1993 2115
1994 cfg_load; 2116 cfg_load;
1995 db_load; 2117 db_load;
1996 load_extensions; 2118 load_extensions;
… …
2007 return; 2129 return;
2008 } 2130 }
2009 2131
2010 warn "reloading..."; 2132 warn "reloading...";
2011 2133
2012 local $FREEZE = 1; 2134 my $guard = freeze_mainloop;
2013 cf::emergency_save; 2135 cf::emergency_save;
2014 2136
2015 eval { 2137 eval {
2016 # if anything goes wrong in here, we should simply crash as we already saved 2138 # if anything goes wrong in here, we should simply crash as we already saved
2017 2139
… …
2079 cf::load_extensions; 2201 cf::load_extensions;
2080 2202
2081 # reattach attachments to objects 2203 # reattach attachments to objects
2082 warn "reattach"; 2204 warn "reattach";
2083 _global_reattach; 2205 _global_reattach;
2206 reattach $_ for values %MAP;
2084 }; 2207 };
2085 2208
2086 if ($@) { 2209 if ($@) {
2087 warn $@; 2210 warn $@;
2088 warn "error while reloading, exiting."; 2211 warn "error while reloading, exiting.";
… …
2104 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2227 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2105 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2228 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2106 2229
2107 # dirty hack because... archetypes are not yet loaded 2230 # dirty hack because... archetypes are not yet loaded
2108 Event->timer ( 2231 Event->timer (
2109 after => 2, 2232 after => 10,
2110 cb => sub { 2233 cb => sub {
2111 $_[0]->w->cancel; 2234 $_[0]->w->cancel;
2112 2235
2113 # provide some exits "home" 2236 # provide some exits "home"
2114 my $exit = cf::object::new "exit"; 2237 my $exit = cf::object::new "exit";
… …
2153 reentrant => 0, 2276 reentrant => 0,
2154 prio => 0, 2277 prio => 0,
2155 at => $NEXT_TICK || $TICK, 2278 at => $NEXT_TICK || $TICK,
2156 data => WF_AUTOCANCEL, 2279 data => WF_AUTOCANCEL,
2157 cb => sub { 2280 cb => sub {
2158 unless ($FREEZE) {
2159 cf::server_tick; # one server iteration 2281 cf::server_tick; # one server iteration
2160 $RUNTIME += $TICK; 2282 $RUNTIME += $TICK;
2161 }
2162
2163 $NEXT_TICK += $TICK; 2283 $NEXT_TICK += $TICK;
2164 2284
2165 # if we are delayed by four ticks or more, skip them all 2285 # if we are delayed by four ticks or more, skip them all
2166 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2286 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2167 2287
… …
2190 or warn "ERROR: unable to write runtime file: $!"; 2310 or warn "ERROR: unable to write runtime file: $!";
2191 })->(); 2311 })->();
2192 }, 2312 },
2193); 2313);
2194 2314
2315END { cf::emergency_save }
2316
21951 23171
2196 2318

Diff Legend

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